[pypy-commit] stmgc c8-adaptive-trx-length-per-thread: Fix nested measurements of wait time during transaction start

[tobweber]

Author: Tobias Weber 
Branch: c8-adaptive-trx-length-per-thread
Changeset: r2066:e425b6d2a050
Date: 2017-06-09 18:09 +0200
http://bitbucket.org/pypy/stmgc/changeset/e425b6d2a050/

Log:Fix nested measurements of wait time during transaction start

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -1073,14 +1073,15 @@
 
 static void _do_start_transaction(stm_thread_local_t *tl)
 {
-start_timer();
-
 assert(!_stm_in_transaction(tl));
 tl->wait_event_emitted = 0;
 
 acquire_thread_segment(tl);
 /* GS invalid before this point! */
 
+// acquiring segment is measured as wait time
+start_timer();
+
 assert(STM_PSEGMENT->safe_point == SP_NO_TRANSACTION);
 assert(STM_PSEGMENT->transaction_state == TS_NONE);
 timing_event(tl, STM_TRANSACTION_START);
@@ -1127,10 +1128,12 @@
 rv++;/* incr it but enter_safe_point_if_requested() aborted */
 STM_SEGMENT->transaction_read_version = rv;
 
+pause_timer();
 /* Warning: this safe-point may run light finalizers and register
commit/abort callbacks if a major GC is triggered here */
 enter_safe_point_if_requested();
 dprintf(("> start_transaction\n"));
+continue_timer();
 
 s_mutex_unlock();   // XXX it's probably possible to not acquire this here
 
@@ -1149,6 +1152,8 @@
 
 long _stm_start_transaction(stm_thread_local_t *tl)
 {
+start_timer();
+
 s_mutex_lock();
 #ifdef STM_NO_AUTOMATIC_SETJMP
 long repeat_count = did_abort;/* test/support.py */
@@ -1162,10 +1167,17 @@
 memcpy(tl->mem_reset_on_abort, tl->mem_stored_for_reset_on_abort,
tl->mem_bytes_to_reset_on_abort);
 }
+
+// _do_start_transaction is instrumented as well and pauses for waits
+pause_timer();
 _do_start_transaction(tl);
+continue_timer();
 
 STM_SEGMENT->nursery_mark = ((stm_char *)_stm_nursery_start +
 stm_get_transaction_length(tl));
+
+stop_timer_and_publish(STM_DURATION_START_TRX);
+
 return repeat_count;
 }
 
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] stmgc c8-overheads-instrumentation: Fix nested measurement of waiting time and time in validation

[tobweber]

Author: Tobias Weber 
Branch: c8-overheads-instrumentation
Changeset: r2067:39e259c124d6
Date: 2017-06-09 18:58 +0200
http://bitbucket.org/pypy/stmgc/changeset/39e259c124d6/

Log:Fix nested measurement of waiting time and time in validation

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -463,7 +463,9 @@
 #endif
 
 if (STM_PSEGMENT->last_commit_log_entry->next == INEV_RUNNING) {
-wait_for_inevitable();
+pause_timer();
+wait_for_inevitable(); // TODO may abort!! timing event lost
+continue_timer();
 goto retry_from_start;   /* redo _stm_validate() now */
 }
 
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] stmgc c8-overheads-instrumentation: Fix nested measurements of wait time during transaction start

[tobweber]

Author: Tobias Weber 
Branch: c8-overheads-instrumentation
Changeset: r2068:6161d44ff649
Date: 2017-06-09 18:58 +0200
http://bitbucket.org/pypy/stmgc/changeset/6161d44ff649/

Log:Fix nested measurements of wait time during transaction start

diff --git a/c8/stm/core.c b/c8/stm/core.c
--- a/c8/stm/core.c
+++ b/c8/stm/core.c
@@ -1072,14 +1072,15 @@
 
 static void _do_start_transaction(stm_thread_local_t *tl)
 {
-start_timer();
-
 assert(!_stm_in_transaction(tl));
 tl->wait_event_emitted = 0;
 
 acquire_thread_segment(tl);
 /* GS invalid before this point! */
 
+// acquiring segment is measured as wait time
+start_timer();
+
 assert(STM_PSEGMENT->safe_point == SP_NO_TRANSACTION);
 assert(STM_PSEGMENT->transaction_state == TS_NONE);
 timing_event(tl, STM_TRANSACTION_START);
@@ -1126,10 +1127,12 @@
 rv++;/* incr it but enter_safe_point_if_requested() aborted */
 STM_SEGMENT->transaction_read_version = rv;
 
+pause_timer();
 /* Warning: this safe-point may run light finalizers and register
commit/abort callbacks if a major GC is triggered here */
 enter_safe_point_if_requested();
 dprintf(("> start_transaction\n"));
+continue_timer();
 
 s_mutex_unlock();   // XXX it's probably possible to not acquire this here
 
@@ -1148,6 +1151,8 @@
 
 long _stm_start_transaction(stm_thread_local_t *tl)
 {
+start_timer();
+
 s_mutex_lock();
 #ifdef STM_NO_AUTOMATIC_SETJMP
 long repeat_count = did_abort;/* test/support.py */
@@ -1161,13 +1166,20 @@
 memcpy(tl->mem_reset_on_abort, tl->mem_stored_for_reset_on_abort,
tl->mem_bytes_to_reset_on_abort);
 }
+
+// _do_start_transaction is instrumented as well and pauses for waits
+pause_timer();
 _do_start_transaction(tl);
+continue_timer();
 
 if (repeat_count == 0) {  /* else, 'nursery_mark' was already set
  in abort_data_structures_from_segment_num() */
 STM_SEGMENT->nursery_mark = ((stm_char *)_stm_nursery_start +
  stm_fill_mark_nursery_bytes);
 }
+
+stop_timer_and_publish(STM_DURATION_START_TRX);
+
 return repeat_count;
 }
 
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] stmgc c8-adaptive-trx-length-per-thread: Merge instrumentation bugfixes

