[pypy-commit] stmgc c8-new-page-handling: actually free backup *after* copying from it

[Raemi]

Author: Remi Meier <remi.me...@inf.ethz.ch>
Branch: c8-new-page-handling
Changeset: r1430:65c9f7a4a27d
Date: 2014-09-26 15:30 +0200
http://bitbucket.org/pypy/stmgc/changeset/65c9f7a4a27d/

Log:    actually free backup *after* copying from it

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -32,8 +32,9 @@
                 continue;
         }
 
-        dprintf(("import slice obj=%p off=%lu pg=%lu\n",
-                 obj, SLICE_OFFSET(undo->slice), current_page_num));
+        dprintf(("import slice seg=%d obj=%p off=%lu sz=%d pg=%lu\n",
+                 from_segnum, obj, SLICE_OFFSET(undo->slice),
+                 SLICE_SIZE(undo->slice), current_page_num));
         char *src, *dst;
         if (src_segment_base != NULL)
             src = REAL_ADDRESS(src_segment_base, oslice);
@@ -232,7 +233,7 @@
     /* Don't check this 'cl'. This entry is already checked */
 
     if (STM_PSEGMENT->transaction_state == TS_INEVITABLE) {
-        assert(cl->next == -1);
+        assert(cl->next == (void*)-1);
         return;
     }
 
@@ -691,8 +692,9 @@
                undo->backup,
                SLICE_SIZE(undo->slice));
 
-        if (SLICE_OFFSET(undo->slice) == 0) {
-            /* only free bk copy once: */
+        size_t obj_size = stmcb_size_rounded_up(undo->backup);
+        if (obj_size - SLICE_OFFSET(undo->slice) <= 4096UL) {
+            /* only free bk copy once (last slice): */
             free(undo->backup);
         }
     }
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit