diff options
| author | Mikolaj Konarski <mikolaj@well-typed.com> | 2012-07-24 11:41:27 +0200 |
|---|---|---|
| committer | Mikolaj Konarski <mikolaj@well-typed.com> | 2012-07-25 16:24:45 +0200 |
| commit | c859d17f9b0ae8559dac4f7e5cb8521e7ab5f0fb (patch) | |
| tree | 19453acb666d8630365eb9587749dbc271ed161c /rts/Capability.c | |
| parent | 4666be5d9471b8227f5e24c0b7860e84923489db (diff) | |
| download | haskell-c859d17f9b0ae8559dac4f7e5cb8521e7ab5f0fb.tar.gz | |
Merge taskId and serialisableTaskId
A companion ghc-events pachakge commit displays task ids in the same format.
Diffstat (limited to 'rts/Capability.c')
| -rw-r--r-- | rts/Capability.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/Capability.c b/rts/Capability.c index 34e2d9ac11..4c33115ca5 100644 --- a/rts/Capability.c +++ b/rts/Capability.c @@ -417,9 +417,9 @@ giveCapabilityToTask (Capability *cap USED_IF_DEBUG, Task *task) { ASSERT_LOCK_HELD(&cap->lock); ASSERT(task->cap == cap); - debugTrace(DEBUG_sched, "passing capability %d to %s %p", + debugTrace(DEBUG_sched, "passing capability %d to %s %#" FMT_HexWord64, cap->no, task->incall->tso ? "bound task" : "worker", - (void *)(size_t)task->id); + serialisableTaskId(task)); ACQUIRE_LOCK(&task->lock); if (task->wakeup == rtsFalse) { task->wakeup = rtsTrue; |