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
564e74f
..
83fb115
100644
(file)
--- a/
ghc/rts/Main.c
+++ b/
ghc/rts/Main.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.23 2000/04/11 16:49:20 sewardj Exp $
+ * $Id: Main.c,v 1.31 2001/09/04 18:29:21 ken Exp $
*
* (c) The GHC Team 1998-2000
*
*
* (c) The GHC Team 1998-2000
*
@@
-9,6
+9,7
@@
#define COMPILING_RTS_MAIN
#define COMPILING_RTS_MAIN
+#include "PosixSource.h"
#include "Rts.h"
#include "RtsAPI.h"
#include "SchedAPI.h"
#include "Rts.h"
#include "RtsAPI.h"
#include "SchedAPI.h"
@@
-25,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
@@
-38,7
+39,7
@@
# include <windows.h>
#endif
# include <windows.h>
#endif
-EXTFUN(__init_PrelMain);
+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
@@
-50,7
+51,7
@@
int main(int argc, char *argv[])
SchedulerStatus status;
/* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
SchedulerStatus status;
/* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
- startupHaskell(argc,argv,__init_PrelMain);
+ 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;
@@
-78,7
+79,8
@@
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 */
status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
/* ToDo: Dump event for the main thread */
status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
@@
-89,7
+91,8
@@
int main(int argc, char *argv[])
mytid));
/* all non-main threads enter the scheduler without work */
mytid));
/* all non-main threads enter the scheduler without work */
- status = rts_evalNothing((StgClosure*)NULL);
+ taskStart();
+ status = Success; // declare victory (see shutdownParallelSystem)
}
# elif defined(GRAN)
}
# elif defined(GRAN)
@@
-104,7
+107,6
@@
int main(int argc, char *argv[])
# 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:
@@
-112,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:
@@
-122,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:
+ 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);
default:
barf("main thread completed with invalid status");
}
shutdownHaskellAndExit(exit_status);
+ return 0; /* never reached, keep gcc -Wall happy */
}
# endif /* BATCH_MODE */
}
# endif /* BATCH_MODE */