[pypy-svn] pypy default: Revert this part of the change.
arigo
commits-noreply at bitbucket.org
Wed Feb 2 16:33:33 CET 2011
Author: Armin Rigo <arigo at tunes.org>
Branch:
Changeset: r41564:e16ea8c81bc0
Date: 2011-02-01 15:15 +0100
http://bitbucket.org/pypy/pypy/changeset/e16ea8c81bc0/
Log: Revert this part of the change.
diff --git a/pypy/rpython/memory/gctransform/framework.py b/pypy/rpython/memory/gctransform/framework.py
--- a/pypy/rpython/memory/gctransform/framework.py
+++ b/pypy/rpython/memory/gctransform/framework.py
@@ -1451,7 +1451,7 @@
gcdata.active_thread = new_aid
def collect_stack(aid, stacktop, callback):
- if stacktop != llmemory.NULL and aid != gcdata.active_thread:
+ if stacktop != llmemory.NULL and aid != get_aid():
# collect all valid stacks from the dict (the entry
# corresponding to the current thread is not valid)
gc = self.gc
@@ -1463,8 +1463,6 @@
addr += sizeofaddr
def collect_more_stacks(callback):
- ll_assert(get_aid() == gcdata.active_thread,
- "collect_more_stacks(): invalid active_thread")
gcdata.thread_stacks.foreach(collect_stack, callback)
def _free_if_not_current(aid, stacktop, _):
More information about the Pypy-commit
mailing list