[pypy-commit] stmgc hashtable: Fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: hashtable
Changeset: r1494:d24e8a6c34f3
Date: 2014-11-05 08:26 +0100
http://bitbucket.org/pypy/stmgc/changeset/d24e8a6c34f3/

Log:	Fixes

diff --git a/c7/stm/hashtable.c b/c7/stm/hashtable.c
--- a/c7/stm/hashtable.c
+++ b/c7/stm/hashtable.c
@@ -134,6 +134,9 @@
                                   uintptr_t biggercount,
                                   bool remove_unread)
 {
+    dprintf(("rehash %p to %ld, remove_unread=%d\n",
+             hashtable, biggercount, (int)remove_unread));
+
     size_t size = (offsetof(stm_hashtable_table_t, items)
                    + biggercount * sizeof(stm_hashtable_entry_t *));
     stm_hashtable_table_t *biggertable = malloc(size);
@@ -239,7 +242,7 @@
     if (rc > 6) {
         /* we can only enter here once!  If we allocate stuff, we may
            run the GC, and so 'hashtableobj' might move afterwards. */
-        if (_is_young(hashtableobj)) {
+        if (_is_from_same_transaction(hashtableobj)) {
             entry = (stm_hashtable_entry_t *)
                 stm_allocate(sizeof(stm_hashtable_entry_t));
             entry->userdata = stm_hashtable_entry_userdata;
@@ -247,6 +250,7 @@
             entry->object = NULL;
         }
         else {
+            acquire_privatization_lock();
             char *p = allocate_outside_nursery_large(
                           sizeof(stm_hashtable_entry_t));
             entry = (stm_hashtable_entry_t *)(p - stm_object_pages);
@@ -261,6 +265,7 @@
                 e->index = index;
                 e->object = NULL;
             }
+            release_privatization_lock();
         }
         write_fence();     /* make sure 'entry' is fully initialized here */
         table->items[i] = entry;
@@ -341,9 +346,34 @@
     }
 }
 
+static void _hashtable_minor_trace(object_t **pobj)
+{
+    abort();
+    object_t *obj = *pobj;
+    if (!_is_in_nursery(obj))
+        return;
+
+    TRACE_FOR_MINOR_COLLECTION(pobj);
+
+    obj = *pobj;
+    char *real_obj = REAL_ADDRESS(STM_SEGMENT->segment_base, obj);
+    assert(((struct stm_hashtable_entry_s *)real_obj)->userdata ==
+           stm_hashtable_entry_userdata);
+
+    long j, num = STM_SEGMENT->segment_num;
+    for (j = 0; j <= NB_SEGMENTS; j++) {
+        if (j == num)
+            continue;
+        memcpy(REAL_ADDRESS(get_segment_base(j), obj), real_obj,
+               sizeof(struct stm_hashtable_entry_s));
+    }
+}
+
 void stm_hashtable_tracefn(stm_hashtable_t *hashtable, void trace(object_t **))
 {
-    if (trace == TRACE_FOR_MAJOR_COLLECTION)
+    if (trace == TRACE_FOR_MINOR_COLLECTION)
+        trace = &_hashtable_minor_trace;
+    else if (trace == TRACE_FOR_MAJOR_COLLECTION)
         _stm_compact_hashtable(hashtable);
 
     stm_hashtable_table_t *table;
diff --git a/c7/stm/nursery.c b/c7/stm/nursery.c
--- a/c7/stm/nursery.c
+++ b/c7/stm/nursery.c
@@ -333,6 +333,7 @@
 }
 
 
+#define TRACE_FOR_MINOR_COLLECTION  (&minor_trace_if_young)
 
 static inline void _collect_now(object_t *obj)
 {
@@ -346,7 +347,7 @@
            outside the nursery, possibly forcing nursery objects out and
            adding them to 'objects_pointing_to_nursery' as well. */
         char *realobj = REAL_ADDRESS(STM_SEGMENT->segment_base, obj);
-        stmcb_trace((struct object_s *)realobj, &minor_trace_if_young);
+        stmcb_trace((struct object_s *)realobj, TRACE_FOR_MINOR_COLLECTION);
 
         obj->stm_flags |= GCFLAG_WRITE_BARRIER;
     }