X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMain.c;h=6029921436b0d6a9fc1deb524c9af5076b4ac8bb;hb=00912bda4c438c9f6a526e6c2d79cc581e7fbc6a;hp=2b75feaae7a79d3634141fa5929dd1a9eb619a92;hpb=20fc2f0ced64a12d8e44956931b2ac341ed2186f;p=ghc-hetmet.git

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index 2b75fea..6029921 100644
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.27 2001/03/22 03:51:10 hwloidl Exp $
+ * $Id: Main.c,v 1.40 2003/09/21 22:20:55 wolfgang Exp $
  *
  * (c) The GHC Team 1998-2000
  *
@@ -9,12 +9,15 @@
 
 #define COMPILING_RTS_MAIN
 
+#include "PosixSource.h"
 #include "Rts.h"
 #include "RtsAPI.h"
 #include "SchedAPI.h"
+#include "Schedule.h"
 #include "RtsFlags.h"
 #include "RtsUtils.h"
 #include "Prelude.h"
+#include <stdlib.h>
 
 #ifdef DEBUG
 # include "Printer.h"   /* for printing        */
@@ -38,7 +41,7 @@
 # include <windows.h>
 #endif
 
-extern void __init_PrelMain(void);
+extern void __stginit_ZCMain(void);
 
 /* Hack: we assume that we're building a batch-mode system unless 
  * INTERPRETER is set
@@ -50,7 +53,7 @@ int main(int argc, char *argv[])
     SchedulerStatus status;
     /* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
 
-    startupHaskell(argc,argv,__init_PrelMain);
+    startupHaskell(argc,argv,__stginit_ZCMain);
 
     /* kick off the computation by creating the main thread with a pointer
        to mainIO_closure representing the computation of the overall program;
@@ -82,7 +85,7 @@ int main(int argc, char *argv[])
 		   fprintf(stderr, "==== [%x] Main Thread Started ...\n", mytid));
 
       /* ToDo: Dump event for the main thread */
-      status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
+      status = rts_mainLazyIO((HaskellObj)mainIO_closure, NULL);
     } else {
       /* Just to show we're alive */
       IF_PAR_DEBUG(verbose,
@@ -97,21 +100,19 @@ int main(int argc, char *argv[])
 #  elif defined(GRAN)
 
     /* ToDo: Dump event for the main thread */
-    status = rts_evalIO(mainIO_closure, NULL);
+    status = rts_mainLazyIO(mainIO_closure, NULL);
 
 #  else /* !PAR && !GRAN */
 
     /* ToDo: want to start with a larger stack size */
-    status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
+    rts_lock();
+    status = rts_evalLazyIO((HaskellObj)mainIO_closure, NULL);
+    rts_unlock();
 
 #  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 exited (uncaught exception)");
       exit_status = EXIT_KILLED;