projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
releaseCapabilityAndQueueWorker: task->stopped should be false (#4850)
[ghc-hetmet.git]
/
rts
/
eventlog
/
EventLog.h
diff --git
a/rts/eventlog/EventLog.h
b/rts/eventlog/EventLog.h
index
e2b8043
..
7dc249d
100644
(file)
--- a/
rts/eventlog/EventLog.h
+++ b/
rts/eventlog/EventLog.h
@@
-12,7
+12,7
@@
#include "rts/EventLogFormat.h"
#include "Capability.h"
#include "rts/EventLogFormat.h"
#include "Capability.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
#ifdef TRACING
#ifdef TRACING
@@
-24,6
+24,8
@@
extern char *EventTagDesc[];
void initEventLogging(void);
void endEventLogging(void);
void freeEventLogging(void);
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
/*
* Post a scheduler event to the capability's event buffer (an event
@@
-39,7
+41,7
@@
void postEvent(Capability *cap, EventTypeNum tag);
void postMsg(char *msg, va_list ap);
void postMsg(char *msg, va_list ap);
-void postUserMsg(Capability *cap, char *msg);
+void postUserMsg(Capability *cap, char *msg, va_list ap);
void postCapMsg(Capability *cap, char *msg, va_list ap);
void postCapMsg(Capability *cap, char *msg, va_list ap);
@@
-59,13
+61,13
@@
INLINE_HEADER void postMsg (char *msg STG_UNUSED,
va_list ap STG_UNUSED)
{ /* nothing */ }
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
char *msg STG_UNUSED,
va_list ap STG_UNUSED)
{ /* nothing */ }
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* TRACING_H */
#endif /* TRACING_H */