diff options
author | Andy Wingo <wingo@pobox.com> | 2014-03-22 15:49:31 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2014-03-22 15:49:31 +0100 |
commit | c2247b782a9234bb9aedee5204c30daf1d01a510 (patch) | |
tree | b5d04cd1bc9d39161d098df22eed7b731d9a588f /libguile/vm.c | |
parent | 0463a927c4ba4e941a3e7d100c629adf7e64b7c2 (diff) | |
download | guile-c2247b782a9234bb9aedee5204c30daf1d01a510.tar.gz |
Out-of-memory situations raise exceptions instead of aborting
* libguile/gc.c (scm_oom_fn, scm_init_gc): Install an out-of-memory
handler that raises an unwind-only out-of-memory exception.
(scm_gc_warn_proc, scm_init_gc): Install a warning proc that tries to
print to the current warning port, if the current warning port is a
file port.
(scm_gc_after_nonlocal_exit): New interface. Should be called after a
nonlocal return to potentially collect memory; otherwise allocations
could try to expand again when they should collect.
* libguile/continuations.c (scm_i_make_continuation):
* libguile/eval.c (eval):
* libguile/throw.c (catch):
* libguile/vm.c (scm_call_n): Call scm_gc_after_nonlocal_exit after
nonlocal returns.
* libguile/throw.c (abort_to_prompt, throw_without_pre_unwind): Rework
to avoid allocating memory.
(scm_report_out_of_memory): New interface.
(scm_init_throw): Pre-allocate the arguments for stack-overflow and
out-of-memory errors.
* module/ice-9/boot-9.scm: Add an out-of-memory exception printer.
* module/system/repl/error-handling.scm (call-with-error-handling): Add
out-of-memory to the report-keys set.
* libguile/gc-malloc.c (scm_realloc): Call scm_report_out_of_memory if
realloc fails.
* libguile/error.h:
* libguile/error.c:
* libguile/deprecated.h:
* libguile/deprecated.c (scm_memory_error): Deprecate.
* test-suite/standalone/Makefile.am:
* test-suite/standalone/test-out-of-memory: New test case.
Diffstat (limited to 'libguile/vm.c')
-rw-r--r-- | libguile/vm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libguile/vm.c b/libguile/vm.c index 88c75fd33..b4ebbc724 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -1236,8 +1236,11 @@ scm_call_n (SCM proc, SCM *argv, size_t nargs) int resume = SCM_I_SETJMP (registers); if (SCM_UNLIKELY (resume)) - /* Non-local return. */ - vm_dispatch_abort_hook (vp); + { + scm_gc_after_nonlocal_exit (); + /* Non-local return. */ + vm_dispatch_abort_hook (vp); + } return vm_engines[vp->engine](thread, vp, ®isters, resume); } |