[GR-28394] Make test_multiprocessing_spawn pass.

PullRequest: graalpython/1921

Author: tomasstupka

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

@@ -65,6 +65,10 @@ def prepare_test_decimal(self, module):
     def loadTestsFromModule(self, module, pattern=None):
         if module.__name__.endswith('test_decimal'):
             return self.prepare_test_decimal(module)
+        if module.__name__.endswith('test_multiprocessing_spawn'):
+            sys.path.insert(1, os.path.dirname(module.__name__.replace(".", "/")))
+            import _test_multiprocessing
+            sys.modules['__main__'] = _test_multiprocessing
         suite = super().loadTestsFromModule(module, pattern=pattern)
         test_main = getattr(module, 'test_main', None)
         if callable(test_main):

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_multiprocessing_spawn.txt

@@ -79,7 +79,6 @@
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLogger;
-import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.debug.DebuggerTags;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -101,11 +100,7 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.Source.SourceBuilder;
-import java.util.List;
 import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.LinkedBlockingQueue;
 
 @TruffleLanguage.Registration(id = PythonLanguage.ID, //
                 name = PythonLanguage.NAME, //
@@ -227,8 +222,6 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
 
     private final Map<Long, ChildContextData> childContextData = new ConcurrentHashMap<>();
 
-    private final SharedMultiprocessingData sharedMPData = new SharedMultiprocessingData();
-
     @TruffleBoundary
     public Thread getChildContextThread(long tid) {
         return childContextThreads.get(tid);
@@ -254,19 +247,10 @@ public void putChildContextData(long id, ChildContextData data) {
         childContextData.put(id, data);
     }
 
-    @TruffleBoundary
-    public void removeChildContextData(long id) {
-        childContextData.remove(id);
-    }
-
     public static PythonLanguage get(Node node) {
         return REFERENCE.get(node);
     }
 
-    public synchronized SharedMultiprocessingData getSharedMultiprocessingData() {
-        return sharedMPData;
-    }
-
     public static int getNumberOfSpecialSingletons() {
         return CONTEXT_INSENSITIVE_SINGLETONS.length;
     }
@@ -895,103 +879,4 @@ public RootCallTarget getDescriptorCallTarget(BuiltinMethodDescriptor descriptor
         return callTarget;
     }
 
-    public static class SharedMultiprocessingData {
-
-        private final SortedMap<Integer, LinkedBlockingQueue<Object>> sharedContextData = new TreeMap<>();
-
-        /**
-         * @return fake (negative) fd values to avoid clash with real file descriptors and to detect
-         *         potential usage by other python builtins
-         */
-        @TruffleBoundary
-        public int[] pipe() {
-            synchronized (sharedContextData) {
-                LinkedBlockingQueue<Object> q = new LinkedBlockingQueue<>();
-                int readFD = nextFreeFd();
-                sharedContextData.put(readFD, q);
-                int writeFD = nextFreeFd();
-                sharedContextData.put(writeFD, q);
-                return new int[]{readFD, writeFD};
-            }
-        }
-
-        /**
-         * Must be called in a synchronized (sharedContextData) block which also writes the new fd
-         * into the sharedContextData map.
-         */
-        @TruffleBoundary
-        private int nextFreeFd() {
-            if (sharedContextData.isEmpty()) {
-                return -1;
-            }
-            return sharedContextData.firstKey() - 1;
-        }
-
-        @TruffleBoundary
-        public boolean hasFD(int fd) {
-            synchronized (sharedContextData) {
-                return sharedContextData.containsKey(fd);
-            }
-        }
-
-        @TruffleBoundary
-        public boolean addSharedContextData(int fd, byte[] bytes, Runnable noFDHandler) {
-            LinkedBlockingQueue<Object> q = getQueue(fd);
-            if (q == null) {
-                noFDHandler.run();
-                return false;
-            }
-            q.add(bytes);
-            return true;
-        }
-
-        @TruffleBoundary
-        public void makeReadable(int fd, Runnable noFDHandler) {
-            LinkedBlockingQueue<Object> q = getQueue(fd);
-            if (q == null) {
-                noFDHandler.run();
-                return;
-            }
-            q.add(PythonUtils.EMPTY_BYTE_ARRAY);
-        }
-
-        @TruffleBoundary
-        public Object takeSharedContextData(Node node, int fd, Runnable noFDHandler) {
-            LinkedBlockingQueue<Object> q = getQueue(fd);
-            if (q == null) {
-                noFDHandler.run();
-                return null;
-            }
-            Object[] o = new Object[]{PNone.NONE};
-            TruffleSafepoint.setBlockedThreadInterruptible(node, (lbq) -> {
-                o[0] = lbq.take();
-            }, q);
-            return o[0];
-        }
-
-        @TruffleBoundary
-        public boolean isEmpty(int fd, Runnable noFDHandler) {
-            LinkedBlockingQueue<Object> q = getQueue(fd);
-            if (q == null) {
-                noFDHandler.run();
-                return false;
-            }
-            return q.isEmpty();
-        }
-
-        @TruffleBoundary
-        public void closeFDs(List<Integer> fds) {
-            synchronized (sharedContextData) {
-                for (Integer fd : fds) {
-                    sharedContextData.remove(fd);
-                }
-            }
-        }
-
-        private LinkedBlockingQueue<Object> getQueue(int fd) {
-            synchronized (sharedContextData) {
-                return sharedContextData.get(fd);
-            }
-        }
-    }
 }