[tobweber]

Author: Tobias Weber 
Branch: c8-adaptive-trx-length-per-thread
Changeset: r2069:2139691f1c0c
Date: 2017-06-09 20:42 +0200
http://bitbucket.org/pypy/stmgc/changeset/2139691f1c0c/

Log:Merge instrumentation bugfixes

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy.org extradoc: update the values

[arigo]

Author: Armin Rigo 
Branch: extradoc
Changeset: r891:bb5e71b4d612
Date: 2017-06-09 22:44 +0200
http://bitbucket.org/pypy/pypy.org/changeset/bb5e71b4d612/

Log:update the values

diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -15,7 +15,7 @@
 
 

-   $66846 of $105000 (63.7%)
+   $66891 of $105000 (63.7%)


 
@@ -23,7 +23,7 @@
   
   This donation goes towards supporting Python 3 in 
PyPy.
   Current status:
-we have $2648 left
+we have $2688 left
   in the account. Read proposal
   
   
diff --git a/don4.html b/don4.html
--- a/don4.html
+++ b/don4.html
@@ -17,7 +17,7 @@
2nd call:

-   $59060 of $8 (73.8%)
+   $59070 of $8 (73.8%)


 
@@ -29,7 +29,7 @@
   
   

[pypy-commit] pypy default: make more noise when something goes wrong with the repackaging

[mattip]

Author: Matti Picus 
Branch: 
Changeset: r91576:927530bd5d2c
Date: 2017-06-09 13:47 +0300
http://bitbucket.org/pypy/pypy/changeset/927530bd5d2c/

Log:make more noise when something goes wrong with the repackaging

diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -36,7 +36,10 @@
 hgcheck=`tar -tf pypy-c-jit-latest-$plat.tar.bz2 |head -n1 | cut -d- -f5`
 if [ "$hgcheck" != "$hgrev" ]
 then
+echo xx
 echo $plat hg tag mismatch, expected $hgrev, got $hgcheck
+echo xx
+rm pypy-c-jit-latest-$plat.tar.bz2
 continue
 fi
 tar -xf pypy-c-jit-latest-$plat.tar.bz2
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy.org extradoc: fix for proper 3.5 package name

[mattip]

Author: Matti Picus 
Branch: extradoc
Changeset: r890:3e1bcf5c6a4d
Date: 2017-06-09 13:39 +0300
http://bitbucket.org/pypy/pypy.org/changeset/3e1bcf5c6a4d/

Log:fix for proper 3.5 package name

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -414,7 +414,7 @@
 pypy 3.5-v5.8.0 sha256:
 
 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223  
pypy3-v5.8.0-src.tar.bz2
-bb62f469df2421f854606c4181e66c14c58945180d03773020a4baf9a81c9fb1  
pypy-c-jit-latest-linux64.tar.bz2
+57d871a7f1135719c138cee4e3533c3275d682a76a40ff668e95150c65923035  
pypy3-v5.8.0-linux64.tar.bz2
 8c868b5c8d15ce8acdf967f3c25da44bf52f6c7aa1fd1e50ebd50590f98066a4  
pypy3-v5.8.0-src.zip
 
 
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -457,6 +457,6 @@
 pypy 3.5-v5.8.0 sha256::
 
 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223  
pypy3-v5.8.0-src.tar.bz2
-bb62f469df2421f854606c4181e66c14c58945180d03773020a4baf9a81c9fb1  
pypy-c-jit-latest-linux64.tar.bz2
+57d871a7f1135719c138cee4e3533c3275d682a76a40ff668e95150c65923035  
pypy3-v5.8.0-linux64.tar.bz2
 8c868b5c8d15ce8acdf967f3c25da44bf52f6c7aa1fd1e50ebd50590f98066a4  
pypy3-v5.8.0-src.zip
 
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit