X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FEventLogFormat.h;h=b56b0b77e4b46f1da8753d74bd17e1b66d6e3a7d;hb=1bca92d715d8b358ee83ff5ee0bc085bec063e59;hp=7b95ad7cb0da6fde43ac0d6cc570e98dd3c7e53c;hpb=543823a15820e4006b4d973b1bddf07749f7c1b3;p=ghc-hetmet.git

diff --git a/includes/EventLogFormat.h b/includes/EventLogFormat.h
index 7b95ad7..b56b0b7 100644
--- a/includes/EventLogFormat.h
+++ b/includes/EventLogFormat.h
@@ -73,6 +73,9 @@
  *
  * -------------------------------------------------------------------------- */
 
+#ifndef EVENTLOGFORMAT_H
+#define EVENTLOGFORMAT_H
+
 /*
  * Markers for begin/end of the Header.
  */
@@ -96,22 +99,24 @@
 /*
  * 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   13 /* (cap, thread)              */
+#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        13 /* (cap, thread)               */
+#define EVENT_SPARK_TO_THREAD     14 /* DEPRECATED! (cap, thread, spark_thread) */
+#define EVENT_CREATE_SPARK_THREAD 15 /* (cap, thread, spark_thread) */
 
-#define NUM_EVENT_TAGS       14 
+#define NUM_EVENT_TAGS        16 
 
 /*
  * Status values for EVENT_STOP_THREAD
@@ -129,8 +134,10 @@
 #ifndef EVENTLOG_CONSTANTS_ONLY
 
 typedef StgWord16 EventTypeNum;
-typedef StgWord64 Timestamp; // in nanoseconds
-typedef StgThreadID ThreadID;
-typedef StgWord16 CapNo;
+typedef StgWord64 EventTimestamp; // in nanoseconds
+typedef StgWord64 EventThreadID;
+typedef StgWord16 EventCapNo;
 
 #endif
+
+#endif /* EVENTLOGFORMAT_H */