[pypy-commit] stmgc c8-tcp-style-trx-length: Backed out changeset dbea548c4c6e

tobweber pypy.commits at gmail.com
Mon Jul 31 19:23:06 EDT 2017


Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-tcp-style-trx-length
Changeset: r2136:5563999ed658
Date: 2017-07-23 13:37 +0200
http://bitbucket.org/pypy/stmgc/changeset/5563999ed658/

Log:	Backed out changeset dbea548c4c6e

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -347,9 +347,6 @@
     }
 
     if (thread_local_for_logging != NULL) {
-        if (needs_abort) {
-            stm_transaction_length_handle_validation(thread_local_for_logging, true);
-        }
         stop_timer_and_publish_for_thread(
             thread_local_for_logging, STM_DURATION_VALIDATION);
     }
@@ -1585,6 +1582,8 @@
     tl->self_or_0_if_atomic = (intptr_t)tl;   /* clear the 'atomic' flag */
     STM_PSEGMENT->atomic_nesting_levels = 0;
 
+    stm_transaction_length_handle_validation(tl, true);
+
     if (tl->mem_clear_on_abort)
         memset(tl->mem_clear_on_abort, 0, tl->mem_bytes_to_clear_on_abort);
     if (tl->mem_reset_on_abort) {


More information about the pypy-commit mailing list