X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMain.c;h=83fb11527f12a6831bad747aa540b8813cbdf064;hb=fb7a723bfd7650a705cb226e07c5b08b7a8e9279;hp=09e6e218a9d6fd464ae1024503aa7ab8ac7020cf;hpb=be587a37ca135acccdb273370852dcb4202be5cd;p=ghc-hetmet.git

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index 09e6e21..83fb115 100644
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.13 2000/01/13 12:40:15 simonmar Exp $
+ * $Id: Main.c,v 1.31 2001/09/04 18:29:21 ken Exp $
  *
- * (c) The GHC Team 1998-1999
+ * (c) The GHC Team 1998-2000
  *
  * Main function for a standalone Haskell program.
  *
@@ -9,63 +9,112 @@
 
 #define COMPILING_RTS_MAIN
 
+#include "PosixSource.h"
 #include "Rts.h"
 #include "RtsAPI.h"
 #include "SchedAPI.h"
 #include "RtsFlags.h"
 #include "RtsUtils.h"
+#include "Prelude.h"
 
 #ifdef DEBUG
-#include "Printer.h"   /* for printing        */
+# include "Printer.h"   /* for printing        */
 #endif
 
 #ifdef INTERPRETER
-#include "Assembler.h"
+# include "Assembler.h"
 #endif
 
 #ifdef PAR
-#include "ParInit.h"
-#include "Parallel.h"
-#include "LLC.h"
+# include "Parallel.h"
+# include "ParallelRts.h"
+# include "LLC.h"
+#endif
+
+#if defined(GRAN) || defined(PAR)
+# include "GranSimRts.h"
 #endif
 
 #ifdef HAVE_WINDOWS_H
-#include <windows.h>
+# include <windows.h>
 #endif
 
+extern void __stginit_PrelMain(void);
 
 /* Hack: we assume that we're building a batch-mode system unless 
  * INTERPRETER is set
  */
-# ifndef INTERPRETER /* Hack */
+#ifndef INTERPRETER /* Hack */
 int main(int argc, char *argv[])
 {
     int exit_status;
-
     SchedulerStatus status;
-    startupHaskell(argc,argv);
+    /* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
+
+    startupHaskell(argc,argv,__stginit_PrelMain);
+
+    /* kick off the computation by creating the main thread with a pointer
+       to mainIO_closure representing the computation of the overall program;
+       then enter the scheduler with this thread and off we go;
+      
+       the same for GranSim (we have only one instance of this code)
+
+       in a parallel setup, where we have many instances of this code
+       running on different PEs, we should do this only for the main PE
+       (IAmMainThread is set in startupHaskell) 
+    */
+
+#  if defined(PAR)
+
+#   if defined(DEBUG)
+    { /* a wait loop to allow attachment of gdb to UNIX threads */
+      nat i, j, s;
+
+      for (i=0, s=0; i<(nat)RtsFlags.ParFlags.wait; i++)
+	for (j=0; j<1000000; j++) 
+	  s += j % 65536;
+    }
+    IF_PAR_DEBUG(verbose,
+		 belch("Passed wait loop"));
+#   endif
 
-#  ifndef PAR
-    /* ToDo: want to start with a larger stack size */
-    status = rts_evalIO((StgClosure *)&mainIO_closure, NULL);
-#  else
     if (IAmMainThread == rtsTrue) {
-    /*Just to show we're alive */
-      fprintf(stderr, "Main Thread Started ...\n");
-     
-      status = rts_evalIO((StgClosure *)&mainIO_closure, NULL);
+      IF_PAR_DEBUG(verbose,
+		   fprintf(stderr, "==== [%x] Main Thread Started ...\n", mytid));
+
+      /* ToDo: Dump event for the main thread */
+      status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
     } else {
-      WaitForPEOp(PP_FINISH,SysManTask);
-      exit(EXIT_SUCCESS);
+      /* Just to show we're alive */
+      IF_PAR_DEBUG(verbose,
+		   fprintf(stderr, "== [%x] Non-Main PE enters scheduler via taskStart() without work ...\n",
+			   mytid));
+     
+      /* all non-main threads enter the scheduler without work */
+      taskStart();       
+      status = Success;  // declare victory (see shutdownParallelSystem)
     }
-#  endif /* PAR */
+
+#  elif defined(GRAN)
+
+    /* ToDo: Dump event for the main thread */
+    status = rts_evalIO(mainIO_closure, NULL);
+
+#  else /* !PAR && !GRAN */
+
+    /* ToDo: want to start with a larger stack size */
+    status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
+
+#  endif /* !PAR && !GRAN */
+
+    /* check the status of the entire Haskell computation */
     switch (status) {
     case Deadlock:
       prog_belch("no threads to run:  infinite loop or deadlock?");
       exit_status = EXIT_DEADLOCK;
       break;
     case Killed:
-      prog_belch("main thread killed");
+      prog_belch("main thread exited (uncaught exception)");
       exit_status = EXIT_KILLED;
       break;
     case Interrupted:
@@ -75,9 +124,16 @@ int main(int argc, char *argv[])
     case Success:
       exit_status = EXIT_SUCCESS;
       break;
+#if defined(PAR)
     case NoStatus:
-      barf("main thread completed with no status");
+      prog_belch("main thread PE killed; probably due to failure of another PE; check /tmp/pvml...");
+      exit_status = EXIT_KILLED;
+      break;
+#endif 
+    default:
+      barf("main thread completed with invalid status");
     }
     shutdownHaskellAndExit(exit_status);
+    return 0; /* never reached, keep gcc -Wall happy */
 }
 # endif /* BATCH_MODE */