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-05-11 18:36:10 by panne]
[ghc-hetmet.git]
/
ghc
/
rts
/
RtsFlags.c
diff --git
a/ghc/rts/RtsFlags.c
b/ghc/rts/RtsFlags.c
index
99bdb1a
..
a965435
100644
(file)
--- a/
ghc/rts/RtsFlags.c
+++ b/
ghc/rts/RtsFlags.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: RtsFlags.c,v 1.69 2003/08/22 22:24:13 sof Exp $
+ * $Id: RtsFlags.c,v 1.74 2004/03/22 11:48:30 simonmar Exp $
*
* (c) The AQUA Project, Glasgow University, 1994-1997
* (c) The GHC Team, 1998-1999
*
* (c) The AQUA Project, Glasgow University, 1994-1997
* (c) The GHC Team, 1998-1999
@@
-147,7
+147,7
@@
void initRtsFlagsDefaults(void)
RtsFlags.GcFlags.statsFile = NULL;
RtsFlags.GcFlags.giveStats = NO_GC_STATS;
RtsFlags.GcFlags.statsFile = NULL;
RtsFlags.GcFlags.giveStats = NO_GC_STATS;
- RtsFlags.GcFlags.maxStkSize = (1024 * 1024) / sizeof(W_);
+ RtsFlags.GcFlags.maxStkSize = (8 * 1024 * 1024) / sizeof(W_);
RtsFlags.GcFlags.initialStkSize = 1024 / sizeof(W_);
RtsFlags.GcFlags.minAllocAreaSize = (256 * 1024) / BLOCK_SIZE;
RtsFlags.GcFlags.initialStkSize = 1024 / sizeof(W_);
RtsFlags.GcFlags.minAllocAreaSize = (256 * 1024) / BLOCK_SIZE;
@@
-245,7
+245,7
@@
void initRtsFlagsDefaults(void)
#if defined(GRAN)
/* ToDo: check defaults for GranSim and GUM */
#if defined(GRAN)
/* ToDo: check defaults for GranSim and GUM */
- RtsFlags.GcFlags.maxStkSize = (1024 * 1024) / sizeof(W_);
+ RtsFlags.GcFlags.maxStkSize = (8 * 1024 * 1024) / sizeof(W_);
RtsFlags.GcFlags.initialStkSize = 1024 / sizeof(W_);
RtsFlags.GranFlags.maxThreads = 65536; // refers to mandatory threads
RtsFlags.GcFlags.initialStkSize = 1024 / sizeof(W_);
RtsFlags.GranFlags.maxThreads = 65536; // refers to mandatory threads
@@
-331,8
+331,8
@@
usage_text[] = {
"",
" -? Prints this message and exits; the program is not executed",
"",
"",
" -? Prints this message and exits; the program is not executed",
"",
-" -K<size> Sets the maximum stack size (default 1M) Egs: -K32k -K512k",
-" -k<size> Sets the initial thread stack size (default 1k) Egs: -K4k -K2m",
+" -K<size> Sets the maximum stack size (default 8M) Egs: -K32k -K512k",
+" -k<size> Sets the initial thread stack size (default 1k) Egs: -k4k -k2m",
"",
" -A<size> Sets the minimum allocation area size (default 256k) Egs: -A1m -A10k",
" -M<size> Sets the maximum heap size (default unlimited) Egs: -M256k -M1G",
"",
" -A<size> Sets the minimum allocation area size (default 256k) Egs: -A1m -A10k",
" -M<size> Sets the maximum heap size (default unlimited) Egs: -M256k -M1G",
@@
-457,7
+457,7
@@
usage_text[] = {
0
};
0
};
-static __inline__ rtsBool
+STATIC_INLINE rtsBool
strequal(const char *a, const char * b)
{
return(strcmp(a, b) == 0);
strequal(const char *a, const char * b)
{
return(strcmp(a, b) == 0);
@@
-498,7
+498,13
@@
setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[])
char *last_slash;
/* Remove directory from argv[0] -- default files in current directory */
char *last_slash;
/* Remove directory from argv[0] -- default files in current directory */
- if ((last_slash = (char *) strrchr(argv[0], '/')) != NULL) {
+ if ((last_slash = (char *) strrchr(argv[0],
+#if !defined(mingw32_TARGET_OS)
+ '/')
+#else
+ '\\')
+#endif
+ ) != NULL) {
prog_name = last_slash+1;
} else {
prog_name = argv[0];
prog_name = last_slash+1;
} else {
prog_name = argv[0];
@@
-588,7
+594,7
@@
setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[])
# define TICKY_BUILD_ONLY(x) x
#else
# define TICKY_BUILD_ONLY(x) \
# define TICKY_BUILD_ONLY(x) x
#else
# define TICKY_BUILD_ONLY(x) \
-prog_belch("GHC not built for: ticky-ticky stats"); \
+prog_belch("not built for: ticky-ticky stats"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif
@@
-596,7
+602,7
@@
error = rtsTrue;
# define COST_CENTRE_USING_BUILD_ONLY(x) x
#else
# define COST_CENTRE_USING_BUILD_ONLY(x) \
# define COST_CENTRE_USING_BUILD_ONLY(x) x
#else
# define COST_CENTRE_USING_BUILD_ONLY(x) \
-prog_belch("GHC not built for: -prof or -parallel"); \
+prog_belch("not built for: -prof or -parallel"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif
@@
-604,7
+610,7
@@
error = rtsTrue;
# define PROFILING_BUILD_ONLY(x) x
#else
# define PROFILING_BUILD_ONLY(x) \
# define PROFILING_BUILD_ONLY(x) x
#else
# define PROFILING_BUILD_ONLY(x) \
-prog_belch("GHC not built for: -prof"); \
+prog_belch("not built for: -prof"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif
@@
-612,7
+618,7
@@
error = rtsTrue;
# define SMP_BUILD_ONLY(x) x
#else
# define SMP_BUILD_ONLY(x) \
# define SMP_BUILD_ONLY(x) x
#else
# define SMP_BUILD_ONLY(x) \
-prog_belch("GHC not built for: -smp"); \
+prog_belch("not built for: -smp"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif
@@
-620,7
+626,7
@@
error = rtsTrue;
# define PAR_BUILD_ONLY(x) x
#else
# define PAR_BUILD_ONLY(x) \
# define PAR_BUILD_ONLY(x) x
#else
# define PAR_BUILD_ONLY(x) \
-prog_belch("GHC not built for: -parallel"); \
+prog_belch("not built for: -parallel"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif
@@
-628,7
+634,7
@@
error = rtsTrue;
# define PAR_OR_SMP_BUILD_ONLY(x) x
#else
# define PAR_OR_SMP_BUILD_ONLY(x) \
# define PAR_OR_SMP_BUILD_ONLY(x) x
#else
# define PAR_OR_SMP_BUILD_ONLY(x) \
-prog_belch("GHC not built for: -parallel or -smp"); \
+prog_belch("not built for: -parallel or -smp"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif
@@
-636,7
+642,7
@@
error = rtsTrue;
# define GRAN_BUILD_ONLY(x) x
#else
# define GRAN_BUILD_ONLY(x) \
# define GRAN_BUILD_ONLY(x) x
#else
# define GRAN_BUILD_ONLY(x) \
-prog_belch("GHC not built for: -gransim"); \
+prog_belch("not built for: -gransim"); \
error = rtsTrue;
#endif
error = rtsTrue;
#endif