opt GIL: PThreadState

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PThreadState.java

@@ -38,6 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+// skip GIL
 package com.oracle.graal.python.builtins.objects.cext.capi;
 
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_GET_THREAD_STATE_TYPE_ID;
@@ -57,15 +58,13 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -141,13 +140,8 @@ protected Object getMembers(@SuppressWarnings("unused") boolean includeInternal,
 
     @ExportMessage
     protected Object readMember(String member,
-                    @Exclusive @Cached ThreadStateReadNode readNode, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return readNode.execute(member);
-        } finally {
-            gil.release(mustRelease);
-        }
+                    @Exclusive @Cached ThreadStateReadNode readNode) {
+        return readNode.execute(member);
     }
 
     @ImportStatic(PThreadState.class)
@@ -304,13 +298,8 @@ protected boolean isMemberInsertable(@SuppressWarnings("unused") String member)
     @ExportMessage
     protected void writeMember(String member, Object value,
                     @Exclusive @Cached ThreadStateWriteNode writeNode,
-                    @Exclusive @Cached ToJavaNode toJavaNode, @Exclusive @Cached GilNode gil) throws UnknownIdentifierException {
-        boolean mustRelease = gil.acquire();
-        try {
-            writeNode.execute(member, toJavaNode.execute(value));
-        } finally {
-            gil.release(mustRelease);
-        }
+                    @Exclusive @Cached ToJavaNode toJavaNode) throws UnknownIdentifierException {
+        writeNode.execute(member, toJavaNode.execute(value));
     }
 
     @ExportMessage
@@ -441,44 +430,29 @@ protected static boolean isCaughtExceptionMember(Object key) {
     // TO POINTER / AS POINTER / TO NATIVE
     @ExportMessage
     protected boolean isPointer(
-                    @Exclusive @Cached IsPointerNode pIsPointerNode, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            return pIsPointerNode.execute(this);
-        } finally {
-            gil.release(mustRelease);
-        }
+                    @Exclusive @Cached IsPointerNode pIsPointerNode) {
+        return pIsPointerNode.execute(this);
     }
 
     @ExportMessage
     public long asPointer(
                     @CachedLibrary("this") PythonNativeWrapperLibrary lib,
-                    @CachedLibrary(limit = "1") InteropLibrary interopLibrary, @Exclusive @Cached GilNode gil) throws UnsupportedMessageException {
-        boolean mustRelease = gil.acquire();
-        try {
-            Object nativePointer = lib.getNativePointer(this);
-            if (nativePointer instanceof Long) {
-                return (long) nativePointer;
-            }
-            return interopLibrary.asPointer(nativePointer);
-        } finally {
-            gil.release(mustRelease);
+                    @CachedLibrary(limit = "1") InteropLibrary interopLibrary) throws UnsupportedMessageException {
+        Object nativePointer = lib.getNativePointer(this);
+        if (nativePointer instanceof Long) {
+            return (long) nativePointer;
         }
+        return interopLibrary.asPointer(nativePointer);
     }
 
     @ExportMessage
     protected void toNative(
                     @CachedLibrary("this") PythonNativeWrapperLibrary lib,
                     @Exclusive @Cached ToPyObjectNode toPyObjectNode,
-                    @Exclusive @Cached InvalidateNativeObjectsAllManagedNode invalidateNode, @Exclusive @Cached GilNode gil) {
-        boolean mustRelease = gil.acquire();
-        try {
-            invalidateNode.execute();
-            if (!lib.isNative(this)) {
-                setNativePointer(toPyObjectNode.execute(this));
-            }
-        } finally {
-            gil.release(mustRelease);
+                    @Exclusive @Cached InvalidateNativeObjectsAllManagedNode invalidateNode) {
+        invalidateNode.execute();
+        if (!lib.isNative(this)) {
+            setNativePointer(toPyObjectNode.execute(this));
         }
     }
 
@@ -491,26 +465,15 @@ protected boolean hasNativeType() {
     abstract static class GetTypeIDNode {
         @Specialization(assumptions = "singleNativeContextAssumption()")
         static Object doByteArray(@SuppressWarnings("unused") PThreadState receiver,
-                        @Exclusive @Cached GilNode gil,
-                        @Bind("gil.acquire()") boolean mustRelease,
                         @Exclusive @Cached("callGetThreadStateTypeIDUncached()") Object nativeType) {
-            try {
-                // TODO(fa): use weak reference ?
-                return nativeType;
-            } finally {
-                gil.release(mustRelease);
-            }
+            // TODO(fa): use weak reference ?
+            return nativeType;
         }
 
         @Specialization(replaces = "doByteArray")
         static Object doByteArrayMultiCtx(@SuppressWarnings("unused") PThreadState receiver,
-                        @Exclusive @Cached PCallCapiFunction callUnaryNode, @Exclusive @Cached GilNode gil) {
-            boolean mustRelease = gil.acquire();
-            try {
-                return callUnaryNode.call(FUN_GET_THREAD_STATE_TYPE_ID);
-            } finally {
-                gil.release(mustRelease);
-            }
+                        @Exclusive @Cached PCallCapiFunction callUnaryNode) {
+            return callUnaryNode.call(FUN_GET_THREAD_STATE_TYPE_ID);
         }
 
         protected static Object callGetThreadStateTypeIDUncached() {