projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo
[ghc-hetmet.git]
/
rts
/
Task.c
diff --git
a/rts/Task.c
b/rts/Task.c
index
918dc55
..
3be5b28
100644
(file)
--- a/
rts/Task.c
+++ b/
rts/Task.c
@@
-28,8
+28,6
@@
Task *all_tasks = NULL;
static Task *task_free_list = NULL; // singly-linked
static nat taskCount;
Task *all_tasks = NULL;
static Task *task_free_list = NULL; // singly-linked
static nat taskCount;
-#define DEFAULT_MAX_WORKERS 64
-static nat maxWorkers; // we won't create more workers than this
static nat tasksRunning;
static nat workerCount;
static nat tasksRunning;
static nat workerCount;
@@
-58,7
+56,6
@@
initTaskManager (void)
taskCount = 0;
workerCount = 0;
tasksRunning = 0;
taskCount = 0;
workerCount = 0;
tasksRunning = 0;
- maxWorkers = DEFAULT_MAX_WORKERS;
initialized = 1;
#if defined(THREADED_RTS)
newThreadLocalKey(¤tTaskKey);
initialized = 1;
#if defined(THREADED_RTS)
newThreadLocalKey(¤tTaskKey);
@@
-70,9
+67,19
@@
initTaskManager (void)
void
stopTaskManager (void)
{
void
stopTaskManager (void)
{
+ Task *task, *next;
+
debugTrace(DEBUG_sched,
"stopping task manager, %d tasks still running",
tasksRunning);
debugTrace(DEBUG_sched,
"stopping task manager, %d tasks still running",
tasksRunning);
+
+ ACQUIRE_LOCK(&sched_mutex);
+ for (task = task_free_list; task != NULL; task = next) {
+ next = task->next;
+ stgFree(task);
+ }
+ task_free_list = NULL;
+ RELEASE_LOCK(&sched_mutex);
}
}
@@
-185,7
+192,7
@@
discardTask (Task *task)
{
ASSERT_LOCK_HELD(&sched_mutex);
if (!task->stopped) {
{
ASSERT_LOCK_HELD(&sched_mutex);
if (!task->stopped) {
- debugTrace(DEBUG_sched, "discarding task %p", TASK_ID(task));
+ debugTrace(DEBUG_sched, "discarding task %ld", (long)TASK_ID(task));
task->cap = NULL;
task->tso = NULL;
task->stopped = rtsTrue;
task->cap = NULL;
task->tso = NULL;
task->stopped = rtsTrue;
@@
-236,7
+243,7
@@
workerTaskStop (Task *task)
void
resetTaskManagerAfterFork (void)
{
void
resetTaskManagerAfterFork (void)
{
-#warning TODO!
+ // TODO!
taskCount = 0;
}
taskCount = 0;
}
@@
-250,9
+257,6
@@
startWorkerTask (Capability *cap,
OSThreadId tid;
Task *task;
OSThreadId tid;
Task *task;
- if (workerCount >= maxWorkers) {
- barf("too many workers; runaway worker creation?");
- }
workerCount++;
// A worker always gets a fresh Task structure.
workerCount++;
// A worker always gets a fresh Task structure.
@@
-312,7
+316,7
@@
printAllTasks(void)
debugBelch("on capability %d, ", task->cap->no);
}
if (task->tso) {
debugBelch("on capability %d, ", task->cap->no);
}
if (task->tso) {
- debugBelch("bound to thread %d", task->tso->id);
+ debugBelch("bound to thread %lu", (unsigned long)task->tso->id);
} else {
debugBelch("worker");
}
} else {
debugBelch("worker");
}