projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eq and Ord have moved into GHC.Classes
[ghc-hetmet.git]
/
rts
/
Schedule.c
diff --git
a/rts/Schedule.c
b/rts/Schedule.c
index
ce6a1db
..
a9ea81b
100644
(file)
--- a/
rts/Schedule.c
+++ b/
rts/Schedule.c
@@
-1021,7
+1021,7
@@
scheduleDetectDeadlock (Capability *cap, Task *task)
case BlockedOnException:
case BlockedOnMVar:
throwToSingleThreaded(cap, task->tso,
case BlockedOnException:
case BlockedOnMVar:
throwToSingleThreaded(cap, task->tso,
- (StgClosure *)NonTermination_closure);
+ (StgClosure *)nonTermination_closure);
return;
default:
barf("deadlock: main thread blocked in a strange way");
return;
default:
barf("deadlock: main thread blocked in a strange way");
@@
-1479,9
+1479,7
@@
schedulePostRunThread (StgTSO *t)
throwToSingleThreaded_(&capabilities[0], t,
NULL, rtsTrue, NULL);
throwToSingleThreaded_(&capabilities[0], t,
NULL, rtsTrue, NULL);
-#ifdef REG_R1
ASSERT(get_itbl((StgClosure *)t->sp)->type == ATOMICALLY_FRAME);
ASSERT(get_itbl((StgClosure *)t->sp)->type == ATOMICALLY_FRAME);
-#endif
}
}
}
}
@@
-1645,7
+1643,7
@@
scheduleHandleHeapOverflow( Capability *cap, StgTSO *t )
}
debugTrace(DEBUG_sched,
}
debugTrace(DEBUG_sched,
- "--<< thread %ld (%s) stopped: HeapOverflow\n",
+ "--<< thread %ld (%s) stopped: HeapOverflow",
(long)t->id, whatNext_strs[t->what_next]);
#if defined(GRAN)
(long)t->id, whatNext_strs[t->what_next]);
#if defined(GRAN)
@@
-3158,7
+3156,7
@@
resurrectThreads (StgTSO *threads)
break;
case BlockedOnBlackHole:
throwToSingleThreaded(cap, tso,
break;
case BlockedOnBlackHole:
throwToSingleThreaded(cap, tso,
- (StgClosure *)NonTermination_closure);
+ (StgClosure *)nonTermination_closure);
break;
case BlockedOnSTM:
throwToSingleThreaded(cap, tso,
break;
case BlockedOnSTM:
throwToSingleThreaded(cap, tso,