[pypy-commit] stmgc c8-adaptive-trx-length-per-thread: Remove former transaction length back off mechanism and comment out debug output

[tobweber]

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-adaptive-trx-length-per-thread
Changeset: r2061:5f7220351ad9
Date: 2017-05-12 17:56 +0200
http://bitbucket.org/pypy/stmgc/changeset/5f7220351ad9/

Log:	Remove former transaction length back off mechanism and comment out
	debug output

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -1167,8 +1167,7 @@
     if (number_of_segments_in_use() < 2) {
         stm_become_inevitable(tl, "single thread mode");
     }
-    /* TODO remove: else, 'nursery_mark' was already set
-        in abort_data_structures_from_segment_num() */
+
     STM_SEGMENT->nursery_mark = ((stm_char *)_stm_nursery_start +
                                         stm_get_transaction_length(tl));
     return repeat_count;
@@ -1532,22 +1531,6 @@
     if (pseg->active_queues)
         queues_deactivate_all(pseg, /*at_commit=*/false);
 
-
-    /* Set the next nursery_mark: first compute the value that
-       nursery_mark must have had at the start of the aborted transaction */
-    stm_char *old_mark =pseg->pub.nursery_mark + pseg->total_throw_away_nursery;
-
-    /* This means that the limit, in term of bytes, was: */
-    uintptr_t old_limit = old_mark - (stm_char *)_stm_nursery_start;
-
-    /* If 'total_throw_away_nursery' is smaller than old_limit, use that */
-    if (pseg->total_throw_away_nursery < old_limit)
-        old_limit = pseg->total_throw_away_nursery;
-
-    /* Now set the new limit to 90% of the old limit */
-    pseg->pub.nursery_mark = ((stm_char *)_stm_nursery_start +
-                              (uintptr_t)(old_limit * 0.9));
-
 #ifdef STM_NO_AUTOMATIC_SETJMP
     did_abort = 1;
 #endif
diff --git a/c8/stm/nursery.c b/c8/stm/nursery.c
--- a/c8/stm/nursery.c
+++ b/c8/stm/nursery.c
@@ -73,7 +73,7 @@
     }
     uintptr_t result = DEFAULT_FILL_MARK_NURSERY_BYTES +
         (uintptr_t)(LARGE_FILL_MARK_NURSERY_BYTES * relative_additional_length);
-    printf("%020" PRIxPTR "\n", result);
+    // printf("%020" PRIxPTR "\n", result);
     return result;
 }