X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FEventLogFormat.h;h=dd9b212837808fbb85f6ac5c59ddf2a9cf25d3c0;hb=6f045438008234fe58c7629ce1b33e3524fc9006;hp=a8a5a83b69c9e93f7592d0d6e49f142bab6a0ca0;hpb=e8d7985d56595f6b8004546bedc41627ca70c528;p=ghc-hetmet.git

diff --git a/includes/EventLogFormat.h b/includes/EventLogFormat.h
index a8a5a83..dd9b212 100644
--- a/includes/EventLogFormat.h
+++ b/includes/EventLogFormat.h
@@ -96,22 +96,23 @@
 /*
  * 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 /* (cap, thread, spark_thread) */
 
-#define NUM_EVENT_TAGS       14 
+#define NUM_EVENT_TAGS        15 
 
 /*
  * Status values for EVENT_STOP_THREAD
@@ -130,7 +131,7 @@
 
 typedef StgWord16 EventTypeNum;
 typedef StgWord64 Timestamp; // in nanoseconds
-typedef StgWord64 ThreadID;
-typedef StgWord16 CapabilityNum;
+typedef StgThreadID ThreadID;
+typedef StgWord16 CapNo;
 
 #endif