Release GIL in SSL socket operations

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/PMemoryBIO.java

@@ -81,14 +81,15 @@ public ByteBuffer getBufferForReading() {
 
     /**
      * Update read position from a buffer previously obtained using {@link #getBufferForReading()}
-     * The caller is responsible for making sure the buffer was obtained for this BIO, that this BIO
-     * was not concurrently updated since the {@link #getBufferForReading()} call and that the
-     * position was not moved backwards.
+     * The caller is responsible for making sure the buffer was obtained for this BIO and that the
+     * position was not moved backwards. If the BIO was concurrently modified, the contents are
+     * undefined, but the structure stays valid.
      */
     public void applyRead(ByteBuffer buffer) {
-        readPosition = buffer.position();
-        assert buffer.array() == bytes;
-        assert readPosition <= writePosition;
+        if (buffer.array() == bytes) {
+            readPosition = buffer.position();
+            assert readPosition <= writePosition;
+        }
     }
 
     /**
@@ -104,14 +105,15 @@ public ByteBuffer getBufferForWriting() {
 
     /**
      * Update write position from a buffer previously obtained using {@link #getBufferForWriting()}.
-     * The caller is responsible for making sure the buffer was obtained for this BIO, that this BIO
-     * was not concurrently updated since the {@link #getBufferForWriting()} call and that the
-     * position was not moved backwards.
+     * The caller is responsible for making sure the buffer was obtained for this BIO and that the
+     * position was not moved backwards. If the BIO was concurrently modified, the contents are
+     * undefined, but the structure stays valid.
      */
     public void applyWrite(ByteBuffer buffer) {
-        writePosition = buffer.position();
-        assert buffer.array() == bytes;
-        assert readPosition <= writePosition;
+        if (buffer.array() == bytes) {
+            writePosition = buffer.position();
+            assert readPosition <= writePosition;
+        }
     }
 
     /**

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/SSLEngineHelper.java

@@ -59,6 +59,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PNodeWithRaise;
 import com.oracle.graal.python.nodes.PRaiseNode;
+import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -392,6 +393,7 @@ private static PException handleSSLException(PNodeWithRaise node, SSLException e
         throw PRaiseSSLErrorNode.raiseUncached(node, SSLErrorCode.ERROR_SSL, e.toString());
     }
 
+    @SuppressWarnings("try")
     private static int obtainMoreInput(PNodeWithRaise node, SSLEngine engine, PMemoryBIO networkInboundBIO, PSocket socket, TimeoutHelper timeoutHelper) throws IOException, OverflowException {
         if (socket != null) {
             if (socket.getSocket() == null) {
@@ -426,7 +428,7 @@ private static int obtainMoreInput(PNodeWithRaise node, SSLEngine engine, PMemor
             ByteBuffer writeBuffer = networkInboundBIO.getBufferForWriting();
             // Avoid reading more that we determined
             writeBuffer.limit(writeBuffer.position() + toRead);
-            try {
+            try (GilNode.UncachedRelease gil = GilNode.uncachedRelease()) {
                 return SocketUtils.recv(node, socket, writeBuffer, timeoutHelper == null ? 0 : timeoutHelper.checkAndGetRemainingTimeout(node));
             } finally {
                 networkInboundBIO.applyWrite(writeBuffer);
@@ -443,22 +445,25 @@ private static int obtainMoreInput(PNodeWithRaise node, SSLEngine engine, PMemor
         }
     }
 
+    @SuppressWarnings("try")
     private static void emitOutputOrRaiseWantWrite(PNodeWithRaise node, PMemoryBIO networkOutboundBIO, PSocket socket, TimeoutHelper timeoutHelper) throws IOException {
         if (socket != null && networkOutboundBIO.getPending() > 0) {
             if (socket.getSocket() == null) {
                 // TODO use raiseOsError with ENOTCONN
                 throw node.raise(OSError);
             }
+            int pendingBytes = networkOutboundBIO.getPending();
             // Network output
             ByteBuffer readBuffer = networkOutboundBIO.getBufferForReading();
-            try {
-                int writtenBytes = SocketUtils.send(node, socket, readBuffer, timeoutHelper == null ? 0 : timeoutHelper.checkAndGetRemainingTimeout(node));
-                if (writtenBytes == 0) {
-                    throw PRaiseSSLErrorNode.raiseUncached(node, SSLErrorCode.ERROR_WANT_WRITE, ErrorMessages.SSL_WANT_WRITE);
-                }
+            int writtenBytes;
+            try (GilNode.UncachedRelease gil = GilNode.uncachedRelease()) {
+                writtenBytes = SocketUtils.send(node, socket, readBuffer, timeoutHelper == null ? 0 : timeoutHelper.checkAndGetRemainingTimeout(node));
             } finally {
                 networkOutboundBIO.applyRead(readBuffer);
             }
+            if (writtenBytes < pendingBytes) {
+                throw PRaiseSSLErrorNode.raiseUncached(node, SSLErrorCode.ERROR_WANT_WRITE, ErrorMessages.SSL_WANT_WRITE);
+            }
         }
     }
 }