summaryrefslogtreecommitdiff
path: root/rts/Schedule.c
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2015-12-04 10:10:55 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2015-12-04 10:11:30 +0100
commitcd9f3bf9b8068fc52bb61bc3badcc1c753fbd14b (patch)
tree25dbae71a23f60a8d0d4aded1b92adddcbe168d7 /rts/Schedule.c
parent7af29da05d2e5a5e311a5f73f20d0f232035973b (diff)
downloadhaskell-cd9f3bf9b8068fc52bb61bc3badcc1c753fbd14b.tar.gz
RTS: Rename InCall.stat struct field to .rstat
On AIX, C system headers can redirect the token `stat` via #define stat stat64 to provide large-file support. Simply avoiding the use of `stat` as an identifier eschews macro-replacement. Differential Revision: https://phabricator.haskell.org/D1566
Diffstat (limited to 'rts/Schedule.c')
-rw-r--r--rts/Schedule.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c
index abbc363523..e3dd88151c 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1293,19 +1293,19 @@ scheduleHandleThreadFinished (Capability *cap STG_UNUSED, Task *task, StgTSO *t)
// NOTE: return val is stack->sp[1] (see StgStartup.hc)
*(task->incall->ret) = (StgClosure *)task->incall->tso->stackobj->sp[1];
}
- task->incall->stat = Success;
+ task->incall->rstat = Success;
} else {
if (task->incall->ret) {
*(task->incall->ret) = NULL;
}
if (sched_state >= SCHED_INTERRUPTING) {
if (heap_overflow) {
- task->incall->stat = HeapExhausted;
+ task->incall->rstat = HeapExhausted;
} else {
- task->incall->stat = Interrupted;
+ task->incall->rstat = Interrupted;
}
} else {
- task->incall->stat = Killed;
+ task->incall->rstat = Killed;
}
}
#ifdef DEBUG
@@ -2351,7 +2351,7 @@ scheduleWaitThread (StgTSO* tso, /*[out]*/HaskellObj* ret, Capability **pcap)
task->incall->tso = tso;
task->incall->ret = ret;
- task->incall->stat = NoStatus;
+ task->incall->rstat = NoStatus;
appendToRunQueue(cap,tso);
@@ -2360,7 +2360,7 @@ scheduleWaitThread (StgTSO* tso, /*[out]*/HaskellObj* ret, Capability **pcap)
cap = schedule(cap,task);
- ASSERT(task->incall->stat != NoStatus);
+ ASSERT(task->incall->rstat != NoStatus);
ASSERT_FULL_CAPABILITY_INVARIANTS(cap,task);
debugTrace(DEBUG_sched, "bound thread (%lu) finished", (unsigned long)id);