[commit: ghc] master: [skip ci] rts: Detabify Capability.h (bb04867)
git at git.haskell.org
git at git.haskell.org
Tue Oct 21 21:51:10 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/bb04867af92ff970e169f26c2260b899c461e279/ghc
>---------------------------------------------------------------
commit bb04867af92ff970e169f26c2260b899c461e279
Author: Austin Seipp <austin at well-typed.com>
Date: Tue Oct 21 16:32:58 2014 -0500
[skip ci] rts: Detabify Capability.h
Signed-off-by: Austin Seipp <austin at well-typed.com>
>---------------------------------------------------------------
bb04867af92ff970e169f26c2260b899c461e279
rts/Capability.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/rts/Capability.h b/rts/Capability.h
index 9ef7b24..910c92c 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)
@@ -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;
}
More information about the ghc-commits
mailing list