[pypy-commit] stmgc rewind_setjmp: Adapt duhton, step 1

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: rewind_setjmp
Changeset: r1289:58a9c340002a
Date: 2014-08-09 18:22 +0200
http://bitbucket.org/pypy/stmgc/changeset/58a9c340002a/

Log:    Adapt duhton, step 1

diff --git a/duhton/transaction.c b/duhton/transaction.c
--- a/duhton/transaction.c
+++ b/duhton/transaction.c
@@ -162,8 +162,9 @@
 
 void *run_thread(void *thread_id)
 {
-    stm_jmpbuf_t here;
+    rewind_jmp_buf rjbuf;
     stm_register_thread_local(&stm_thread_local);
+    stm_rewind_jmp_enterframe(&stm_thread_local, &rjbuf);
 
     TLOBJ = NULL;
 
@@ -176,7 +177,7 @@
 
         TLOBJ = cell;
         stm_commit_transaction(); /* inevitable */
-        STM_START_TRANSACTION(&stm_thread_local, here);
+        stm_start_transaction(&stm_thread_local);
         cell = TLOBJ;
         TLOBJ = NULL;
 
@@ -187,6 +188,7 @@
     }
 
     stm_flush_timing(&stm_thread_local, 1);
+    stm_rewind_jmp_leaveframe(&stm_thread_local, &rjbuf);
     stm_unregister_thread_local(&stm_thread_local);
 
     return NULL;
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit