projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e3e12b2
)
Use standard task ID print style (hexadecimal).
author
Edward Z. Yang
<ezyang@mit.edu>
Thu, 11 Nov 2010 00:09:12 +0000
(
00:09
+0000)
committer
Edward Z. Yang
<ezyang@mit.edu>
Thu, 11 Nov 2010 00:09:12 +0000
(
00:09
+0000)
rts/Task.c
patch
|
blob
|
history
diff --git
a/rts/Task.c
b/rts/Task.c
index
f26785a
..
8994ad1
100644
(file)
--- a/
rts/Task.c
+++ b/
rts/Task.c
@@
-348,6
+348,17
@@
workerTaskStop (Task *task)
#endif
#endif
+#ifdef DEBUG
+
+static void *taskId(Task *task)
+{
+#ifdef THREADED_RTS
+ return (void *)task->id;
+#else
+ return (void *)task;
+#endif
+}
+
#if defined(THREADED_RTS)
static void OSThreadProcAttr
#if defined(THREADED_RTS)
static void OSThreadProcAttr
@@
-415,22
+426,11
@@
interruptWorkerTask (Task *task)
ASSERT(osThreadId() != task->id); // seppuku not allowed
ASSERT(task->incall->suspended_tso); // use this only for FFI calls
interruptOSThread(task->id);
ASSERT(osThreadId() != task->id); // seppuku not allowed
ASSERT(task->incall->suspended_tso); // use this only for FFI calls
interruptOSThread(task->id);
- debugTrace(DEBUG_sched, "interrupted worker task %lu", task->id);
+ debugTrace(DEBUG_sched, "interrupted worker task %p", taskId(task));
}
#endif /* THREADED_RTS */
}
#endif /* THREADED_RTS */
-#ifdef DEBUG
-
-static void *taskId(Task *task)
-{
-#ifdef THREADED_RTS
- return (void *)task->id;
-#else
- return (void *)task;
-#endif
-}
-
void printAllTasks(void);
void
void printAllTasks(void);
void