summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gc.c2
-rw-r--r--version.h6
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f74cd6fffb..a0f5bea1b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 9 23:32:37 2013 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c (rb_gc_disable): do rest_sweep() before disable GC.
+ This fix may solve a failure of
+ TestTracepointObj#test_tracks_objspace_events
+ [test/-ext-/tracepoint/test_tracepoint.rb:43].
+
Sat Oct 5 02:14:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_close_read): duplex IO should wait its child process
diff --git a/gc.c b/gc.c
index 88ce849bdf..4a2864ee70 100644
--- a/gc.c
+++ b/gc.c
@@ -3285,6 +3285,8 @@ rb_gc_disable(void)
rb_objspace_t *objspace = &rb_objspace;
int old = dont_gc;
+ rest_sweep(objspace);
+
dont_gc = TRUE;
return old ? Qtrue : Qfalse;
}
diff --git a/version.h b/version.h
index 4c175a965c..b5971ff71e 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-10-05"
-#define RUBY_PATCHLEVEL 326
+#define RUBY_RELEASE_DATE "2013-10-09"
+#define RUBY_PATCHLEVEL 327
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 9
#include "ruby/version.h"