projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-09-04 18:29:20 by ken]
[ghc-hetmet.git]
/
ghc
/
rts
/
Main.c
diff --git
a/ghc/rts/Main.c
b/ghc/rts/Main.c
index
1c721b7
..
83fb115
100644
(file)
--- a/
ghc/rts/Main.c
+++ b/
ghc/rts/Main.c
@@
-1,7
+1,7
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.14 2000/01/13 14:34:03 hwloidl 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.
*
*
* Main function for a standalone Haskell program.
*
@@
-9,11
+9,13
@@
#define COMPILING_RTS_MAIN
#define COMPILING_RTS_MAIN
+#include "PosixSource.h"
#include "Rts.h"
#include "RtsAPI.h"
#include "SchedAPI.h"
#include "RtsFlags.h"
#include "RtsUtils.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 */
#ifdef DEBUG
# include "Printer.h" /* for printing */
@@
-24,8
+26,8
@@
#endif
#ifdef PAR
#endif
#ifdef PAR
-# include "ParInit.h"
# include "Parallel.h"
# include "Parallel.h"
+# include "ParallelRts.h"
# include "LLC.h"
#endif
# include "LLC.h"
#endif
@@
-37,18
+39,19
@@
# include <windows.h>
#endif
# include <windows.h>
#endif
+extern void __stginit_PrelMain(void);
/* Hack: we assume that we're building a batch-mode system unless
* INTERPRETER is set
*/
/* 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;
/* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
int main(int argc, char *argv[])
{
int exit_status;
SchedulerStatus status;
/* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
- startupHaskell(argc,argv);
+ 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;
/* kick off the computation by creating the main thread with a pointer
to mainIO_closure representing the computation of the overall program;
@@
-63,11
+66,11
@@
int main(int argc, char *argv[])
# if defined(PAR)
# if defined(PAR)
-# if DEBUG
+# if defined(DEBUG)
{ /* a wait loop to allow attachment of gdb to UNIX threads */
nat i, j, s;
{ /* a wait loop to allow attachment of gdb to UNIX threads */
nat i, j, s;
- for (i=0, s=0; i<RtsFlags.ParFlags.wait; i++)
+ for (i=0, s=0; i<(nat)RtsFlags.ParFlags.wait; i++)
for (j=0; j<1000000; j++)
s += j % 65536;
}
for (j=0; j<1000000; j++)
s += j % 65536;
}
@@
-76,33
+79,34
@@
int main(int argc, char *argv[])
# endif
if (IAmMainThread == rtsTrue) {
# endif
if (IAmMainThread == rtsTrue) {
- fprintf(stderr, "Main Thread Started ...\n");
+ IF_PAR_DEBUG(verbose,
+ fprintf(stderr, "==== [%x] Main Thread Started ...\n", mytid));
/* ToDo: Dump event for the main thread */
/* ToDo: Dump event for the main thread */
- status = rts_evalIO((StgClosure *)&mainIO_closure, NULL);
+ status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
} else {
/* Just to show we're alive */
IF_PAR_DEBUG(verbose,
} else {
/* Just to show we're alive */
IF_PAR_DEBUG(verbose,
- fprintf(stderr, "== [%x] Non-Main PE enters scheduler without work ...\n",
+ fprintf(stderr, "== [%x] Non-Main PE enters scheduler via taskStart() without work ...\n",
mytid));
/* all non-main threads enter the scheduler without work */
mytid));
/* all non-main threads enter the scheduler without work */
- status = schedule( /* nothing */ );
+ taskStart();
+ status = Success; // declare victory (see shutdownParallelSystem)
}
# elif defined(GRAN)
/* ToDo: Dump event for the main thread */
}
# elif defined(GRAN)
/* ToDo: Dump event for the main thread */
- status = rts_evalIO((StgClosure *)&mainIO_closure, NULL);
+ status = rts_evalIO(mainIO_closure, NULL);
# else /* !PAR && !GRAN */
/* ToDo: want to start with a larger stack size */
# else /* !PAR && !GRAN */
/* ToDo: want to start with a larger stack size */
- status = rts_evalIO((StgClosure *)&mainIO_closure, NULL);
+ status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
# endif /* !PAR && !GRAN */
# endif /* !PAR && !GRAN */
- // ToDo: update for parallel execution
/* check the status of the entire Haskell computation */
switch (status) {
case Deadlock:
/* check the status of the entire Haskell computation */
switch (status) {
case Deadlock:
@@
-110,7
+114,7
@@
int main(int argc, char *argv[])
exit_status = EXIT_DEADLOCK;
break;
case Killed:
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:
exit_status = EXIT_KILLED;
break;
case Interrupted:
@@
-120,9
+124,16
@@
int main(int argc, char *argv[])
case Success:
exit_status = EXIT_SUCCESS;
break;
case Success:
exit_status = EXIT_SUCCESS;
break;
+#if defined(PAR)
case NoStatus:
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);
}
shutdownHaskellAndExit(exit_status);
+ return 0; /* never reached, keep gcc -Wall happy */
}
# endif /* BATCH_MODE */
}
# endif /* BATCH_MODE */