X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FTask.c;h=bc701b0108790f727f31627ea1e3486fbadd3286;hb=7eb748f5300edcd849a9ba4eba28efc51f71ad9d;hp=bf20e999c314a0147fcc8321863ce4ab7e63c819;hpb=3470e75bd62fa08f86da2607a58c7f0b4aeba9db;p=ghc-hetmet.git

diff --git a/ghc/rts/Task.c b/ghc/rts/Task.c
index bf20e99..bc701b0 100644
--- a/ghc/rts/Task.c
+++ b/ghc/rts/Task.c
@@ -46,7 +46,6 @@ static nat maxTasks;
 /* number of tasks currently created */
 static nat taskCount; 
 
-
 #if defined(SMP)
 void
 startTaskManager( nat maxCount, void (*taskStart)(void) )
@@ -100,6 +99,7 @@ void
 stopTaskManager ()
 {
   nat i;
+  OSThreadId tid = osThreadId();
 
   /* Don't want to use pthread_cancel, since we'd have to install
    * these silly exception handlers (pthread_cleanup_{push,pop}) around
@@ -120,9 +120,12 @@ stopTaskManager ()
 #endif
 
   /* Send 'em all a SIGHUP.  That should shut 'em up. */
-  await_death = maxCount;
+  await_death = maxCount - 1;
   for (i = 0; i < maxCount; i++) {
-    pthread_kill(taskTable[i].id,SIGTERM);
+    /* don't cancel the thread running this piece of code. */
+    if ( taskTable[i].id != tid ) {
+      pthread_kill(taskTable[i].id,SIGTERM);
+    }
   }
   while (await_death > 0) {
     sched_yield();
@@ -135,7 +138,8 @@ stopTaskManager ()
 /************ THREADS version *****************/
 
 void
-startTaskManager( nat maxCount, void (*taskStart)(void) )
+startTaskManager( nat maxCount,
+		  void (*taskStart)(void) STG_UNUSED )
 {
   /* In the threaded case, maxCount is used to limit the
      the creation of worker tasks. Tasks are created lazily, i.e.,
@@ -152,8 +156,6 @@ startTask ( void (*taskStart)(void) )
   int r;
   OSThreadId tid;
   
-  /* Locks assumed: rts_mutex */
-  
   /* If more than one worker thread is known to be blocked waiting
      on thread_ready_cond, signal it rather than creating a new one.
   */
@@ -184,6 +186,8 @@ startTask ( void (*taskStart)(void) )
   return;
 }
 
+
+
 void
 stopTaskManager ()
 {