Author: Armin Rigo <[email protected]>
Branch: c7-more-segments
Changeset: r1054:c7ed97e2f504
Date: 2014-03-16 18:29 +0100
http://bitbucket.org/pypy/stmgc/changeset/c7ed97e2f504/
Log: Forgot about get_segment_base()
diff --git a/c7/stm/core.c b/c7/stm/core.c
--- a/c7/stm/core.c
+++ b/c7/stm/core.c
@@ -272,7 +272,7 @@
assert(_has_mutex_pages());
assert(!_is_young(obj));
- char *segment_base = get_segment(source_segment_num)->segment_base;
+ char *segment_base = get_segment_base(source_segment_num);
uintptr_t start = (uintptr_t)obj;
uintptr_t first_page = start / 4096UL;
struct object_s *realobj = (struct object_s *)
diff --git a/c7/stm/pages.c b/c7/stm/pages.c
--- a/c7/stm/pages.c
+++ b/c7/stm/pages.c
@@ -149,7 +149,7 @@
for (j = 0; j < NB_SEGMENTS; j++) {
if (ps.by_segment & (1 << j)) {
/* Page 'pagenum' is private in segment 'j + 1'. Reshare */
- char *segment_base = stm_object_pages + NB_PAGES * 4096UL * (j+1);
+ char *segment_base = get_segment_base(j + 1);
madvise(segment_base + pagenum * 4096UL, 4096, MADV_DONTNEED);
d_remap_file_pages(segment_base + pagenum * 4096UL,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
