[pypy-commit] stmgc use-gcc: Backed out changeset: c0e7e64a894d

Raemi noreply at buildbot.pypy.org
Fri Jul 24 13:37:26 CEST 2015


Author: Remi Meier <remi.meier at inf.ethz.ch>
Branch: use-gcc
Changeset: r1897:ce143e28d5ee
Date: 2015-07-24 13:38 +0200
http://bitbucket.org/pypy/stmgc/changeset/ce143e28d5ee/

Log:	Backed out changeset: c0e7e64a894d (was actually done already in a
	different way)

diff --git a/c8/stm/sync.c b/c8/stm/sync.c
--- a/c8/stm/sync.c
+++ b/c8/stm/sync.c
@@ -14,8 +14,7 @@
         pthread_mutex_t global_mutex;
         pthread_cond_t cond[_C_TOTAL];
         /* some additional pieces of global state follow */
-        uint8_t in_use1[NB_SEGMENTS];   /* 1 if running a pthread, idx=0 unused,
-                                           2 if soon_finished_or_inevitable_thread_segment */
+        uint8_t in_use1[NB_SEGMENTS];   /* 1 if running a pthread, idx=0 unused */
     };
     char reserved[192];
 } sync_ctl __attribute__((aligned(64)));
diff --git a/c8/stmgc.h b/c8/stmgc.h
--- a/c8/stmgc.h
+++ b/c8/stmgc.h
@@ -437,10 +437,6 @@
 
    stm_enter_transactional_zone() and stm_leave_transactional_zone()
    preserve the value of errno.
-
-   stm_leave_transactional_zone_final() commits the transaction
-   unconditionally and allows the caller to teardown the whole
-   thread (unregister thread local, etc.).
 */
 #ifdef STM_DEBUGPRINT
 #include <stdio.h>
@@ -472,11 +468,6 @@
         _stm_leave_noninevitable_transactional_zone();
     }
 }
-static inline void stm_leave_transactional_zone_final(stm_thread_local_t *tl) {
-    assert(STM_SEGMENT->running_thread == tl);
-    _stm_commit_transaction();
-}
-
 
 /* stm_force_transaction_break() is in theory equivalent to
    stm_leave_transactional_zone() immediately followed by


More information about the pypy-commit mailing list