add unittest for the resource module

- test that the module imports
- limited test for getrusage

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/test_resource.py

@@ -0,0 +1,70 @@
+    # Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+def assert_raises(err, fn, *args, **kwargs):
+    raised = False
+    try:
+        fn(*args, **kwargs)
+    except err:
+        raised = True
+    assert raised
+
+
+def test_import():
+    imported = True
+    try:
+        import resource
+    except ImportError:
+        imported = False
+    assert imported
+
+
+def test_gerusage():
+    from resource import getrusage, RUSAGE_SELF, RUSAGE_THREAD
+    for who in [RUSAGE_SELF, RUSAGE_THREAD]:
+        ru = getrusage(who)
+        attrs = [
+            "ru_utime", "ru_stime", "ru_maxrss", "ru_ixrss", "ru_idrss", "ru_isrss",
+            "ru_minflt", "ru_majflt", "ru_nswap", "ru_inblock", "ru_oublock", "ru_msgsnd", "ru_msgrcv", "ru_nsignals",
+            "ru_nvcsw", "ru_nivcsw"
+        ]
+        assert ru.ru_utime > 0
+        assert ru.ru_stime >= 0
+        assert ru.ru_maxrss > 0

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ResourceModuleBuiltins.java

@@ -80,8 +80,8 @@ abstract static class GetRuUsageNode extends PythonBuiltinNode {
         PTuple getruusageThread(@SuppressWarnings("unused") int who) {
             ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
             long id = Thread.currentThread().getId();
-            double ru_utime = threadMXBean.getThreadUserTime(id); // time in user mode (float)
-            double ru_stime = threadMXBean.getThreadCpuTime(id); // time in system mode (float)
+            double ru_utime = threadMXBean.getThreadUserTime(id) / 1000000000.0; // time in user mode (float)
+            double ru_stime = threadMXBean.getThreadCpuTime(id) / 1000000000.0; // time in system mode (float)
 
             long ru_maxrss; // maximum resident set size
             if (threadMXBean instanceof com.sun.management.ThreadMXBean) {
@@ -92,7 +92,13 @@ PTuple getruusageThread(@SuppressWarnings("unused") int who) {
                 ru_maxrss = runtime.maxMemory();
             }
 
-            long ru_ixrss = -1;  // shared memory size
+            String osName = System.getProperty("os.name");
+            if (osName.contains("Linux")) {
+                // peak memory usage (kilobytes on Linux
+                ru_maxrss /= 1024;
+            }
+
+            long ru_ixrss = -1; // shared memory size
             long ru_idrss = -1; // unshared memory size
             long ru_isrss = -1; // unshared stack size
             long ru_minflt = -1; // page faults not requiring I/O
@@ -117,19 +123,22 @@ PTuple getruusageSelf(@SuppressWarnings("unused") int who) {
             double ru_utime = 0; // time in user mode (float)
             double ru_stime = 0; // time in system mode (float)
             for (long thId : threadMXBean.getAllThreadIds()) {
-                ru_utime += threadMXBean.getThreadUserTime(thId);
-                ru_stime += threadMXBean.getThreadCpuTime(thId);
+                ru_utime += threadMXBean.getThreadUserTime(thId) / 1000000000.0;
+                ru_stime += threadMXBean.getThreadCpuTime(thId) / 1000000000.0;
             }
 
             MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
             MemoryUsage heapMemoryUsage = memoryMXBean.getHeapMemoryUsage();
             MemoryUsage nonHeapMemoryUsage = memoryMXBean.getNonHeapMemoryUsage();
-            long ru_maxrss = heapMemoryUsage.getCommitted() + nonHeapMemoryUsage.getCommitted(); // maximum
-                                                                                                 // resident
-                                                                                                 // set
-                                                                                                 // size
+            long ru_maxrss = heapMemoryUsage.getCommitted() + nonHeapMemoryUsage.getCommitted();
+
+            String osName = System.getProperty("os.name");
+            if (osName.contains("Linux")) {
+                // peak memory usage (kilobytes on Linux
+                ru_maxrss /= 1024;
+            }
 
-            long ru_ixrss = -1;  // shared memory size
+            long ru_ixrss = -1; // shared memory size
             long ru_idrss = -1; // unshared memory size
             long ru_isrss = -1; // unshared stack size
             long ru_minflt = -1; // page faults not requiring I/O