PThread: fix acquire lock

Author: cosminbasca

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

@@ -301,7 +301,8 @@ def setUp(self):
 
         def tearDown(self):
             support.threading_cleanup(*self._threads)
-            support.reap_children()
+            # TODO: revert patch when os.waitpid(-1, ...) is implemented
+            # support.reap_children()
 
         def assertLess(self, a, b, msg=None):
             if not a < b:

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

@@ -58,6 +58,7 @@
 import com.oracle.graal.python.nodes.argument.keywords.ExecuteKeywordStarargsNode.ExpandKeywordStarargsNode;
 import com.oracle.graal.python.nodes.argument.positional.ExecutePositionalStarargsNode;
 import com.oracle.graal.python.nodes.call.CallNode;
+import com.oracle.graal.python.nodes.datamodel.IsCallableNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/AbstractPythonLock.java

@@ -47,7 +47,7 @@ public abstract class AbstractPythonLock extends PythonBuiltinObject {
 
     public static final double TIMEOUT_MAX = 2 ^ 31;
     public static final boolean DEFAULT_BLOCKING = true;
-    public static final double DEFAULT_TIMEOUT = -1.0;
+    public static final double UNSET_TIMEOUT = -1.0;
 
     AbstractPythonLock(LazyPythonClass cls) {
         super(cls);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/LockBuiltins.java

@@ -41,7 +41,7 @@
 package com.oracle.graal.python.builtins.objects.thread;
 
 import static com.oracle.graal.python.builtins.objects.thread.AbstractPythonLock.DEFAULT_BLOCKING;
-import static com.oracle.graal.python.builtins.objects.thread.AbstractPythonLock.DEFAULT_TIMEOUT;
+import static com.oracle.graal.python.builtins.objects.thread.AbstractPythonLock.UNSET_TIMEOUT;
 import static com.oracle.graal.python.builtins.objects.thread.AbstractPythonLock.TIMEOUT_MAX;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ENTER__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EXIT__;
@@ -109,26 +109,28 @@ private CastToBooleanNode getCastToBooleanNode() {
         boolean doAcquire(VirtualFrame frame, AbstractPythonLock self, Object blocking, Object timeout) {
             // args setup
             boolean isBlocking = (blocking instanceof PNone) ? DEFAULT_BLOCKING : getCastToBooleanNode().executeBoolean(frame, blocking);
-            double timeoutSeconds = DEFAULT_TIMEOUT;
+            double timeoutSeconds = UNSET_TIMEOUT;
             if (!(timeout instanceof PNone)) {
-                if (!isBlocking) {
-                    throw raise(ValueError, "can't specify a timeout for a non-blocking call");
-                }
-
                 timeoutSeconds = getCastToDoubleNode().execute(frame, timeout);
 
-                if (timeoutSeconds < 0) {
-                    throw raise(ValueError, "timeout value must be positive");
-                } else if (timeoutSeconds > TIMEOUT_MAX) {
-                    throw raise(OverflowError, "timeout value is too large");
+                if (timeoutSeconds != UNSET_TIMEOUT) {
+                    if (!isBlocking) {
+                        throw raise(ValueError, "can't specify a timeout for a non-blocking call");
+                    }
+
+                    if (timeoutSeconds < 0) {
+                        throw raise(ValueError, "timeout value must be positive");
+                    } else if (timeoutSeconds > TIMEOUT_MAX) {
+                        throw raise(OverflowError, "timeout value is too large");
+                    }
                 }
             }
 
             // acquire lock
             if (isBlockingProfile.profile(!isBlocking)) {
                 return self.acquireNonBlocking();
             } else {
-                if (defaultTimeoutProfile.profile(timeoutSeconds == DEFAULT_TIMEOUT)) {
+                if (defaultTimeoutProfile.profile(timeoutSeconds == UNSET_TIMEOUT)) {
                     return self.acquireBlocking();
                 } else {
                     return self.acquireTimeout(timeoutSeconds);