Author: Tobias Weber <tobias_webe...@gmx.de>
Branch: c8-tcp-style-trx-length
Changeset: r2117:93461fbaabd1
Date: 2017-07-14 19:01 +0200
http://bitbucket.org/pypy/stmgc/changeset/93461fbaabd1/
Log: Merge fix for stop timer macro
diff --git a/c8/stm/timing.h b/c8/stm/timing.h
--- a/c8/stm/timing.h
+++ b/c8/stm/timing.h
@@ -8,6 +8,8 @@
#define start_timer() struct timespec start, stop;
\
struct timespec duration = { .tv_sec = 0, .tv_nsec = 0
};\
uint32_t nanosec_diff, sec_diff;
\
+ stm_timing_event_payload_data_t stm_duration_data;
\
+ stm_timing_event_payload_t stm_duration_payload;
\
continue_timer()
/* Must use start_timer before using this macro. */
@@ -30,10 +32,9 @@
#define reset_timer() duration.tv_sec = 0; duration.tv_nsec = 0;
#define stm_duration_payload(duration_data) \
- stm_timing_event_payload_data_t stm_duration_data = \
- { .duration = &(duration_data) }; \
- stm_timing_event_payload_t stm_duration_payload = \
- { STM_EVENT_PAYLOAD_DURATION, stm_duration_data };
+ stm_duration_data.duration = &(duration_data); \
+ stm_duration_payload.type = STM_EVENT_PAYLOAD_DURATION; \
+ stm_duration_payload.data = stm_duration_data;
#define publish_event(thread_local, event) \
(timing_enabled() ? \
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
