Author: Remi Meier <[email protected]>
Branch: c7
Changeset: r645:53410d7b096d
Date: 2014-01-18 17:33 +0100
http://bitbucket.org/pypy/stmgc/changeset/53410d7b096d/
Log: fix
diff --git a/c7/core.c b/c7/core.c
--- a/c7/core.c
+++ b/c7/core.c
@@ -19,7 +19,7 @@
#define NB_PAGES (256*256) // 256MB
#define NB_THREADS 2
#define MAP_PAGES_FLAGS (MAP_SHARED | MAP_ANONYMOUS | MAP_NORESERVE)
-#define LARGE_OBJECT_WORDS 220 // XXX was 36
+#define LARGE_OBJECT_WORDS 230 // XXX was 36
#define NB_NURSERY_PAGES 1024
#define LENGTH_SHADOW_STACK 163840
diff --git a/duhton/duhton.c b/duhton/duhton.c
--- a/duhton/duhton.c
+++ b/duhton/duhton.c
@@ -58,7 +58,9 @@
if (interactive) {
Du_Print(res, 1);
}
+ _du_save1(stm_thread_local_obj);
stm_stop_transaction();
+ _du_restore1(stm_thread_local_obj);
Du_TransactionRun();
if (!interactive)
diff --git a/duhton/duhton.h b/duhton/duhton.h
--- a/duhton/duhton.h
+++ b/duhton/duhton.h
@@ -188,4 +188,5 @@
extern pthread_t *all_threads;
extern int all_threads_count;
+extern __thread DuObject *stm_thread_local_obj; /* XXX temp */
#endif /* _DUHTON_H_ */
diff --git a/duhton/transaction.c b/duhton/transaction.c
--- a/duhton/transaction.c
+++ b/duhton/transaction.c
@@ -64,6 +64,7 @@
_du_write1(root);
root->cdr = stm_thread_local_obj;
stm_stop_transaction();
+
stm_thread_local_obj = NULL;
run_all_threads();
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
