diff options
| author | Austin Seipp <austin@well-typed.com> | 2014-10-21 16:32:58 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-10-21 16:32:58 -0500 |
| commit | bb04867af92ff970e169f26c2260b899c461e279 (patch) | |
| tree | cb8f7212524bcad2fb4bf36bb3e762d91787f76c | |
| parent | aa8d23d24d6777c2881b89928776cce2e51a631f (diff) | |
| download | haskell-bb04867af92ff970e169f26c2260b899c461e279.tar.gz | |
[skip ci] rts: Detabify Capability.h
Signed-off-by: Austin Seipp <austin@well-typed.com>
| -rw-r--r-- | rts/Capability.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/rts/Capability.h b/rts/Capability.h index 9ef7b24bb9..910c92c117 100644 --- a/rts/Capability.h +++ b/rts/Capability.h @@ -156,9 +156,9 @@ struct Capability_ { #endif // These properties should be true when a Task is holding a Capability -#define ASSERT_FULL_CAPABILITY_INVARIANTS(cap,task) \ - ASSERT(cap->running_task != NULL && cap->running_task == task); \ - ASSERT(task->cap == cap); \ +#define ASSERT_FULL_CAPABILITY_INVARIANTS(cap,task) \ + ASSERT(cap->running_task != NULL && cap->running_task == task); \ + ASSERT(task->cap == cap); \ ASSERT_PARTIAL_CAPABILITY_INVARIANTS(cap,task) // Sometimes a Task holds a Capability, but the Task is not associated @@ -166,10 +166,10 @@ struct Capability_ { // (a) a Task holds multiple Capabilities, and (b) when the current // Task is bound, its thread has just blocked, and it may have been // moved to another Capability. -#define ASSERT_PARTIAL_CAPABILITY_INVARIANTS(cap,task) \ - ASSERT(cap->run_queue_hd == END_TSO_QUEUE ? \ - cap->run_queue_tl == END_TSO_QUEUE : 1); \ - ASSERT(myTask() == task); \ +#define ASSERT_PARTIAL_CAPABILITY_INVARIANTS(cap,task) \ + ASSERT(cap->run_queue_hd == END_TSO_QUEUE ? \ + cap->run_queue_tl == END_TSO_QUEUE : 1); \ + ASSERT(myTask() == task); \ ASSERT_TASK_ID(task); #if defined(THREADED_RTS) @@ -201,18 +201,18 @@ void moreCapabilities (nat from, nat to); #if defined(THREADED_RTS) void releaseCapability (Capability* cap); void releaseAndWakeupCapability (Capability* cap); -void releaseCapability_ (Capability* cap, rtsBool always_wakeup); +void releaseCapability_ (Capability* cap, rtsBool always_wakeup); // assumes cap->lock is held #else // releaseCapability() is empty in non-threaded RTS INLINE_HEADER void releaseCapability (Capability* cap STG_UNUSED) {}; INLINE_HEADER void releaseAndWakeupCapability (Capability* cap STG_UNUSED) {}; -INLINE_HEADER void releaseCapability_ (Capability* cap STG_UNUSED, +INLINE_HEADER void releaseCapability_ (Capability* cap STG_UNUSED, rtsBool always_wakeup STG_UNUSED) {}; #endif // declared in includes/rts/Threads.h: -// extern Capability MainCapability; +// extern Capability MainCapability; // declared in includes/rts/Threads.h: // extern nat n_capabilities; @@ -361,11 +361,11 @@ recordMutableCap (StgClosure *p, Capability *cap, nat gen) // NO: assertion is violated by performPendingThrowTos() bd = cap->mut_lists[gen]; if (bd->free >= bd->start + BLOCK_SIZE_W) { - bdescr *new_bd; - new_bd = allocBlock_lock(); - new_bd->link = bd; - bd = new_bd; - cap->mut_lists[gen] = bd; + bdescr *new_bd; + new_bd = allocBlock_lock(); + new_bd->link = bd; + bd = new_bd; + cap->mut_lists[gen] = bd; } *bd->free++ = (StgWord)p; } @@ -381,15 +381,15 @@ recordClosureMutated (Capability *cap, StgClosure *p) #if defined(THREADED_RTS) INLINE_HEADER rtsBool -emptySparkPoolCap (Capability *cap) +emptySparkPoolCap (Capability *cap) { return looksEmpty(cap->sparks); } INLINE_HEADER nat -sparkPoolSizeCap (Capability *cap) +sparkPoolSizeCap (Capability *cap) { return sparkPoolSize(cap->sparks); } INLINE_HEADER void -discardSparksCap (Capability *cap) +discardSparksCap (Capability *cap) { discardSparks(cap->sparks); } #endif |