projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:04:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
Main.c
diff --git
a/ghc/rts/Main.c
b/ghc/rts/Main.c
index
2b75fea
..
114b3fc
100644
(file)
--- 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.41 2004/08/13 13:10:10 simonmar Exp $
*
* (c) The GHC Team 1998-2000
*
*
* (c) The GHC Team 1998-2000
*
@@
-9,21
+9,20
@@
#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"
+#include "Schedule.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "Prelude.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "Prelude.h"
+#include <stdlib.h>
#ifdef DEBUG
# include "Printer.h" /* for printing */
#endif
#ifdef DEBUG
# include "Printer.h" /* for printing */
#endif
-#ifdef INTERPRETER
-# include "Assembler.h"
-#endif
-
#ifdef PAR
# include "Parallel.h"
# include "ParallelRts.h"
#ifdef PAR
# include "Parallel.h"
# include "ParallelRts.h"
@@
-38,7
+37,7
@@
# include <windows.h>
#endif
# 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
/* Hack: we assume that we're building a batch-mode system unless
* INTERPRETER is set
@@
-50,7
+49,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_ZCMain);
/* 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;
@@
-82,7
+81,7
@@
int main(int argc, char *argv[])
fprintf(stderr, "==== [%x] Main Thread Started ...\n", mytid));
/* ToDo: Dump event for the main thread */
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,
} else {
/* Just to show we're alive */
IF_PAR_DEBUG(verbose,
@@
-97,21
+96,19
@@
int main(int argc, char *argv[])
# elif defined(GRAN)
/* ToDo: Dump event for the main thread */
# 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 */
# 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) {
# 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;
case Killed:
prog_belch("main thread exited (uncaught exception)");
exit_status = EXIT_KILLED;