Author: Armin Rigo <[email protected]>
Branch: nogil-unsafe
Changeset: r89685:e8a2d7c06655
Date: 2017-01-21 11:12 +0100
http://bitbucket.org/pypy/pypy/changeset/e8a2d7c06655/
Log: tweak
diff --git a/rpython/memory/gc/incminimark.py b/rpython/memory/gc/incminimark.py
--- a/rpython/memory/gc/incminimark.py
+++ b/rpython/memory/gc/incminimark.py
@@ -879,9 +879,11 @@
self.nublocks = rthread.get_threadlocal_base()
else:
if llop.get_gil_share_count(lltype.Signed) > 1:
- assert old_color == 0
+ self._gc_unlock()
+ ll_assert(old_color == 0, "old_color != 0")
old_color = llop.get_gil_color(lltype.Signed)
llop.set_gil_color(lltype.Void, self.gil_gc_color)
+ self._gc_lock()
continue # waited, maybe the situation changed
minor_collection_count += 1
if minor_collection_count == 1:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
