[project @ 1997-11-24 21:09:55 by sof]

[ghc-hetmet.git] / ghc / runtime / main / RtsFlags.lc

diff --git a/ghc/runtime/main/RtsFlags.lc b/ghc/runtime/main/RtsFlags.lc
index 8c32dde..ab67e9f 100644 (file)
--- a/ghc/runtime/main/RtsFlags.lc
+++ b/ghc/runtime/main/RtsFlags.lc
@@ -92,7 +92,7 @@ initRtsFlagsDefaults (STG_NO_ARGS)
     RTSflags.ConcFlags.maxLocalSparks  = 65536;
 #endif /* CONCURRENT only */
 
-#if GRAN
+#ifdef GRAN
     RTSflags.ConcFlags.ctxtSwitchTime  = CS_MIN_MILLISECS;  /* In milliseconds */
     RTSflags.ConcFlags.maxThreads      = 32;
     RTSflags.ConcFlags.stkChunkSize    = 1024;
@@ -557,13 +557,8 @@ error = rtsTrue;
                        RTSflags.CcFlags.sortBy = rts_argv[arg][2];
                    break;
                  default:
-                   PAR_BUILD_ONLY(
-                   break; /* we do not care about sortBy for parallel */
-                   )
-                   PROFILING_BUILD_ONLY(
-                   fprintf(stderr, "Invalid profiling sort option %s\n", rts_argv[arg]);
-                   error = rtsTrue;
-                   )
+                       RTSflags.CcFlags.sortBy = SORTCC_TIME;
+                   break;
                }
                ) break;
 
@@ -691,7 +686,7 @@ error = rtsTrue;
                      case 'd': /* closure descr select */
                        RTSflags.ProfFlags.descrSelector = left + 1;
                        break;
-                     case 't': /* closure type select */
+                     case 'y': /* closure type select */
                        RTSflags.ProfFlags.typeSelector = left + 1;
                        break;
                      case 'k': /* closure kind select */
@@ -1087,10 +1082,10 @@ process_gran_option(int arg, int *rts_argc, char *rts_argv[], rtsBool *error)
          RTSflags.GranFlags.DoReScheduleOnFetch = rtsTrue;
          if (rts_argv[arg][3] != '\0')
            RTSflags.GranFlags.FetchStrategy = decode(rts_argv[arg]+3);
+         else
+           RTSflags.GranFlags.FetchStrategy = 2;
          if (RTSflags.GranFlags.FetchStrategy == 0)
            RTSflags.GranFlags.DoReScheduleOnFetch = rtsFalse;
-         else
-           RTSflags.GranFlags.FetchStrategy = 2; /* default: fetch everything */
          break;
          
         case 'K':   /* sort overhead (per elem in spark list) */
@@ -1135,7 +1130,7 @@ allowed\n",
          if (rts_argv[arg][3] != '\0')
            RTSflags.GranFlags.max_fishes = decode(rts_argv[arg]+3);
          else
-           RTSflags.GranFlags.max_fishes = 1;
+           RTSflags.GranFlags.max_fishes = MAX_FISHES;
          break;
          
         case 'w':