Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r73780:c7d8dc261e28
Date: 2014-10-05 14:51 +0200
http://bitbucket.org/pypy/pypy/changeset/c7d8dc261e28/
Log: import stmgc/32dbfbd04b6f
diff --git a/rpython/translator/stm/src_stm/revision
b/rpython/translator/stm/src_stm/revision
--- a/rpython/translator/stm/src_stm/revision
+++ b/rpython/translator/stm/src_stm/revision
@@ -1,1 +1,1 @@
-903f2a6c1ed9
+32dbfbd04b6f
diff --git a/rpython/translator/stm/src_stm/stm/prof.c
b/rpython/translator/stm/src_stm/stm/prof.c
--- a/rpython/translator/stm/src_stm/stm/prof.c
+++ b/rpython/translator/stm/src_stm/stm/prof.c
@@ -15,6 +15,7 @@
uint32_t tv_sec;
uint32_t tv_nsec;
uint32_t thread_num;
+ uint32_t other_thread_num;
uint8_t event;
uint8_t marker_length[2];
char extra[256];
@@ -26,11 +27,14 @@
buf.tv_sec = t.tv_sec;
buf.tv_nsec = t.tv_nsec;
buf.thread_num = tl->thread_local_counter;
+ buf.other_thread_num = 0;
buf.event = event;
int len0 = 0;
int len1 = 0;
if (markers != NULL) {
+ if (markers[1].tl != NULL)
+ buf.other_thread_num = markers[1].tl->thread_local_counter;
if (markers[0].odd_number != 0)
len0 = profiling_expand_marker(&markers[0], buf.extra, 128);
if (markers[1].odd_number != 0)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
