don't use threading module, there's to many issues still with our threads and weakrefs

Author: timfel

graalpython/com.oracle.graal.python.test/src/graalpytest.py

@@ -40,6 +40,8 @@
 #!/usr/bin/env mx python
 import _io
 import sys
+import time
+import _thread
 
 os = sys.modules.get("posix", sys.modules.get("nt", None))
 if os is None:
@@ -51,17 +53,48 @@
 
 verbose = False
 
+print_lock = _thread.RLock()
+class ThreadPool():
+    cnt_lock = _thread.RLock()
+    cnt = 0
+    if os.environ.get(b"ENABLE_THREADED_GRAALPYTEST") == b"true":
+        maxcnt = min(os.cpu_count(), 16)
+        sleep = time.sleep
+        print("Running with %d threads" % maxcnt)
+    else:
+        sleep = lambda x: x
+        maxcnt = 1
 
-import threading
-import _thread
-result_lock = threading.RLock()
-threads = []
-if os.environ.get(b"ENABLE_THREADED_GRAALPYTEST") == b"true":
-    thread_count = min(os.cpu_count(), 16)
-    print("Running with %d threads" % thread_count)
-else:
-    thread_count = 1
-thread_token = threading.Semaphore(thread_count)
+    @classmethod
+    def start(self, function):
+        self.acquire_token()
+        def runner():
+            try:
+                function()
+            finally:
+                self.release_token()
+        _thread.start_new_thread(runner, ())
+        self.sleep(0.5)
+
+    @classmethod
+    def acquire_token(self):
+        while True:
+            with self.cnt_lock:
+                if self.cnt < self.maxcnt:
+                    self.cnt += 1
+                    break
+            self.sleep(1)
+
+    @classmethod
+    def release_token(self):
+        with self.cnt_lock:
+            self.cnt -= 1
+
+    @classmethod
+    def shutdown(self):
+        self.sleep(2)
+        while self.cnt > 0:
+            self.sleep(2)
 
 
 def dump_truffle_ast(func):
@@ -84,7 +117,7 @@ def __init__(self):
 
     def run_safely(self, func, print_immediately=False):
         if verbose:
-            with result_lock:
+            with print_lock:
                 print(u"\n\t\u21B3 ", func.__name__, " ", end="")
         try:
             func()
@@ -118,14 +151,9 @@ def run_test(self, func):
         else:
             def do_run():
                 r = self.run_safely(func)
-                with result_lock:
+                with print_lock:
                     self.success() if r else self.failure()
-                thread_token.release()
-
-            thread_token.acquire()
-            new_thread = threading.Thread(target=do_run)
-            threads.append(new_thread)
-            new_thread.start()
+            ThreadPool.start(do_run)
 
     def success(self):
         self.passed += 1
@@ -338,8 +366,7 @@ def run(self):
                 self.failed += testcase.failed
             if verbose:
                 print()
-        for i, t in enumerate(threads):
-            t.join(timeout=0)
+        ThreadPool.shutdown()
         print("\n\nRan %d tests (%d passes, %d failures)" % (self.passed + self.failed, self.passed, self.failed))
         for e in self.exceptions:
             print(e)