Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a3cdefd21b3e818accf9db22da72b216685c1b19 >--------------------------------------------------------------- commit a3cdefd21b3e818accf9db22da72b216685c1b19 Author: Duncan Coutts <[email protected]> Date: Fri Feb 3 13:52:06 2012 +0000 Adjust the eventlog description header for the spark counter event 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 | 2 +- rts/eventlog/EventLog.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/includes/rts/EventLogFormat.h b/includes/rts/EventLogFormat.h index 94f781d..667ed89 100644 --- a/includes/rts/EventLogFormat.h +++ b/includes/rts/EventLogFormat.h @@ -132,7 +132,7 @@ #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 /* () */ diff --git a/rts/eventlog/EventLog.c b/rts/eventlog/EventLog.c index a43ebf7..8e7cf37 100644 --- a/rts/eventlog/EventLog.c +++ b/rts/eventlog/EventLog.c @@ -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); _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
