summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-02 15:18:44 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-02 15:18:44 +0000
commit8519afcb41f13dd03eeaf503493b3ca90bff961b (patch)
tree59c385212b8ee6cc5caa5e0748be71c19e5426ca
parent5c72ffe769b5552d7abb5fe050aba555b37c7278 (diff)
* gc.c: add rb_during_gc(). based on a patch from arton <artonx AT
yahoo.co.jp> at [ruby-dev:35313]. * include/ruby/intern.h: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--gc.c17
-rw-r--r--include/ruby/intern.h1
3 files changed, 25 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 65ce1d464e..e4702d3d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul 3 00:09:31 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * gc.c: add rb_during_gc(). based on a patch from arton <artonx AT
+ yahoo.co.jp> at [ruby-dev:35313].
+
+ * include/ruby/intern.h: ditto.
+
Wed Jul 2 09:49:10 2008 Narihiro Nakamura <authorNari@gmail.com>
* gc.c (gc_lazy_sweep) : use lazy sweep algorithm for response performance gain.
diff --git a/gc.c b/gc.c
index ff20011ff9..a915df8516 100644
--- a/gc.c
+++ b/gc.c
@@ -723,6 +723,23 @@ rb_fill_value_cache(rb_thread_t *th)
}
#endif
+int
+rb_during_gc(void)
+{
+#if USE_VALUE_CACHE
+ rb_thread_t *th = GET_THREAD();
+ VALUE v = *th->value_cache_ptr;
+#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
+ rb_objspace_t *objspace = th->vm->objspace;
+#else
+ rb_objspace_t *objspace = &rb_objspace;
+#endif
+#else
+ rb_objspace_t *objspace = &rb_objspace;
+#endif
+ return during_gc;
+}
+
VALUE
rb_newobj(void)
{
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index f9d4469f69..f1d47f654e 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -329,6 +329,7 @@ void ruby_set_stack_size(size_t);
NORETURN(void rb_memerror(void));
int ruby_stack_check(void);
int ruby_stack_length(VALUE**);
+int rb_during_gc(void);
void rb_gc_mark_locations(VALUE*, VALUE*);
void rb_mark_tbl(struct st_table*);
void rb_mark_set(struct st_table*);