Author: Remi Meier <remi.me...@inf.ethz.ch>
Branch: c8-new-page-handling
Changeset: r1431:96346c488f28
Date: 2014-09-26 15:36 +0200
http://bitbucket.org/pypy/stmgc/changeset/96346c488f28/
Log: bah, another missing SLICE_OFFSET
diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -689,13 +689,15 @@
char *dst = REAL_ADDRESS(pseg->pub.segment_base, obj);
memcpy(dst + SLICE_OFFSET(undo->slice),
- undo->backup,
+ undo->backup + SLICE_OFFSET(undo->slice),
SLICE_SIZE(undo->slice));
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);
+ dprintf(("reset_modified_from_backup_copies(%d): obj=%p
obj_sz=%lu\n",
+ segment_num, obj, obj_size));
}
}
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
