diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-12 05:47:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-12 05:47:10 +0000 |
commit | 96240c6d2d09bb186ebfba2f414348663b806010 (patch) | |
tree | 0ed32718f2734e001be72859f38ae82180e88029 /gc.c | |
parent | 8c36abe23a9c9e980e398171c860a6756716e124 (diff) | |
download | ruby-96240c6d2d09bb186ebfba2f414348663b806010.tar.gz |
* eval_intern.h (rb_thread_raised_set): use generic flags.
* eval.c (rb_longjmp): clear all raised flags.
* eval.c (stack_check): leave clearing flag to rb_longjmp.
* gc.c (rb_memerror): use thread raised flag instead of static flag.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -18,6 +18,7 @@ #include "ruby/re.h" #include "ruby/io.h" #include "ruby/util.h" +#include "eval_intern.h" #include "vm_core.h" #include "gc.h" #include <stdio.h> @@ -190,13 +191,13 @@ rb_global_variable(VALUE *var) void rb_memerror(void) { - static int recurse = 0; - - if (!nomem_error || (recurse > 0 && rb_safe_level() < 4)) { + rb_thread_t *th = GET_THREAD(); + if (!nomem_error || + (rb_thread_raised_p(th, RAISED_NOMEMORY) && rb_safe_level() < 4)) { fprintf(stderr, "[FATAL] failed to allocate memory\n"); exit(1); } - recurse++; + rb_thread_raised_set(th, RAISED_NOMEMORY); rb_exc_raise(nomem_error); } |