summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordonnie@darthik.com <unknown>2009-04-13 01:11:40 +0000
committerdonnie@darthik.com <unknown>2009-04-13 01:11:40 +0000
commitc29305dadcb245bb080f65d946d92d0035243b6c (patch)
tree741ae319986706faf986a26f06be7889cfa16aae
parent543823a15820e4006b4d973b1bddf07749f7c1b3 (diff)
downloadhaskell-c29305dadcb245bb080f65d946d92d0035243b6c.tar.gz
Changed postEvent last argument from "nat from" to "StgWord64 other".
StgWord64 other better represents this argument since it can be used as any particular data, thus "other" and not the "from" capability as it was previously strictly used. Also, StgWord64 is normally larger than type nat to allow for larger data to be passed through the "other" argument.
-rw-r--r--rts/eventlog/EventLog.c2
-rw-r--r--rts/eventlog/EventLog.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/rts/eventlog/EventLog.c b/rts/eventlog/EventLog.c
index f950006972..141b8852cf 100644
--- a/rts/eventlog/EventLog.c
+++ b/rts/eventlog/EventLog.c
@@ -284,7 +284,7 @@ freeEventLogging(void)
* If the buffer is full, prints out the buffer and clears it.
*/
void
-postEvent_(Capability *cap, EventTypeNum tag, StgThreadID thread, nat other_cap)
+postEvent_(Capability *cap, EventTypeNum tag, StgThreadID thread, StgWord64 other)
{
EventsBuf *eb;
diff --git a/rts/eventlog/EventLog.h b/rts/eventlog/EventLog.h
index 386730106e..c2511b986b 100644
--- a/rts/eventlog/EventLog.h
+++ b/rts/eventlog/EventLog.h
@@ -23,15 +23,15 @@ void initEventLogging(void);
void endEventLogging(void);
void freeEventLogging(void);
-void postEvent_(Capability *cap, EventTypeNum tag, StgThreadID id, nat from);
+void postEvent_(Capability *cap, EventTypeNum tag, StgThreadID id, StgWord64 other);
/*
* Post an event to the capability's event buffer.
*/
-INLINE_HEADER void postEvent(Capability *cap, EventTypeNum tag, StgThreadID id, nat from)
+INLINE_HEADER void postEvent(Capability *cap, EventTypeNum tag, StgThreadID id, StgWord64 other)
{
if (RtsFlags.EventLogFlags.doEventLogging) {
- postEvent_(cap, tag, id, from);
+ postEvent_(cap, tag, id, other);
}
}
@@ -42,7 +42,7 @@ void printAndClearEventLog(Capability *cap);
INLINE_HEADER void postEvent(Capability *cap STG_UNUSED,
EventTypeNum tag STG_UNUSED,
StgThreadID id STG_UNUSED,
- nat from STG_UNUSED)
+ StgWord64 other STG_UNUSED)
{
/* nothing */
}