kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c (gc_stat_internal): return size_t value instead of VALUE

Browse source 
and remove `out' parameter.
* gc.c: add braces for `if' statements.
* gc.c (gc_stat_internal): fix comment.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-06-30 07:46:57 +00:00
parent 4369806ff0
commit 51ae29a3cb
2 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Mon Jun 30 16:42:52 2014 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_stat_internal): return size_t value instead of VALUE
and remove `out' parameter.
* gc.c: add braces for `if' statements.
* gc.c (gc_stat_internal): fix comment.
Mon Jun 30 15:07:34 2014 Koichi Sasada <ko1@atdot.net> Mon Jun 30 15:07:34 2014 Koichi Sasada <ko1@atdot.net>
* gc.c: support `USE_RGENGC == 0'. * gc.c: support `USE_RGENGC == 0'.

32
gc.c
View file

@ -5555,14 +5555,15 @@ gc_latest_gc_info(int argc, VALUE *argv, VALUE self)
} }
} }
if (arg == Qnil) if (arg == Qnil) {
arg = rb_hash_new(); arg = rb_hash_new();
}
return gc_info_decode(objspace->profile.latest_gc_info, arg); return gc_info_decode(objspace->profile.latest_gc_info, arg);
} }
static VALUE size_t
gc_stat_internal(VALUE hash_or_sym, size_t *out) gc_stat_internal(VALUE hash_or_sym)
{ {
static VALUE sym_count; static VALUE sym_count;
static VALUE sym_heap_used, sym_heap_length, sym_heap_increment; static VALUE sym_heap_used, sym_heap_length, sym_heap_increment;
@ -5590,12 +5591,15 @@ gc_stat_internal(VALUE hash_or_sym, size_t *out)
rb_objspace_t *objspace = &rb_objspace; rb_objspace_t *objspace = &rb_objspace;
VALUE hash = Qnil, key = Qnil; VALUE hash = Qnil, key = Qnil;
if (RB_TYPE_P(hash_or_sym, T_HASH)) if (RB_TYPE_P(hash_or_sym, T_HASH)) {
hash = hash_or_sym; hash = hash_or_sym;
else if (SYMBOL_P(hash_or_sym) && out) }
else if (SYMBOL_P(hash_or_sym)) {
key = hash_or_sym; key = hash_or_sym;
else }
else {
rb_raise(rb_eTypeError, "non-hash or symbol argument"); rb_raise(rb_eTypeError, "non-hash or symbol argument");
}
if (sym_count == 0) { if (sym_count == 0) {
#define S(s) sym_##s = ID2SYM(rb_intern_const(#s)) #define S(s) sym_##s = ID2SYM(rb_intern_const(#s))
@ -5635,14 +5639,14 @@ gc_stat_internal(VALUE hash_or_sym, size_t *out)
S(promote_young_count); S(promote_young_count);
S(remembered_normal_object_count); S(remembered_normal_object_count);
S(remembered_shady_object_count); S(remembered_shady_object_count);
#endif /* USE_RGENGC */
#endif /* RGENGC_PROFILE */ #endif /* RGENGC_PROFILE */
#endif /* USE_RGENGC */
#undef S #undef S
} }
#define SET(name, attr) \ #define SET(name, attr) \
if (key == sym_##name) \ if (key == sym_##name) \
return (*out = attr, Qnil); \ return attr; \
else if (hash != Qnil) \ else if (hash != Qnil) \
rb_hash_aset(hash, sym_##name, SIZET2NUM(attr)); rb_hash_aset(hash, sym_##name, SIZET2NUM(attr));
@ -5709,7 +5713,7 @@ gc_stat_internal(VALUE hash_or_sym, size_t *out)
} }
#endif #endif
return hash; return 0;
} }
/* /*
@ -5759,8 +5763,7 @@ gc_stat(int argc, VALUE *argv, VALUE self)
if (rb_scan_args(argc, argv, "01", &arg) == 1) { if (rb_scan_args(argc, argv, "01", &arg) == 1) {
if (SYMBOL_P(arg)) { if (SYMBOL_P(arg)) {
size_t value = 0; size_t value = gc_stat_internal(arg);
gc_stat_internal(arg, &value);
return SIZET2NUM(value); return SIZET2NUM(value);
} }
else if (!RB_TYPE_P(arg, T_HASH)) { else if (!RB_TYPE_P(arg, T_HASH)) {
@ -5771,7 +5774,7 @@ gc_stat(int argc, VALUE *argv, VALUE self)
if (arg == Qnil) { if (arg == Qnil) {
arg = rb_hash_new(); arg = rb_hash_new();
} }
gc_stat_internal(arg, 0); gc_stat_internal(arg);
return arg; return arg;
} }
@ -5779,12 +5782,11 @@ size_t
rb_gc_stat(VALUE key) rb_gc_stat(VALUE key)
{ {
if (SYMBOL_P(key)) { if (SYMBOL_P(key)) {
size_t value = 0; size_t value = gc_stat_internal(key);
gc_stat_internal(key, &value);
return value; return value;
} }
else { else {
gc_stat_internal(key, 0); gc_stat_internal(key);
return 0; return 0;
} }
} }