summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-12 19:44:48 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-12 19:44:48 +0000
commit7b614a53dd50508410c48113dce87abfc003df6b (patch)
treeeed417a3a293cee1d3da10de4e76c1c5d2991126 /ext
parenta7198a3c739f7c09f21f69df8611ae47780e3a68 (diff)
* ext/objspace/objspace.c (total_i): fix to skip no ruby objects.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32035 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/objspace/objspace.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 8e8b29f..3434a0a 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -185,8 +185,19 @@ total_i(void *vstart, void *vend, size_t stride, void *ptr)
for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
if (RBASIC(v)->flags) {
- if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
- data->total += memsize_of(v);
+ switch (BUILTIN_TYPE(v)) {
+ case T_NONE:
+ case T_ICLASS:
+ case T_NODE:
+ case T_ZOMBIE:
+ continue;
+ case T_CLASS:
+ if (FL_TEST(v, FL_SINGLETON))
+ continue;
+ default:
+ if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
+ data->total += memsize_of(v);
+ }
}
}
}