Author: Armin Rigo <ar...@tunes.org>
Branch: copy-over-original2
Changeset: r434:1cdc31909021
Date: 2013-07-24 17:34 +0200
http://bitbucket.org/pypy/stmgc/changeset/1cdc31909021/
Log: Current status: fails here
diff --git a/c4/gcpage.c b/c4/gcpage.c
--- a/c4/gcpage.c
+++ b/c4/gcpage.c
@@ -219,6 +219,7 @@
/* prebuilt original objects may have a predifined
hash in h_original */
if (id_copy && !(obj->h_tid & GCFLAG_PREBUILT_ORIGINAL)) {
+ assert(id_copy->h_tid & GCFLAG_PUBLIC);
if (!(id_copy->h_tid & GCFLAG_PREBUILT_ORIGINAL)) {
id_copy->h_tid &= ~GCFLAG_PUBLIC_TO_PRIVATE;
/* see fix_outdated() */
@@ -608,8 +609,13 @@
if (!(obj->h_tid & GCFLAG_VISITED)) {
/* forget 'obj' */
+ dprintf(("private_from_protected: %p UNLISTED\n", obj));
items[i] = items[--d->private_from_protected.size];
}
+ else {
+ dprintf(("private_from_protected: %p\n", obj));
+ assert(((gcptr)obj->h_revision)->h_tid & GCFLAG_VISITED);
+ }
}
assert(d->old_objects_to_trace.size == 0);
diff --git a/c4/test/test_random.py b/c4/test/test_random.py
--- a/c4/test/test_random.py
+++ b/c4/test/test_random.py
@@ -525,6 +525,6 @@
test_multi_thread(1624)
def test_more_multi_thread():
- py.test.skip("more random tests")
+ #py.test.skip("more random tests")
for i in range(200):
- yield test_multi_thread, 1742/2 + i
+ yield test_multi_thread, 1100 + i
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
