Author: Remi Meier <meier...@student.ethz.ch>
Branch:
Changeset: r345:7ae6aa7d16af
Date: 2013-07-04 09:26 +0200
http://bitbucket.org/pypy/stmgc/changeset/7ae6aa7d16af/
Log: refactor keeping alive the h_originals in major collections
diff --git a/c4/gcpage.c b/c4/gcpage.c
--- a/c4/gcpage.c
+++ b/c4/gcpage.c
@@ -212,6 +212,24 @@
static struct GcPtrList objects_to_trace;
+static void keep_original_alive(gcptr obj)
+{
+ /* keep alive the original of a visited object */
+ gcptr id_copy = (gcptr)obj->h_original;
+ /* prebuilt original objects may have a predifined
+ hash in h_original */
+ if (id_copy && !(obj->h_tid & GCFLAG_PREBUILT_ORIGINAL)) {
+ if (!(id_copy->h_tid & GCFLAG_PREBUILT_ORIGINAL)) {
+ gcptrlist_insert(&objects_to_trace, id_copy);
+ }
+ else {
+ /* prebuilt originals won't get collected anyway
+ and if they are not reachable in any other way,
+ we only ever need their location, not their content */
+ }
+ }
+}
+
static void visit(gcptr *pobj)
{
gcptr obj = *pobj;
@@ -226,6 +244,8 @@
obj->h_tid &= ~GCFLAG_PUBLIC_TO_PRIVATE; /* see fix_outdated() */
obj->h_tid |= GCFLAG_VISITED;
gcptrlist_insert(&objects_to_trace, obj);
+
+ keep_original_alive(obj);
}
}
else if (obj->h_tid & GCFLAG_PUBLIC) {
@@ -235,15 +255,6 @@
if (!(obj->h_revision & 2)) {
/* go visit the more recent version */
obj = (gcptr)obj->h_revision;
- if ((gcptr)obj->h_original == prev_obj
- && !(prev_obj->h_tid & GCFLAG_VISITED)) {
- assert(0); // why never hit?
- // prev_obj is the ID copy
- prev_obj->h_tid &= ~GCFLAG_PUBLIC_TO_PRIVATE;
- /* see fix_outdated() */
- prev_obj->h_tid |= GCFLAG_VISITED;
- gcptrlist_insert(&objects_to_trace, prev_obj);
- }
}
else {
/* it's a stub: keep it if it points to a protected version,
@@ -253,12 +264,10 @@
*/
assert(obj->h_tid & GCFLAG_STUB);
obj = (gcptr)(obj->h_revision - 2);
- if (!(obj->h_tid & GCFLAG_PUBLIC) || !(prev_obj->h_original)) {
- assert(prev_obj->h_original); // why never hit?
- assert(!(obj->h_tid & GCFLAG_PUBLIC));
- /* never?: stub->public where stub is id copy? */
+ if (!(obj->h_tid & GCFLAG_PUBLIC)) {
+ prev_obj->h_tid |= GCFLAG_VISITED;
+ keep_original_alive(prev_obj);
- prev_obj->h_tid |= GCFLAG_VISITED;
assert(*pobj == prev_obj);
gcptr obj1 = obj;
visit(&obj1); /* recursion, but should be only once */
@@ -291,18 +300,11 @@
gcptr B = (gcptr)obj->h_revision;
assert(B->h_tid & (GCFLAG_PUBLIC | GCFLAG_BACKUP_COPY));
- gcptr id_copy = (gcptr)obj->h_original;
- if (id_copy && id_copy != B) {
- assert(id_copy == (gcptr)B->h_original);
+ if (obj->h_original && (gcptr)obj->h_original != B) {
+ /* if B is original, it will be visited anyway */
+ assert(obj->h_original == B->h_original);
assert(!(obj->h_tid & GCFLAG_PREBUILT_ORIGINAL));
- if (!(id_copy->h_tid & GCFLAG_PREBUILT_ORIGINAL)) {
- gcptrlist_insert(&objects_to_trace, id_copy);
- }
- else {
- /* prebuilt originals won't get collected anyway
- and if they are not reachable in any other way,
- we only ever need their location, not their content */
- }
+ keep_original_alive(obj);
}
obj->h_tid |= GCFLAG_VISITED;
@@ -323,6 +325,7 @@
}
}
+
static void visit_keep(gcptr obj)
{
if (!(obj->h_tid & GCFLAG_VISITED)) {
@@ -334,6 +337,7 @@
assert(!(obj->h_revision & 2));
visit((gcptr *)&obj->h_revision);
}
+ keep_original_alive(obj);
}
}
diff --git a/c4/nursery.c b/c4/nursery.c
--- a/c4/nursery.c
+++ b/c4/nursery.c
@@ -266,7 +266,7 @@
return fresh_old_copy;
}
-inline void copy_to_old_id_copy(gcptr obj, gcptr id)
+void copy_to_old_id_copy(gcptr obj, gcptr id)
{
assert(!is_in_nursery(thread_descriptor, id));
assert(id->h_tid & GCFLAG_OLD);
diff --git a/c4/steal.c b/c4/steal.c
--- a/c4/steal.c
+++ b/c4/steal.c
@@ -1,7 +1,7 @@
#include "stmimpl.h"
-inline void copy_to_old_id_copy(gcptr obj, gcptr id);
+void copy_to_old_id_copy(gcptr obj, gcptr id);
gcptr stm_stub_malloc(struct tx_public_descriptor *pd)
{
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
