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

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