From d85044f6b201eae0a9e453b89c0433608e0778f0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 8 Sep 2013 02:08:45 -0500 Subject: Default to infinite stack size (#8189) When servicing a stack overflows, only throw an exception to the given thread if the user explicitly set a max stack size, using +RTS -K. Otherwise just service it normally and grow the stack. In case we actually run out of *heap* (stack chuncks are allocated on the heap), then we need to bail by calling the stackOverflow() hook and exit immediately. Authored-by: Ben Gamari Signed-off-by: Austin Seipp --- includes/rts/Constants.h | 2 +- includes/rts/storage/GC.h | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'includes/rts') diff --git a/includes/rts/Constants.h b/includes/rts/Constants.h index 494abe2b22..deb550ee97 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 /* might also be StackOverflow */ +#define HeapOverflow 1 #define StackOverflow 2 #define ThreadYielding 3 #define ThreadBlocked 4 diff --git a/includes/rts/storage/GC.h b/includes/rts/storage/GC.h index fb5e21e832..07bc65128f 100644 --- a/includes/rts/storage/GC.h +++ b/includes/rts/storage/GC.h @@ -130,9 +130,15 @@ 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(). + 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. StgPtr allocatePinned(Capability *cap, W_ n) Allocates a chunk of contiguous store @@ -154,6 +160,7 @@ 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 */ -- cgit v1.2.1