projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1997-11-24 21:14:34 by sof]
[ghc-hetmet.git]
/
ghc
/
runtime
/
main
/
Threads.lc
diff --git
a/ghc/runtime/main/Threads.lc
b/ghc/runtime/main/Threads.lc
index
51a48fb
..
ce4178a
100644
(file)
--- a/
ghc/runtime/main/Threads.lc
+++ b/
ghc/runtime/main/Threads.lc
@@
-175,10
+175,13
@@
I_ threadId = 0;
but slower than GUM sparks. There is no fixed upper bound on the
number of GRAN sparks either. -- HWL
*/
but slower than GUM sparks. There is no fixed upper bound on the
number of GRAN sparks either. -- HWL
*/
-#if !defined(GRAN)
+#if defined(PAR)
+
+I_ sparksIgnored =0, sparksCreated = 0;
-I_ sparksIgnored =0;
+#endif
+#if defined(CONCURRENT) && !defined(GRAN)
I_ SparkLimit[SPARK_POOLS];
rtsBool
I_ SparkLimit[SPARK_POOLS];
rtsBool
@@
-198,7
+201,7
@@
initThreadPools(STG_NO_ARGS)
return rtsTrue;
}
return rtsTrue;
}
-#endif /* !GRAN */
+#endif
#ifdef PAR
rtsBool sameThread;
#ifdef PAR
rtsBool sameThread;
@@
-2564,8
+2567,8
@@
W_ type;
#endif
if (type == T_MAIN) {
#endif
if (type == T_MAIN) {
- STKO_SpA(stko) -= AREL(1);
- *STKO_SpA(stko) = (P_) realWorldZh_closure;
+ STKO_SpB(stko) -= BREL(1);
+ *STKO_SpB(stko) = (P_) realWorldZh_closure;
}
SAVE_Ret = (StgRetAddr) UNVEC(stopThreadDirectReturn,vtbl_stopStgWorld);
}
SAVE_Ret = (StgRetAddr) UNVEC(stopThreadDirectReturn,vtbl_stopStgWorld);