X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FTask.c;h=7366480094da1554c1f34b0c85700a56f542cb60;hb=3eacdc7faf0d0e87a7201253f9f12c1fb4db7249;hp=44bbb954714b65965dcec79d840d82596252a67a;hpb=46a18311f08f3e788e2161bde31f45af41867902;p=ghc-hetmet.git

diff --git a/ghc/rts/Task.c b/ghc/rts/Task.c
index 44bbb95..7366480 100644
--- a/ghc/rts/Task.c
+++ b/ghc/rts/Task.c
@@ -171,17 +171,25 @@ boundTaskExiting (Task *task)
     IF_DEBUG(scheduler,sched_belch("task exiting"));
 }
 
+#ifdef THREADED_RTS
+#define TASK_ID(t) (t)->id
+#else
+#define TASK_ID(t) (t)
+#endif
+
 void
 discardTask (Task *task)
 {
     ASSERT_LOCK_HELD(&sched_mutex);
-#if defined(THREADED_RTS)
-    closeCondition(&task->cond);
-#endif
-    task->stopped = rtsTrue;
-    task->cap = NULL;
-    task->next = task_free_list;
-    task_free_list = task;
+    if (!task->stopped) {
+	IF_DEBUG(scheduler,sched_belch("discarding task %p", TASK_ID(task)));
+	task->cap = NULL;
+	task->tso = NULL;
+	task->stopped = rtsTrue;
+	tasksRunning--;
+	task->next = task_free_list;
+	task_free_list = task;
+    }
 }
 
 void