From fe1ec9afdd1dbfd579efe5c9823f554e26d75a2d Mon Sep 17 00:00:00 2001
From: Rory OConnell <19547+RoryO@users.noreply.github.com>
Date: Fri, 17 Jul 2020 20:09:44 -0700
Subject: Add ObjectSpace.memsize_of_all

---
 mrbgems/mruby-objectspace/src/mruby_objectspace.c | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'mrbgems/mruby-objectspace/src/mruby_objectspace.c')

diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
index 9ac75c710..6da2a4104 100644
--- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c
+++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
@@ -344,6 +344,30 @@ os_memsize_of(mrb_state *mrb, mrb_value self)
   return mrb_fixnum_value(total);
 }
 
+struct os_memsize_of_all_cb_data {
+  mrb_int t;
+  struct RClass *type;
+};
+
+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(obj->c == data->type) data->t += os_memsize_of_object(mrb, mrb_obj_value(obj));
+  return 0;
+}
+
+static mrb_value
+os_memsize_of_all(mrb_state *mrb, mrb_value self)
+{
+  mrb_value type;
+  struct os_memsize_of_all_cb_data data = { 0 };
+  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);
+}
+
 void
 mrb_mruby_objectspace_gem_init(mrb_state *mrb)
 {
@@ -351,6 +375,7 @@ mrb_mruby_objectspace_gem_init(mrb_state *mrb)
   mrb_define_class_method(mrb, os, "count_objects", os_count_objects, MRB_ARGS_OPT(1));
   mrb_define_class_method(mrb, os, "each_object", os_each_object, MRB_ARGS_OPT(1));
   mrb_define_class_method(mrb, os, "memsize_of", os_memsize_of, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
+  mrb_define_class_method(mrb, os, "memsize_of_all", os_memsize_of_all, MRB_ARGS_REQ(1));
 }
 
 void
-- 
cgit v1.2.3


From a79d1ba9ffe4d3c2c092f118c68ca8a0e311af0b Mon Sep 17 00:00:00 2001
From: Rory OConnell <19547+RoryO@users.noreply.github.com>
Date: Fri, 17 Jul 2020 20:21:23 -0700
Subject: Adding memsize_of_all doc

---
 mrbgems/mruby-objectspace/src/mruby_objectspace.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'mrbgems/mruby-objectspace/src/mruby_objectspace.c')

diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
index 6da2a4104..f5cc7b753 100644
--- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c
+++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
@@ -357,6 +357,14 @@ os_memsize_of_all_cb(mrb_state *mrb, struct RBasic *obj, void *d)
   return 0;
 }
 
+/*
+ *  call-seq:
+ *    ObjectSpace.memsize_of_all([klass]) -> Numeric
+ *
+ *  Return consuming memory size of all living objects of type klass.
+ *
+ */
+
 static mrb_value
 os_memsize_of_all(mrb_state *mrb, mrb_value self)
 {
-- 
cgit v1.2.3


From ffe8bf6323a6fd9a0b68b3e84745ccc820b2bc49 Mon Sep 17 00:00:00 2001
From: Rory O'Connell <19547+RoryO@users.noreply.github.com>
Date: Sat, 18 Jul 2020 13:55:45 -0700
Subject: Avoid singleton classes with mrb_class_real

---
 mrbgems/mruby-objectspace/src/mruby_objectspace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mrbgems/mruby-objectspace/src/mruby_objectspace.c')

diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
index f5cc7b753..b3e8605d7 100644
--- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c
+++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
@@ -353,7 +353,7 @@ 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(obj->c == data->type) data->t += os_memsize_of_object(mrb, mrb_obj_value(obj));
+  if(mrb_class_real(obj->c) == data->type) data->t += os_memsize_of_object(mrb, mrb_obj_value(obj));
   return 0;
 }
 
-- 
cgit v1.2.3