From b36aa7af03a481fc1f41533256a78946498ba0ae Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 27 Oct 2010 18:16:39 +0000 Subject: * ext/objspace/objspace.c (memsize_of): fix rdoc. * ext/objspace/objspace.c (total_memsize_of_all_objects): added. * test/objspace/test_objspace.rb: - add a test for ObjectSpace.total_memsize_of_all_objects. - add two tests for ObjectSpace.memsize_of (for nil and Fixnum). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/objspace/objspace.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 3 deletions(-) (limited to 'ext/objspace') diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c index a08f7738aa..02eed0301f 100644 --- a/ext/objspace/objspace.c +++ b/ext/objspace/objspace.c @@ -155,9 +155,9 @@ memsize_of(VALUE obj) * * Return consuming memory size of obj. * - * Note that this information is incomplete. You need to deal with + * Note that the return size is incomplete. You need to deal with * this information as only a *HINT*. Especaially, the size of - * T_DATA may not right size. + * T_DATA may not be correct. * * This method is not expected to work except C Ruby. */ @@ -168,6 +168,53 @@ memsize_of_m(VALUE self, VALUE obj) return SIZET2NUM(memsize_of(obj)); } +static int +total_i(void *vstart, void *vend, size_t stride, void *data) +{ + size_t *total_storage = (size_t *)data, total = 0; + VALUE v; + + for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) { + if (RBASIC(v)->flags) { + total += memsize_of(v); + } + } + *total_storage += total; + + return 0; +} + +/* + * call-seq: + * ObjectSpace.total_memsize_of_all_objects() -> Integer + * + * Return consuming memory size of all living objects. + * + * Note that the returned size is incomplete. You need to deal with + * this information as only a *HINT*. Especaially, the size of + * T_DATA may not be correct. + * + * Note that this method does *NOT* return total malloc'ed memory size. + * + * This method can be defined by the following Ruby code: + * + * def total_memsize_of_all_objects + * total = 0 + * ObjectSpace.each_objects{|e| total += ObjectSpace.memsize_of(e)} + * total + * end + * + * This method is not expected to work except C Ruby. + */ + +static VALUE +total_memsize_of_all_objects_m(VALUE self) +{ + size_t total; + rb_objspace_each_objects(total_i, &total); + return SIZET2NUM(total); +} + static int set_zero_i(st_data_t key, st_data_t val, st_data_t arg) { @@ -544,8 +591,11 @@ Init_objspace(void) { VALUE rb_mObjSpace = rb_const_get(rb_cObject, rb_intern("ObjectSpace")); - rb_define_module_function(rb_mObjSpace, "count_objects_size", count_objects_size, -1); rb_define_module_function(rb_mObjSpace, "memsize_of", memsize_of_m, 1); + rb_define_module_function(rb_mObjSpace, "total_memsize_of_all_objects", + total_memsize_of_all_objects_m, 0); + + rb_define_module_function(rb_mObjSpace, "count_objects_size", count_objects_size, -1); rb_define_module_function(rb_mObjSpace, "count_nodes", count_nodes, -1); rb_define_module_function(rb_mObjSpace, "count_tdata_objects", count_tdata_objects, -1); } -- cgit v1.2.3