* test/objspace/test_objspace.rb: added test for objspace.

* ext/objspace/objspace.c: considers T_ZOMBIE by lazy sweep GC.

* gc.c: considers that dsize was 0. [ruby-dev:42022]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nari 2010-08-14 09:01:12 +00:00
Родитель dccf9e0c45
Коммит e573186407
4 изменённых файлов: 56 добавлений и 1 удалений

Просмотреть файл

@ -1,3 +1,11 @@
Sat Aug 14 17:48:41 2010 Narihiro Nakamura <authorNari@gmail.com>
* test/objspace/test_objspace.rb: added test for objspace.
* ext/objspace/objspace.c: considers T_ZOMBIE by lazy sweep GC.
* gc.c: considers that dsize was 0. [ruby-dev:42022]
Sat Aug 14 15:33:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, include/ruby/defines.h (RUBY_FUNC_EXPORTED): macro

Просмотреть файл

@ -138,6 +138,9 @@ memsize_of(VALUE obj)
}
break;
case T_ZOMBIE:
break;
default:
rb_bug("objspace/memsize_of(): unknown data type 0x%x(%p)",
BUILTIN_TYPE(obj), (void*)obj);

2
gc.c
Просмотреть файл

@ -1176,7 +1176,7 @@ rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type)
size_t
rb_objspace_data_type_memsize(VALUE obj)
{
if (RTYPEDDATA_P(obj)) {
if (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj)->function.dsize) {
return RTYPEDDATA_TYPE(obj)->function.dsize(RTYPEDDATA_DATA(obj));
}
else {

Просмотреть файл

@ -0,0 +1,44 @@
require "test/unit"
require "objspace"
class TestObjSpace < Test::Unit::TestCase
def test_memsize_of
assert_equal(0, ObjectSpace.memsize_of(true))
assert_kind_of(Integer, ObjectSpace.memsize_of(Object.new))
assert_kind_of(Integer, ObjectSpace.memsize_of(Class))
assert_kind_of(Integer, ObjectSpace.memsize_of(""))
assert_kind_of(Integer, ObjectSpace.memsize_of([]))
assert_kind_of(Integer, ObjectSpace.memsize_of({}))
assert_kind_of(Integer, ObjectSpace.memsize_of(//))
f = File.new(__FILE__)
assert_kind_of(Integer, ObjectSpace.memsize_of(f))
f.close
assert_kind_of(Integer, ObjectSpace.memsize_of(/a/.match("a")))
assert_kind_of(Integer, ObjectSpace.memsize_of(Struct.new(:a)))
end
def test_count_objects_size
res = ObjectSpace.count_objects_size
assert_equal(false, res.empty?)
assert_equal(true, res[:TOTAL] > 0)
arg = {}
ObjectSpace.count_objects_size(arg)
assert_equal(false, arg.empty?)
end
def test_count_nodes
res = ObjectSpace.count_nodes
assert_equal(false, res.empty?)
arg = {}
ObjectSpace.count_nodes(arg)
assert_equal(false, arg.empty?)
end
def test_count_tdata_objects
res = ObjectSpace.count_tdata_objects
assert_equal(false, res.empty?)
arg = {}
ObjectSpace.count_tdata_objects(arg)
assert_equal(false, arg.empty?)
end
end