projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-10-26 22:33:20 by sof]
[ghc-hetmet.git]
/
ghc
/
rts
/
Main.c
diff --git
a/ghc/rts/Main.c
b/ghc/rts/Main.c
index
114b3fc
..
520a757
100644
(file)
--- a/
ghc/rts/Main.c
+++ b/
ghc/rts/Main.c
@@
-1,5
+1,4
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $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
*
@@
-17,6
+16,7
@@
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "Prelude.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "Prelude.h"
+#include "Task.h"
#include <stdlib.h>
#ifdef DEBUG
#include <stdlib.h>
#ifdef DEBUG
@@
-78,14
+78,14
@@
int main(int argc, char *argv[])
if (IAmMainThread == rtsTrue) {
IF_PAR_DEBUG(verbose,
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_mainLazyIO((HaskellObj)mainIO_closure, NULL);
} else {
/* Just to show we're alive */
IF_PAR_DEBUG(verbose,
/* ToDo: Dump event for the main thread */
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 */
mytid));
/* all non-main threads enter the scheduler without work */
@@
-101,20
+101,23
@@
int main(int argc, char *argv[])
# else /* !PAR && !GRAN */
/* ToDo: want to start with a larger stack size */
# else /* !PAR && !GRAN */
/* ToDo: want to start with a larger stack size */
- rts_lock();
- status = rts_evalLazyIO((HaskellObj)mainIO_closure, NULL);
- rts_unlock();
+ {
+ 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 Killed:
# endif /* !PAR && !GRAN */
/* check the status of the entire Haskell computation */
switch (status) {
case Killed:
- prog_belch("main thread exited (uncaught exception)");
+ errorBelch("main thread exited (uncaught exception)");
exit_status = EXIT_KILLED;
break;
case Interrupted:
exit_status = EXIT_KILLED;
break;
case Interrupted:
- prog_belch("interrupted");
+ errorBelch("interrupted");
exit_status = EXIT_INTERRUPTED;
break;
case Success:
exit_status = EXIT_INTERRUPTED;
break;
case Success:
@@
-122,7
+125,7
@@
int main(int argc, char *argv[])
break;
#if defined(PAR)
case NoStatus:
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
exit_status = EXIT_KILLED;
break;
#endif