X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Feventlog%2FEventLog.h;h=0cfab5c0910f14cd67381994a9a1c0222a59e3a8;hb=784e214dd44eba39f4c34936a27e6cc82948205c;hp=fd87820e0892b69ccd080837455699f85c2afcd0;hpb=91bfa780ddd229cff6c3d86a8f05e3898ef65e53;p=ghc-hetmet.git diff --git a/rts/eventlog/EventLog.h b/rts/eventlog/EventLog.h index fd87820..0cfab5c 100644 --- a/rts/eventlog/EventLog.h +++ b/rts/eventlog/EventLog.h @@ -12,7 +12,7 @@ #include "rts/EventLogFormat.h" #include "Capability.h" -BEGIN_RTS_PRIVATE +#include "BeginPrivate.h" #ifdef TRACING @@ -24,13 +24,15 @@ extern char *EventTagDesc[]; void initEventLogging(void); void endEventLogging(void); void freeEventLogging(void); +void abortEventLogging(void); // #4512 - after fork child needs to abort +void flushEventLog(void); // event log inherited from parent /* * Post a scheduler event to the capability's event buffer (an event * that has an associated thread). */ void postSchedEvent(Capability *cap, EventTypeNum tag, - StgThreadID id, StgWord64 other); + StgThreadID id, StgWord info1, StgWord info2); /* * Post a nullary event. @@ -48,7 +50,8 @@ void postCapMsg(Capability *cap, char *msg, va_list ap); INLINE_HEADER void postSchedEvent (Capability *cap STG_UNUSED, EventTypeNum tag STG_UNUSED, StgThreadID id STG_UNUSED, - StgWord64 other STG_UNUSED) + StgWord info1 STG_UNUSED, + StgWord info2 STG_UNUSED) { /* nothing */ } INLINE_HEADER void postEvent (Capability *cap STG_UNUSED, @@ -59,13 +62,13 @@ INLINE_HEADER void postMsg (char *msg STG_UNUSED, va_list ap STG_UNUSED) { /* nothing */ } -INLINE_HEADER void postCapMsg (Capability *cap, +INLINE_HEADER void postCapMsg (Capability *cap STG_UNUSED, char *msg STG_UNUSED, va_list ap STG_UNUSED) { /* nothing */ } #endif -END_RTS_PRIVATE +#include "EndPrivate.h" #endif /* TRACING_H */