summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gc.c8
-rw-r--r--thread.c3
3 files changed, 5 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 370e924a9f..423683f827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 30 02:20:26 2010 Masaya Tarui <tarui@ruby-lnag.org>
+
+ * thread.c (RB_GC_SAVE_MACHINE_CONTEXT), gc.c (ruby_gc_stress_start):
+ revert r28078.
+
Sun May 30 02:21:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
* ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
diff --git a/gc.c b/gc.c
index 44d04caf16..b0a6dcf6c0 100644
--- a/gc.c
+++ b/gc.c
@@ -517,14 +517,6 @@ gc_stress_get(VALUE self)
return ruby_gc_stress ? Qtrue : Qfalse;
}
-void
-ruby_gc_stress_start(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
- if(ruby_gc_stress)
- rb_gc();
-}
-
/*
* call-seq:
* GC.stress = bool -> bool
diff --git a/thread.c b/thread.c
index b6e598304d..dcf7a2e838 100644
--- a/thread.c
+++ b/thread.c
@@ -99,13 +99,10 @@ static void reset_unblock_function(rb_thread_t *th, const struct rb_unblock_call
static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_region_buffer *region);
-void ruby_gc_stress_start(void);
-
#define RB_GC_SAVE_MACHINE_CONTEXT(th) \
do { \
rb_gc_save_machine_context(th); \
SET_MACHINE_STACK_END(&(th)->machine_stack_end); \
- ruby_gc_stress_start(); \
} while (0)
#define GVL_UNLOCK_BEGIN() do { \