diff options
| author | Austin Seipp <aseipp@pobox.com> | 2013-09-08 16:17:36 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2013-09-08 16:17:36 -0500 |
| commit | 88dba610df290ff7807a76f702f2e5d41887500b (patch) | |
| tree | e1324062ceef817866771e5bb3f4a93151ba3fb4 /includes | |
| parent | c798a8c6c66d826efdc0201fa56d45337eecc2af (diff) | |
| download | haskell-88dba610df290ff7807a76f702f2e5d41887500b.tar.gz | |
Revert "Default to infinite stack size (#8189)"
This reverts commit d85044f6b201eae0a9e453b89c0433608e0778f0.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/Rts.h | 3 | ||||
| -rw-r--r-- | includes/rts/Constants.h | 2 | ||||
| -rw-r--r-- | includes/rts/storage/GC.h | 13 |
3 files changed, 5 insertions, 13 deletions
diff --git a/includes/Rts.h b/includes/Rts.h index ee10a1044b..122637c465 100644 --- a/includes/Rts.h +++ b/includes/Rts.h @@ -250,7 +250,7 @@ void getWin32ProgArgv(int *argc, wchar_t **argv[]); void setWin32ProgArgv(int argc, wchar_t *argv[]); #endif -void stackOverflow(StgTSO* tso); +void stackOverflow(void); void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__); @@ -268,7 +268,6 @@ int stg_sig_install (int, int, void *); #define EXIT_INTERRUPTED 252 #define EXIT_HEAPOVERFLOW 251 #define EXIT_KILLED 250 -#define EXIT_STACKOVERFLOW 249 /* ----------------------------------------------------------------------------- Miscellaneous garbage diff --git a/includes/rts/Constants.h b/includes/rts/Constants.h index deb550ee97..494abe2b22 100644 --- a/includes/rts/Constants.h +++ b/includes/rts/Constants.h @@ -234,7 +234,7 @@ * stopped for one reason or another. See typedef StgThreadReturnCode * in TSO.h. */ -#define HeapOverflow 1 +#define HeapOverflow 1 /* might also be StackOverflow */ #define StackOverflow 2 #define ThreadYielding 3 #define ThreadBlocked 4 diff --git a/includes/rts/storage/GC.h b/includes/rts/storage/GC.h index 07bc65128f..fb5e21e832 100644 --- a/includes/rts/storage/GC.h +++ b/includes/rts/storage/GC.h @@ -130,15 +130,9 @@ extern generation * oldest_gen; StgPtr allocate(Capability *cap, W_ n) Allocates memory from the nursery in - the current Capability. This can be - done without taking a global lock, - unlike allocate(). In the event of a - heap overflow the program will be - terminated. - - StgPtr allocateFail(Capability *cap, W_ n) - Similar to allocate() but returns NULL - in the event of a heap overflow. + the current Capability. This can be + done without taking a global lock, + unlike allocate(). StgPtr allocatePinned(Capability *cap, W_ n) Allocates a chunk of contiguous store @@ -160,7 +154,6 @@ extern generation * oldest_gen; -------------------------------------------------------------------------- */ StgPtr allocate ( Capability *cap, W_ n ); -StgPtr allocateFail ( Capability *cap, W_ n ); StgPtr allocatePinned ( Capability *cap, W_ n ); /* memory allocator for executable memory */ |