projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor refactoring
[ghc-hetmet.git]
/
rts
/
Task.c
diff --git
a/rts/Task.c
b/rts/Task.c
index
ef20c09
..
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"
@@
-28,8
+29,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,11
+57,6
@@
initTaskManager (void)
taskCount = 0;
workerCount = 0;
tasksRunning = 0;
taskCount = 0;
workerCount = 0;
tasksRunning = 0;
-#if defined(THREADED_RTS)
- maxWorkers = DEFAULT_MAX_WORKERS * RtsFlags.ParFlags.nNodes;
-#else
- maxWorkers = DEFAULT_MAX_WORKERS;
-#endif
initialized = 1;
#if defined(THREADED_RTS)
newThreadLocalKey(¤tTaskKey);
initialized = 1;
#if defined(THREADED_RTS)
newThreadLocalKey(¤tTaskKey);
@@
-81,8
+75,12
@@
stopTaskManager (void)
tasksRunning);
ACQUIRE_LOCK(&sched_mutex);
tasksRunning);
ACQUIRE_LOCK(&sched_mutex);
- for (task = task_free_list; task != NULL; next) {
+ for (task = task_free_list; task != NULL; task = next) {
next = 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;
@@
-199,7
+197,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 %ld", 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;
@@
-264,9
+262,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.
@@
-289,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);
@@
-326,7
+322,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");
}