X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Feventlog%2FEventLog.c;h=bd887afa8ea84500b696d6f81ac3799daf20cca5;hb=b0ec2cb2ab74b21ea1f790c062cd213aa9d9ef02;hp=098934c1babfdafa6d60c8fcc5adb2b06bf0ea7e;hpb=b5a73581d0c03b9d44a77706b5973d74074aa6c1;p=ghc-hetmet.git

diff --git a/rts/eventlog/EventLog.c b/rts/eventlog/EventLog.c
index 098934c..bd887af 100644
--- a/rts/eventlog/EventLog.c
+++ b/rts/eventlog/EventLog.c
@@ -8,12 +8,15 @@
 
 #ifdef EVENTLOG
 
+#include "PosixSource.h"
 #include "Rts.h"
+
 #include "EventLog.h"
 #include "Capability.h"
 #include "Trace.h"
 #include "RtsUtils.h"
 #include "Stats.h"
+
 #include <string.h> 
 #include <stdio.h>
 
@@ -36,22 +39,22 @@ typedef struct _EventsBuf {
 EventsBuf *eventsBuf;
 
 char *EventDesc[] = {
-  "Create thread",
-  "Run thread",
-  "Stop thread",
-  "Thread runnable",
-  "Migrate thread",
-  "Run spark",
-  "Steal spark",
-  "Shutdown",
-  "Wakeup thread",
-  "Starting GC",
-  "Finished GC",
-  "Request sequential GC",
-  "Request parallel GC",
-  "Create spark",
-  "Spark to thread", /* DEPRECATED! */
-  "Create spark thread"
+  [EVENT_CREATE_THREAD]       = "Create thread",
+  [EVENT_RUN_THREAD]          = "Run thread",
+  [EVENT_STOP_THREAD]         = "Stop thread",
+  [EVENT_THREAD_RUNNABLE]     = "Thread runnable",
+  [EVENT_MIGRATE_THREAD]      = "Migrate thread",
+  [EVENT_RUN_SPARK]           = "Run spark",
+  [EVENT_STEAL_SPARK]         = "Steal spark",
+  [EVENT_SHUTDOWN]            = "Shutdown",
+  [EVENT_THREAD_WAKEUP]       = "Wakeup thread",
+  [EVENT_GC_START]            = "Starting GC",
+  [EVENT_GC_END]              = "Finished GC",
+  [EVENT_REQUEST_SEQ_GC]      = "Request sequential GC",
+  [EVENT_REQUEST_PAR_GC]      = "Request parallel GC",
+  [EVENT_CREATE_SPARK]        = "Create spark",
+  [EVENT_SPARK_TO_THREAD]     = "Spark to thread", /* DEPRECATED! */
+  [EVENT_CREATE_SPARK_THREAD] = "Create spark thread"
 };
 
 // Event type. 
@@ -136,7 +139,7 @@ initEventLogging(void)
 
     debugTrace(DEBUG_eventlog, "intiEventLog: start");
 
-    event_log_filename = stgMallocBytes(strlen(prog_name) + 9, 
+    event_log_filename = stgMallocBytes(strlen(prog_name) + 10,
                                         "initEventLogging");
 
     if (sizeof(EventDesc) / sizeof(char*) != NUM_EVENT_TAGS) {
@@ -396,7 +399,7 @@ printAndClearEventLog(Capability *cap)
 
 void initEventsBuf(EventsBuf* eb, StgWord64 size)
 {
-    eb->begin = eb->pos = malloc(size);
+    eb->begin = eb->pos = stgMallocBytes(size, "initEventsBuf");
     eb->size = size;
 }