aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-18 08:04:08 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-18 08:04:08 +0000
commit661cf78bef8db2c55ae1511eadd1e918f63efa8d (patch)
tree4cb97abfecee65c50caa5083b1d5baf57ec7a138
parent7bdb9fe17fe649023d3c5422b76a3634c48791ab (diff)
downloadruby-661cf78bef8db2c55ae1511eadd1e918f63efa8d.tar.gz
* gc.c (gc_profile_record_get): should return an empty array
when profiling is active. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--gc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 63fa38a3fe..c6712b0a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 18 17:03:00 2013 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c (gc_profile_record_get): should return an empty array
+ when profiling is active.
+
Wed Dec 18 16:49:40 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_profile_clear, gc_profile_enable): remove rest_sweep().
diff --git a/gc.c b/gc.c
index 8a1acf2738..5330f35d3d 100644
--- a/gc.c
+++ b/gc.c
@@ -7000,7 +7000,7 @@ gc_profile_record_get(void)
size_t i;
rb_objspace_t *objspace = (&rb_objspace);
- if (!gc_prof_enabled(objspace)) {
+ if (!objspace->profile.run) {
return Qnil;
}