From 222918deae84ae8dda26aa769bf3cc6b68e3aeec Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Fri, 17 May 2013 07:21:33 +1000 Subject: First implementation of ObjectSpace moved outside of gc.c --- mrbgems/mruby-objectspace/src/mruby_objectspace.c | 111 ++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 mrbgems/mruby-objectspace/src/mruby_objectspace.c (limited to 'mrbgems/mruby-objectspace/src') diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c new file mode 100644 index 000000000..2d064044d --- /dev/null +++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c @@ -0,0 +1,111 @@ +#include +#include +#include +#include + +/* + * call-seq: + * ObjectSpace.count_objects([result_hash]) -> hash + * + * Counts objects for each type. + * + * It returns a hash, such as: + * { + * :TOTAL=>10000, + * :FREE=>3011, + * :MRB_TT_OBJECT=>6, + * :MRB_TT_CLASS=>404, + * # ... + * } + * + * If the optional argument +result_hash+ is given, + * it is overwritten and returned. This is intended to avoid probe effect. + * + */ + +struct os_count_struct { + size_t total; + size_t counts[MRB_TT_MAXDEFINE+1]; +}; + +void os_count_object_type(RVALUE *obj, void *data) +{ + struct os_count_struct* obj_count; + obj_count = (struct os_count_struct*)(data); + obj_count->counts[mrb_type(obj->as.basic)]++; + obj_count->total++; +} + +mrb_value +os_count_objects(mrb_state *mrb, mrb_value self) +{ + struct os_count_struct obj_count; + size_t freed = 0; + size_t i; + mrb_value hash; + struct heap_page* page = mrb->heaps; + + if (mrb_get_args(mrb, "|H", &hash) == 0) { + hash = mrb_hash_new(mrb); + } + + if (!mrb_test(mrb_hash_empty_p(mrb, hash))) { + mrb_hash_clear(mrb, hash); + } + + for (i = 0; i <= MRB_TT_MAXDEFINE; i++) { + obj_count.counts[i] = 0; + } + + mrb_objspace_each_objects(mrb, os_count_object_type, &obj_count); + + mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_cstr(mrb, "TOTAL")), mrb_fixnum_value(obj_count.total)); + mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_cstr(mrb, "FREE")), mrb_fixnum_value(freed)); + + for (i = 0; i < MRB_TT_MAXDEFINE; i++) { + mrb_value type; + switch (i) { +#define COUNT_TYPE(t) case (t): type = mrb_symbol_value(mrb_intern_cstr(mrb, #t)); break; + COUNT_TYPE(MRB_TT_FALSE); + COUNT_TYPE(MRB_TT_FREE); + COUNT_TYPE(MRB_TT_TRUE); + COUNT_TYPE(MRB_TT_FIXNUM); + COUNT_TYPE(MRB_TT_SYMBOL); + COUNT_TYPE(MRB_TT_UNDEF); + COUNT_TYPE(MRB_TT_FLOAT); + COUNT_TYPE(MRB_TT_VOIDP); + COUNT_TYPE(MRB_TT_OBJECT); + COUNT_TYPE(MRB_TT_CLASS); + COUNT_TYPE(MRB_TT_MODULE); + COUNT_TYPE(MRB_TT_ICLASS); + COUNT_TYPE(MRB_TT_SCLASS); + COUNT_TYPE(MRB_TT_PROC); + COUNT_TYPE(MRB_TT_ARRAY); + COUNT_TYPE(MRB_TT_HASH); + COUNT_TYPE(MRB_TT_STRING); + COUNT_TYPE(MRB_TT_RANGE); + COUNT_TYPE(MRB_TT_EXCEPTION); + COUNT_TYPE(MRB_TT_FILE); + COUNT_TYPE(MRB_TT_ENV); + COUNT_TYPE(MRB_TT_DATA); +#undef COUNT_TYPE + default: type = mrb_fixnum_value(i); break; + } + if (obj_count.counts[i]) + mrb_hash_set(mrb, hash, type, mrb_fixnum_value(obj_count.counts[i])); + } + + return hash; +} + +void +mrb_mruby_objectspace_gem_init(mrb_state* mrb) { + struct RClass *os; + os = mrb_define_module(mrb, "ObjectSpace"); + mrb_define_class_method(mrb, os, "count_objects", os_count_objects, MRB_ARGS_ANY()); +} + +void +mrb_mruby_objectspace_gem_final(mrb_state* mrb) { + // finalizer +} -- cgit v1.2.3 From f62cc5b1eebb29d244977c6030c04d9cb8ebefba Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Fri, 17 May 2013 07:41:13 +1000 Subject: Changed the object_count so that it only iterates over the RBasic object, not the full RVALUE known by the GC --- include/mruby/gc.h | 33 ++--------------------- mrbgems/mruby-objectspace/src/mruby_objectspace.c | 24 ++++++++++++----- mrbgems/mruby-objectspace/test/objectspace.rb | 11 ++++++++ src/gc.c | 22 ++++++++++++++- 4 files changed, 52 insertions(+), 38 deletions(-) (limited to 'mrbgems/mruby-objectspace/src') diff --git a/include/mruby/gc.h b/include/mruby/gc.h index 00564c4fa..552321be2 100644 --- a/include/mruby/gc.h +++ b/include/mruby/gc.h @@ -12,38 +12,9 @@ extern "C" { #endif #include "mruby.h" -#include "mruby/array.h" -#include "mruby/class.h" -#include "mruby/data.h" -#include "mruby/hash.h" -#include "mruby/proc.h" -#include "mruby/range.h" -#include "mruby/string.h" -#include "mruby/variable.h" +#include "mruby/value.h" -struct free_obj { - MRB_OBJECT_HEADER; - struct RBasic *next; -}; - -struct RVALUE { - union { - struct free_obj free; - struct RBasic basic; - struct RObject object; - struct RClass klass; - struct RString string; - struct RArray array; - struct RHash hash; - struct RRange range; - struct RData data; - struct RProc proc; - } as; -}; - -typedef struct RVALUE RVALUE; - -typedef int each_object_callback(RVALUE *obj, void *data); +typedef int each_object_callback(mrb_state *mrb, struct RBasic obj, void *data); void mrb_objspace_each_objects(mrb_state *mrb, each_object_callback* callback, void *data); #if defined(__cplusplus) diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c index 2d064044d..cf3cf631f 100644 --- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c +++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c @@ -1,7 +1,9 @@ +#include + #include #include #include -#include +#include /* * call-seq: @@ -25,22 +27,30 @@ struct os_count_struct { size_t total; + size_t freed; size_t counts[MRB_TT_MAXDEFINE+1]; }; -void os_count_object_type(RVALUE *obj, void *data) +void os_count_object_type(mrb_state *mrb, struct RBasic obj, void *data) { struct os_count_struct* obj_count; obj_count = (struct os_count_struct*)(data); - obj_count->counts[mrb_type(obj->as.basic)]++; - obj_count->total++; + obj_count->counts[mrb_type(obj)]++; + if (is_dead(mrb, &obj)) + { + obj_count->freed++; + } + else + { + obj_count->total++; + } + } mrb_value os_count_objects(mrb_state *mrb, mrb_value self) { struct os_count_struct obj_count; - size_t freed = 0; size_t i; mrb_value hash; struct heap_page* page = mrb->heaps; @@ -56,11 +66,13 @@ os_count_objects(mrb_state *mrb, mrb_value self) for (i = 0; i <= MRB_TT_MAXDEFINE; i++) { obj_count.counts[i] = 0; } + obj_count.total = 0; + obj_count.freed = 0; mrb_objspace_each_objects(mrb, os_count_object_type, &obj_count); mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_cstr(mrb, "TOTAL")), mrb_fixnum_value(obj_count.total)); - mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_cstr(mrb, "FREE")), mrb_fixnum_value(freed)); + mrb_hash_set(mrb, hash, mrb_symbol_value(mrb_intern_cstr(mrb, "FREE")), mrb_fixnum_value(obj_count.freed)); for (i = 0; i < MRB_TT_MAXDEFINE; i++) { mrb_value type; diff --git a/mrbgems/mruby-objectspace/test/objectspace.rb b/mrbgems/mruby-objectspace/test/objectspace.rb index dbf3bcbb8..4a362740c 100644 --- a/mrbgems/mruby-objectspace/test/objectspace.rb +++ b/mrbgems/mruby-objectspace/test/objectspace.rb @@ -5,6 +5,11 @@ assert('ObjectSpace.count_objects') do assert_true(h.keys.all? {|x| x.is_a?(Symbol) || x.is_a?(Integer) }) assert_true(h.values.all? {|x| x.is_a?(Integer) }) + assert_true(h.has_key?(:TOTAL)) + assert_true(h.has_key?(:FREE)) + + p h.inspect + h = ObjectSpace.count_objects assert_kind_of(Hash, h) assert_true(h.keys.all? {|x| x.is_a?(Symbol) || x.is_a?(Integer) }) @@ -12,6 +17,8 @@ assert('ObjectSpace.count_objects') do assert_raise(TypeError) { ObjectSpace.count_objects(1) } + p h.inspect + h0 = {:MRB_TT_FOO=>1000} h = ObjectSpace.count_objects(h0) assert_false(h0.has_key?(:MRB_TT_FOO)) @@ -31,4 +38,8 @@ assert('ObjectSpace.count_objects') do assert_equal(h_before[:MRB_TT_HASH] + 1000, h[:MRB_TT_HASH]) assert_equal(h_before[:MRB_TT_HASH], h_after[:MRB_TT_HASH]) + + p h.inspect + p h_after.inspect + end \ No newline at end of file diff --git a/src/gc.c b/src/gc.c index 199551c55..f824ee9d4 100644 --- a/src/gc.c +++ b/src/gc.c @@ -73,6 +73,26 @@ */ +struct free_obj { + MRB_OBJECT_HEADER; + struct RBasic *next; +}; + +typedef struct { + union { + struct free_obj free; + struct RBasic basic; + struct RObject object; + struct RClass klass; + struct RString string; + struct RArray array; + struct RHash hash; + struct RRange range; + struct RData data; + struct RProc proc; + } as; +} RVALUE; + #ifdef GC_PROFILE #include #include @@ -1133,7 +1153,7 @@ mrb_objspace_each_objects(mrb_state *mrb, each_object_callback* callback, void * p = page->objects; pend = p + MRB_HEAP_PAGE_SIZE; for (;p < pend; p++) { - callback(p, data); + callback(mrb, p->as.basic, data); } page = page->next; -- cgit v1.2.3 From 40d63f7740e4b020a2126ddb386760c6fd51c999 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Fri, 17 May 2013 08:02:24 +1000 Subject: Changed the each_object callback so that a pointer is passed for the object, instead of the struct. --- include/mruby/gc.h | 12 ++---------- mrbgems/mruby-objectspace/src/mruby_objectspace.c | 6 +++--- src/gc.c | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) (limited to 'mrbgems/mruby-objectspace/src') diff --git a/include/mruby/gc.h b/include/mruby/gc.h index 552321be2..0c19275ba 100644 --- a/include/mruby/gc.h +++ b/include/mruby/gc.h @@ -1,5 +1,5 @@ /* -** gc.c - garbage collector for mruby +** gc.h - garbage collector for mruby ** ** See Copyright Notice in mruby.h */ @@ -7,18 +7,10 @@ #ifndef MRUBY_GC_H #define MRUBY_GC_H -#if defined(__cplusplus) -extern "C" { -#endif - #include "mruby.h" #include "mruby/value.h" -typedef int each_object_callback(mrb_state *mrb, struct RBasic obj, void *data); +typedef int each_object_callback(mrb_state *mrb, struct RBasic* obj, void *data); void mrb_objspace_each_objects(mrb_state *mrb, each_object_callback* callback, void *data); -#if defined(__cplusplus) -} /* extern "C" { */ -#endif - #endif /* MRUBY_GC_H */ diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c index cf3cf631f..10934c83f 100644 --- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c +++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c @@ -31,12 +31,12 @@ struct os_count_struct { size_t counts[MRB_TT_MAXDEFINE+1]; }; -void os_count_object_type(mrb_state *mrb, struct RBasic obj, void *data) +void os_count_object_type(mrb_state *mrb, struct RBasic* obj, void *data) { struct os_count_struct* obj_count; obj_count = (struct os_count_struct*)(data); - obj_count->counts[mrb_type(obj)]++; - if (is_dead(mrb, &obj)) + obj_count->counts[obj->tt]++; + if (is_dead(mrb, obj)) { obj_count->freed++; } diff --git a/src/gc.c b/src/gc.c index f824ee9d4..9dcc3f4b2 100644 --- a/src/gc.c +++ b/src/gc.c @@ -1153,7 +1153,7 @@ mrb_objspace_each_objects(mrb_state *mrb, each_object_callback* callback, void * p = page->objects; pend = p + MRB_HEAP_PAGE_SIZE; for (;p < pend; p++) { - callback(mrb, p->as.basic, data); + callback(mrb, &p->as.basic, data); } page = page->next; -- cgit v1.2.3 From e36a0275e10903aaddea7c79832d053ba0aa28f6 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Fri, 17 May 2013 08:04:19 +1000 Subject: Minor formatting change. --- mrbgems/mruby-objectspace/src/mruby_objectspace.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'mrbgems/mruby-objectspace/src') diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c index 10934c83f..924eeb0e1 100644 --- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c +++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c @@ -36,15 +36,12 @@ void os_count_object_type(mrb_state *mrb, struct RBasic* obj, void *data) struct os_count_struct* obj_count; obj_count = (struct os_count_struct*)(data); obj_count->counts[obj->tt]++; - if (is_dead(mrb, obj)) - { + + if (is_dead(mrb, obj)) { obj_count->freed++; - } - else - { + } else { obj_count->total++; } - } mrb_value -- cgit v1.2.3 From 391807b73c2ced4a7dd49e417ab14e4c81b4ec70 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Sat, 18 May 2013 10:46:55 +1000 Subject: Changed the counting so that only objects that are alive are added to the object counts. --- mrbgems/mruby-objectspace/src/mruby_objectspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mrbgems/mruby-objectspace/src') diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c index 924eeb0e1..0dc94d792 100644 --- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c +++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c @@ -35,11 +35,11 @@ void os_count_object_type(mrb_state *mrb, struct RBasic* obj, void *data) { struct os_count_struct* obj_count; obj_count = (struct os_count_struct*)(data); - obj_count->counts[obj->tt]++; if (is_dead(mrb, obj)) { obj_count->freed++; } else { + obj_count->counts[obj->tt]++; obj_count->total++; } } -- cgit v1.2.3 From 008aec2bbcd38fa13c27b6df2b2463b6a88cefff Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Sat, 18 May 2013 11:03:54 +1000 Subject: Cleanup of mruby_objectspace.c and removed the unneccessary README for mruby_objectspace. --- mrbgems/mruby-objectspace/README.md | 4 -- mrbgems/mruby-objectspace/src/mruby_objectspace.c | 45 +++++++++++------------ 2 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 mrbgems/mruby-objectspace/README.md (limited to 'mrbgems/mruby-objectspace/src') diff --git a/mrbgems/mruby-objectspace/README.md b/mrbgems/mruby-objectspace/README.md deleted file mode 100644 index 7669c9d7f..000000000 --- a/mrbgems/mruby-objectspace/README.md +++ /dev/null @@ -1,4 +0,0 @@ -MRuby ObjectSpace Implementation -========= - -Currently only supports count_objects \ No newline at end of file diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c index 0dc94d792..21e623823 100644 --- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c +++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c @@ -1,10 +1,28 @@ -#include - #include #include #include #include +struct os_count_struct { + size_t total; + size_t freed; + size_t counts[MRB_TT_MAXDEFINE+1]; +}; + +void +os_count_object_type(mrb_state *mrb, struct RBasic* obj, void *data) +{ + struct os_count_struct* obj_count; + obj_count = (struct os_count_struct*)(data); + + if (is_dead(mrb, obj)) { + obj_count->freed++; + } else { + obj_count->counts[obj->tt]++; + obj_count->total++; + } +} + /* * call-seq: * ObjectSpace.count_objects([result_hash]) -> hash @@ -25,25 +43,6 @@ * */ -struct os_count_struct { - size_t total; - size_t freed; - size_t counts[MRB_TT_MAXDEFINE+1]; -}; - -void os_count_object_type(mrb_state *mrb, struct RBasic* obj, void *data) -{ - struct os_count_struct* obj_count; - obj_count = (struct os_count_struct*)(data); - - if (is_dead(mrb, obj)) { - obj_count->freed++; - } else { - obj_count->counts[obj->tt]++; - obj_count->total++; - } -} - mrb_value os_count_objects(mrb_state *mrb, mrb_value self) { @@ -109,12 +108,10 @@ os_count_objects(mrb_state *mrb, mrb_value self) void mrb_mruby_objectspace_gem_init(mrb_state* mrb) { - struct RClass *os; - os = mrb_define_module(mrb, "ObjectSpace"); + struct RClass *os = mrb_define_module(mrb, "ObjectSpace"); mrb_define_class_method(mrb, os, "count_objects", os_count_objects, MRB_ARGS_ANY()); } void mrb_mruby_objectspace_gem_final(mrb_state* mrb) { - // finalizer } -- cgit v1.2.3