diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2014-05-04 20:27:42 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2014-05-04 20:28:58 +0100 |
| commit | f0fcc41d755876a1b02d1c7c79f57515059f6417 (patch) | |
| tree | 89cce0cfc61744b1c7b732619ea9de04f21fdcfe /rts/RtsFlags.c | |
| parent | 5141baf76132fe0d8f88cfa0a62698cc3b37e48a (diff) | |
| download | haskell-f0fcc41d755876a1b02d1c7c79f57515059f6417.tar.gz | |
Revert "Per-thread allocation counters and limits"
Problems were found on 32-bit platforms, I'll commit again when I have a fix.
This reverts the following commits:
54b31f744848da872c7c6366dea840748e01b5cf
b0534f78a73f972e279eed4447a5687bd6a8308e
Diffstat (limited to 'rts/RtsFlags.c')
| -rw-r--r-- | rts/RtsFlags.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index fb1e2ec07b..af1b2049f6 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -137,7 +137,6 @@ void initRtsFlagsDefaults(void) #else RtsFlags.GcFlags.heapBase = 0; /* means don't care */ #endif - RtsFlags.GcFlags.allocLimitGrace = (100*1024) / BLOCK_SIZE; #ifdef DEBUG RtsFlags.DebugFlags.scheduler = rtsFalse; @@ -403,8 +402,6 @@ usage_text[] = { " +PAPI_EVENT - collect papi preset event PAPI_EVENT", " #NATIVE_EVENT - collect native event NATIVE_EVENT (in hex)", #endif -" -xq The allocation limit given to a thread after it receives", -" an AllocationLimitExceeded exception. (default: 100k)", "", "RTS options may also be specified using the GHCRTS environment variable.", "", @@ -1363,13 +1360,6 @@ error = rtsTrue; /* The option prefix '-xx' is reserved for future extension. KSW 1999-11. */ - case 'q': - OPTION_UNSAFE; - RtsFlags.GcFlags.allocLimitGrace - = decodeSize(rts_argv[arg], 3, BLOCK_SIZE, HS_INT_MAX) - / BLOCK_SIZE; - break; - default: OPTION_SAFE; errorBelch("unknown RTS option: %s",rts_argv[arg]); |