Adjust the eventlog description header for the spark counter event
authorDuncan Coutts <duncan@well-typed.com>
Fri, 3 Feb 2012 13:52:06 +0000 (13:52 +0000)
committerDuncan Coutts <duncan@well-typed.com>
Wed, 4 Apr 2012 18:10:45 +0000 (19:10 +0100)
The EventLogFormat.h described the spark counter fields in a different
order to that which ghc emits (the GC'd and fizzled fields were
reversed). At this stage it is easier to fix the ghc-events lib and
to have ghc continue to emit them in the current order.

includes/rts/EventLogFormat.h
rts/eventlog/EventLog.c

index 94f781d..667ed89 100644 (file)
 #define EVENT_PROGRAM_ENV         31 /* (capset, environment_vector)  */
 #define EVENT_OSPROCESS_PID       32 /* (capset, pid)          */
 #define EVENT_OSPROCESS_PPID      33 /* (capset, parent_pid)   */
-#define EVENT_SPARK_COUNTERS      34 /* (crt,dud,ovf,cnv,fiz,gcd,rem) */
+#define EVENT_SPARK_COUNTERS      34 /* (crt,dud,ovf,cnv,gcd,fiz,rem) */
 #define EVENT_SPARK_CREATE        35 /* ()                     */
 #define EVENT_SPARK_DUD           36 /* ()                     */
 #define EVENT_SPARK_OVERFLOW      37 /* ()                     */
index a43ebf7..8e7cf37 100644 (file)
@@ -619,6 +619,7 @@ postSparkCountersEvent (Capability *cap,
     }
     
     postEventHeader(eb, EVENT_SPARK_COUNTERS);
+    /* EVENT_SPARK_COUNTERS (crt,dud,ovf,cnv,gcd,fiz,rem) */
     postWord64(eb,counters.created);
     postWord64(eb,counters.dud);
     postWord64(eb,counters.overflowed);