X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Feventlog%2FEventLog.c;h=bd887afa8ea84500b696d6f81ac3799daf20cca5;hb=72547264724117d689a7fa400104185557fb2a0c;hp=7f93d73d002e59e3ae6d769e7b5aa0bb8c9732f7;hpb=a2a67cd520b9841114d69a87a423dabcb3b4368e;p=ghc-hetmet.git diff --git a/rts/eventlog/EventLog.c b/rts/eventlog/EventLog.c index 7f93d73..bd887af 100644 --- a/rts/eventlog/EventLog.c +++ b/rts/eventlog/EventLog.c @@ -39,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. @@ -139,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) { @@ -399,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; }