merge GHC HEAD

[ghc-hetmet.git] / rts / eventlog / EventLog.h

diff --git a/rts/eventlog/EventLog.h b/rts/eventlog/EventLog.h
index 26a2e94..602ac2c 100644 (file)
--- a/rts/eventlog/EventLog.h
+++ b/rts/eventlog/EventLog.h
@@ -35,12 +35,24 @@ void postSchedEvent(Capability *cap, EventTypeNum tag,
                     StgThreadID id, StgWord info1, StgWord info2);
 
 /*
+ * Post a nullary event.
+ */
+void postEvent(Capability *cap, EventTypeNum tag);
+
+void postMsg(char *msg, va_list ap);
+
+void postUserMsg(Capability *cap, char *msg, va_list ap);
+
+void postCapMsg(Capability *cap, char *msg, va_list ap);
+
+void postEventStartup(EventCapNo n_caps);
+
+/*
  * Post a capability set modification event
  */
 void postCapsetModifyEvent (EventTypeNum tag,
                             EventCapsetID capset,
-                            StgWord32 other,
-                            StgWord32 other2);
+                            StgWord32 other);
 
 /*
  * Post a capability set event with a string payload
@@ -57,17 +69,6 @@ void postCapsetVecEvent (EventTypeNum tag,
                          int argc,
                          char *msg[]);
 
-/*
- * Post a nullary event.
- */
-void postEvent(Capability *cap, EventTypeNum tag);
-
-void postMsg(char *msg, va_list ap);
-
-void postUserMsg(Capability *cap, char *msg, va_list ap);
-
-void postCapMsg(Capability *cap, char *msg, va_list ap);
-
 #else /* !TRACING */
 
 INLINE_HEADER void postSchedEvent (Capability *cap  STG_UNUSED,
@@ -77,12 +78,6 @@ INLINE_HEADER void postSchedEvent (Capability *cap  STG_UNUSED,
                                    StgWord info2    STG_UNUSED)
 { /* nothing */ }
 
-INLINE_HEADER void postCapsetModifyEvent (EventTypeNum tag     STG_UNUSED,
-                                          EventCapsetID capset STG_UNUSED,
-                                          StgWord32 other      STG_UNUSED,
-                                          StgWord32 other2     STG_UNUSED)
-{ /* nothing */ }
-
 INLINE_HEADER void postEvent (Capability *cap  STG_UNUSED,
                               EventTypeNum tag STG_UNUSED)
 { /* nothing */ }