diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-09-15 11:12:27 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-09-15 11:12:27 +0000 |
| commit | e459b0d1199bff41cb92678493e4f462cea8aaf6 (patch) | |
| tree | 5255bd0fb5abd779a26f6f8f84174928e40eba85 /includes | |
| parent | d71615757d0462b1721ee3664c5fa9f79325d666 (diff) | |
| download | haskell-e459b0d1199bff41cb92678493e4f462cea8aaf6.tar.gz | |
Event tracing: put the capability in the block marker, omit it from the events
This makes events smaller and tracing quicker, and speeds up reading
and sorting the trace file.
HEADS UP: this changes the format of event log files. Corresponding
changes to the ghc-events package are required (and will be pushed
soon). Normally we would make backwards-compatible changes, but this
changes the format of every event (to remove the capability) so I'm
breaking the rules this time. This will be the only time we can do
this, since the format becomes public in 6.12.1.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/EventLogFormat.h | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/includes/rts/EventLogFormat.h b/includes/rts/EventLogFormat.h index 402ec52501..c4551c1424 100644 --- a/includes/rts/EventLogFormat.h +++ b/includes/rts/EventLogFormat.h @@ -99,26 +99,25 @@ /* * Types of event */ -#define EVENT_CREATE_THREAD 0 /* (cap, thread) */ -#define EVENT_RUN_THREAD 1 /* (cap, thread) */ -#define EVENT_STOP_THREAD 2 /* (cap, thread, status) */ -#define EVENT_THREAD_RUNNABLE 3 /* (cap, thread) */ -#define EVENT_MIGRATE_THREAD 4 /* (cap, thread, new_cap) */ -#define EVENT_RUN_SPARK 5 /* (cap, thread) */ -#define EVENT_STEAL_SPARK 6 /* (cap, thread, victim_cap) */ -#define EVENT_SHUTDOWN 7 /* (cap) */ -#define EVENT_THREAD_WAKEUP 8 /* (cap, thread, other_cap) */ -#define EVENT_GC_START 9 /* (cap) */ -#define EVENT_GC_END 10 /* (cap) */ -#define EVENT_REQUEST_SEQ_GC 11 /* (cap) */ -#define EVENT_REQUEST_PAR_GC 12 /* (cap) */ -#define EVENT_CREATE_SPARK_THREAD 15 /* (cap, thread, spark_thread) */ -#define EVENT_LOG_CAP_MSG 16 /* (cap, message ...) */ -#define EVENT_LOG_MSG 17 /* (message ...) */ -#define EVENT_STARTUP 18 /* (num_capabilities) */ -#define EVENT_BLOCK_MARKER 19 /* (size, end_time) */ +#define EVENT_CREATE_THREAD 0 /* (thread) */ +#define EVENT_RUN_THREAD 1 /* (thread) */ +#define EVENT_STOP_THREAD 2 /* (thread, status) */ +#define EVENT_THREAD_RUNNABLE 3 /* (thread) */ +#define EVENT_MIGRATE_THREAD 4 /* (thread, new_cap) */ +#define EVENT_RUN_SPARK 5 /* (thread) */ +#define EVENT_STEAL_SPARK 6 /* (thread, victim_cap) */ +#define EVENT_SHUTDOWN 7 /* () */ +#define EVENT_THREAD_WAKEUP 8 /* (thread, other_cap) */ +#define EVENT_GC_START 9 /* () */ +#define EVENT_GC_END 10 /* () */ +#define EVENT_REQUEST_SEQ_GC 11 /* () */ +#define EVENT_REQUEST_PAR_GC 12 /* () */ +#define EVENT_CREATE_SPARK_THREAD 15 /* (thread, spark_thread) */ +#define EVENT_LOG_MSG 16 /* (message ...) */ +#define EVENT_STARTUP 17 /* (num_capabilities) */ +#define EVENT_BLOCK_MARKER 18 /* (size, end_time, capability) */ -#define NUM_EVENT_TAGS 20 +#define NUM_EVENT_TAGS 19 #if 0 /* DEPRECATED EVENTS: */ #define EVENT_CREATE_SPARK 13 /* (cap, thread) */ |