From 3e4c2e71bb7d6d9b16613571673b3a8ca7555c96 Mon Sep 17 00:00:00 2001 From: Alexey Borzenkov Date: Sat, 16 May 2015 23:02:13 +0300 Subject: [PATCH] Try to fix spurious thread test failures --- tests/test_leaks.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/test_leaks.py b/tests/test_leaks.py index d66cd7a8..074d5ed7 100644 --- a/tests/test_leaks.py +++ b/tests/test_leaks.py @@ -2,6 +2,7 @@ import sys import gc +import time import weakref import greenlet import threading @@ -28,6 +29,20 @@ def test_kwarg_refs(self): if greenlet.GREENLET_USE_GC: # These only work with greenlet gc support + def recycle_threads(self): + # By introducing a thread that does sleep we allow other threads, + # that have triggered their __block condition, but did not have a + # chance to deallocate their thread state yet, to finally do so. + # The way it works is by requring a GIL switch (different thread), + # which does a GIL release (sleep), which might do a GIL switch + # to finished threads and allow them to clean up. + def worker(): + time.sleep(0.001) + t = threading.Thread(target=worker) + t.start() + time.sleep(0.001) + t.join() + def test_threaded_leak(self): gg = [] def worker(): @@ -39,7 +54,7 @@ def worker(): t.join() del t greenlet.getcurrent() # update ts_current - gc.collect() + self.recycle_threads() greenlet.getcurrent() # update ts_current gc.collect() greenlet.getcurrent() # update ts_current @@ -62,7 +77,7 @@ def additional(): t.join() del t greenlet.getcurrent() # update ts_current - gc.collect() + self.recycle_threads() greenlet.getcurrent() # update ts_current gc.collect() greenlet.getcurrent() # update ts_current