summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-04-03 17:47:22 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-04-03 17:47:22 +0900
commitf67038a11b5909c8df93ba9d04fa5fa9f2089025 (patch)
tree975f6767877137cfec00e6134abb04e8edf9cfae
parent09d1c423083d5eba552dbc0e6db7eb606542dc93 (diff)
parent6d75f89ee5ca54bfa0b1c176c091a51974807732 (diff)
downloadmruby-f67038a11b5909c8df93ba9d04fa5fa9f2089025.tar.gz
mruby-f67038a11b5909c8df93ba9d04fa5fa9f2089025.zip
Merge pull request #1996 from take-cheeze/objectspace
Support :T_FIBER in ObjectSpace.count_objects .
-rw-r--r--mrbgems/mruby-objectspace/src/mruby_objectspace.c1
-rw-r--r--mrbgems/mruby-objectspace/test/objectspace.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
index 938eb1716..02a85af05 100644
--- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c
+++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
@@ -90,6 +90,7 @@ os_count_objects(mrb_state *mrb, mrb_value self)
COUNT_TYPE(T_FILE);
COUNT_TYPE(T_ENV);
COUNT_TYPE(T_DATA);
+ COUNT_TYPE(T_FIBER);
#undef COUNT_TYPE
default:
type = mrb_fixnum_value(i); break;
diff --git a/mrbgems/mruby-objectspace/test/objectspace.rb b/mrbgems/mruby-objectspace/test/objectspace.rb
index 2362fd3f0..e70650e84 100644
--- a/mrbgems/mruby-objectspace/test/objectspace.rb
+++ b/mrbgems/mruby-objectspace/test/objectspace.rb
@@ -1,5 +1,6 @@
assert('ObjectSpace.count_objects') do
h = {}
+ f = Fiber.new {} if Object.const_defined? :Fiber
ObjectSpace.count_objects(h)
assert_kind_of(Hash, h)
assert_true(h.keys.all? {|x| x.is_a?(Symbol) || x.is_a?(Integer) })
@@ -7,6 +8,7 @@ assert('ObjectSpace.count_objects') do
assert_true(h.has_key?(:TOTAL))
assert_true(h.has_key?(:FREE))
+ assert_true(h.has_key?(:T_FIBER)) if Object.const_defined? :Fiber
h = ObjectSpace.count_objects
assert_kind_of(Hash, h)