admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memsize_of_all to count all objects if no argument given; #5040

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-07-19 07:42:35 +09:00
parent 6d073f8d99
commit 5b2763821e
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-objectspace/src/mruby_objectspace.c
+13 -3
View File
@@ -353,7 +353,17 @@ static int
os_memsize_of_all_cb(mrb_state *mrb, struct RBasic *obj, void *d)
{
struct os_memsize_of_all_cb_data *data = (struct os_memsize_of_all_cb_data *)d;
if(mrb_obj_is_kind_of(mrb, mrb_obj_value(obj), data->type))
switch (obj->tt) {
case MRB_TT_FREE: case MRB_TT_ENV:
case MRB_TT_BREAK: case MRB_TT_ICLASS:
/* internal objects that should not be counted */
return 0;
default:
break;
}
/* skip Proc objects for methods */
if (obj->c == NULL) return 0;
if (data->type == NULL || mrb_obj_is_kind_of(mrb, mrb_obj_value(obj), data->type))
data->t += os_memsize_of_object(mrb, mrb_obj_value(obj));
return 0;
}
@@ -369,9 +379,9 @@ os_memsize_of_all_cb(mrb_state *mrb, struct RBasic *obj, void *d)
static mrb_value
os_memsize_of_all(mrb_state *mrb, mrb_value self)
{
mrb_value type;
mrb_value type = mrb_nil_value();
struct os_memsize_of_all_cb_data data = { 0 };
mrb_get_args(mrb, "C", &type);
mrb_get_args(mrb, "|C", &type);
data.type = mrb_class_ptr(type);
mrb_objspace_each_objects(mrb, os_memsize_of_all_cb, &data);
return mrb_fixnum_value(data.t);