projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trim imports
[ghc-hetmet.git]
/
rts
/
Task.c
diff --git
a/rts/Task.c
b/rts/Task.c
index
3be5b28
..
588d414
100644
(file)
--- a/
rts/Task.c
+++ b/
rts/Task.c
@@
-15,6
+15,7
@@
#include "Capability.h"
#include "Stats.h"
#include "RtsFlags.h"
#include "Capability.h"
#include "Stats.h"
#include "RtsFlags.h"
+#include "Storage.h"
#include "Schedule.h"
#include "Hash.h"
#include "Trace.h"
#include "Schedule.h"
#include "Hash.h"
#include "Trace.h"
@@
-76,6
+77,10
@@
stopTaskManager (void)
ACQUIRE_LOCK(&sched_mutex);
for (task = task_free_list; task != NULL; task = next) {
next = task->next;
ACQUIRE_LOCK(&sched_mutex);
for (task = task_free_list; task != NULL; task = next) {
next = task->next;
+#if defined(THREADED_RTS)
+ closeCondition(&task->cond);
+ closeMutex(&task->lock);
+#endif
stgFree(task);
}
task_free_list = NULL;
stgFree(task);
}
task_free_list = NULL;
@@
-279,7
+284,8
@@
startWorkerTask (Capability *cap,
r = createOSThread(&tid, (OSThreadProc *)taskStart, task);
if (r != 0) {
r = createOSThread(&tid, (OSThreadProc *)taskStart, task);
if (r != 0) {
- barf("startTask: Can't create new task");
+ sysErrorBelch("failed to create OS thread");
+ stg_exit(EXIT_FAILURE);
}
debugTrace(DEBUG_sched, "new worker task (taskCount: %d)", taskCount);
}
debugTrace(DEBUG_sched, "new worker task (taskCount: %d)", taskCount);