Author: Remi Meier <[email protected]>
Branch: stmgc-c7
Changeset: r71486:d95eff23a6ae
Date: 2014-05-13 13:20 +0200
http://bitbucket.org/pypy/pypy/changeset/d95eff23a6ae/
Log: fix logic in last commit
diff --git a/rpython/translator/stm/src_stm/stmgcintf.c
b/rpython/translator/stm/src_stm/stmgcintf.c
--- a/rpython/translator/stm/src_stm/stmgcintf.c
+++ b/rpython/translator/stm/src_stm/stmgcintf.c
@@ -228,12 +228,17 @@
/* Reduce the limit so that inevitable transactions are generally
shorter. We depend a bit on stmcb_commit_soon() in order for
other transactions to signal us in case we block them. */
+ uintptr_t t;
if (pypy_stm_ready_atomic == 1) {
- pypy_stm_nursery_low_fill_mark >>= 2;
+ t = pypy_stm_nursery_low_fill_mark;
+ t = _stm_nursery_start + (t - _stm_nursery_start) >> 2;
+ pypy_stm_nursery_low_fill_mark = t;
}
else {
assert(pypy_stm_nursery_low_fill_mark == (uintptr_t) -1);
- pypy_stm_nursery_low_fill_mark_saved >>= 2;
+ t = pypy_stm_nursery_low_fill_mark_saved;
+ t = _stm_nursery_start + (t - _stm_nursery_start) >> 2;
+ pypy_stm_nursery_low_fill_mark_saved = t;
}
}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
