X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMain.c;h=520a757037074fd743139a61e7630644dcbbb4da;hb=03a9ff01812afc81eb5236fd3063cbec44cf469e;hp=11a0027a4195ce7f423a99b78d4255e1d2574eec;hpb=bc5c802181b513216bc88f0d1ec9574157ee05fe;p=ghc-hetmet.git

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index 11a0027..520a757 100644
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.30 2001/08/14 13:40:09 sewardj Exp $
  *
  * (c) The GHC Team 1998-2000
  *
@@ -13,18 +12,17 @@
 #include "Rts.h"
 #include "RtsAPI.h"
 #include "SchedAPI.h"
+#include "Schedule.h"
 #include "RtsFlags.h"
 #include "RtsUtils.h"
 #include "Prelude.h"
+#include "Task.h"
+#include <stdlib.h>
 
 #ifdef DEBUG
 # include "Printer.h"   /* for printing        */
 #endif
 
-#ifdef INTERPRETER
-# include "Assembler.h"
-#endif
-
 #ifdef PAR
 # include "Parallel.h"
 # include "ParallelRts.h"
@@ -39,7 +37,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
@@ -51,7 +49,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;
@@ -80,14 +78,14 @@ int main(int argc, char *argv[])
 
     if (IAmMainThread == rtsTrue) {
       IF_PAR_DEBUG(verbose,
-		   fprintf(stderr, "==== [%x] Main Thread Started ...\n", mytid));
+		   debugBelch("==== [%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,
-		   fprintf(stderr, "== [%x] Non-Main PE enters scheduler via taskStart() without work ...\n",
+		   debugBelch("== [%x] Non-Main PE enters scheduler via taskStart() without work ...\n",
 			   mytid));
      
       /* all non-main threads enter the scheduler without work */
@@ -98,27 +96,28 @@ 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);
+    { 
+	void *cap = rts_lock();
+	cap = rts_evalLazyIO(cap,(HaskellObj)mainIO_closure, NULL);
+	status = rts_getSchedStatus(cap);
+	rts_unlock(cap);
+    }
 
 #  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)");
+      errorBelch("main thread exited (uncaught exception)");
       exit_status = EXIT_KILLED;
       break;
     case Interrupted:
-      prog_belch("interrupted");
+      errorBelch("interrupted");
       exit_status = EXIT_INTERRUPTED;
       break;
     case Success:
@@ -126,7 +125,7 @@ int main(int argc, char *argv[])
       break;
 #if defined(PAR)
     case NoStatus:
-      prog_belch("main thread PE killed; probably due to failure of another PE; check /tmp/pvml...");
+      errorBelch("main thread PE killed; probably due to failure of another PE; check /tmp/pvml...");
       exit_status = EXIT_KILLED;
       break;
 #endif