Author: Remi Meier <remi.me...@gmail.com>
Branch:
Changeset: r1658:028d5446e347
Date: 2015-02-24 16:58 +0100
http://bitbucket.org/pypy/stmgc/changeset/028d5446e347/
Log: Merge
diff --git a/c7/stm/core.c b/c7/stm/core.c
--- a/c7/stm/core.c
+++ b/c7/stm/core.c
@@ -833,7 +833,6 @@
void stm_commit_transaction(void)
{
- restart_all:
exec_local_finalizers();
assert(!_has_mutex());
@@ -853,11 +852,6 @@
Important: we should not call cond_wait() in the meantime. */
synchronize_all_threads(STOP_OTHERS_UNTIL_MUTEX_UNLOCK);
- if (any_local_finalizers()) {
- s_mutex_unlock();
- goto restart_all;
- }
-
/* detect conflicts */
if (detect_write_read_conflicts())
goto restart;
diff --git a/c7/stm/forksupport.c b/c7/stm/forksupport.c
--- a/c7/stm/forksupport.c
+++ b/c7/stm/forksupport.c
@@ -220,6 +220,7 @@
if (endpagenum == NB_PAGES)
break; /* done */
pagenum = (uninitialized_page_stop - stm_object_pages) / 4096UL;
+ pagenum--; /* contains data from largemalloc */
endpagenum = NB_PAGES;
}
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
