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: live keys only

Browse source 
* gc.c (wmap_keys): return keys for live objects only, like as
  wmap_values.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-12 02:01:18 +00:00
parent 58d50800e8
commit 86e2038c27
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gc.c
View file

@ -6476,7 +6476,13 @@ wmap_each_value(VALUE self)
static int static int
wmap_keys_i(st_data_t key, st_data_t val, st_data_t arg) wmap_keys_i(st_data_t key, st_data_t val, st_data_t arg)
{ {
rb_ary_push((VALUE)arg, (VALUE)key); struct wmap_iter_arg *argp = (struct wmap_iter_arg *)arg;
rb_objspace_t *objspace = argp->objspace;
VALUE ary = argp->value;
VALUE obj = (VALUE)val;
if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) {
rb_ary_push(ary, (VALUE)key);
}
return ST_CONTINUE; return ST_CONTINUE;
} }
@ -6485,12 +6491,13 @@ static VALUE
wmap_keys(VALUE self) wmap_keys(VALUE self)
{ {
struct weakmap *w; struct weakmap *w;
VALUE ary; struct wmap_iter_arg args;
TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w); TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
ary = rb_ary_new(); args.objspace = &rb_objspace;
st_foreach(w->wmap2obj, wmap_keys_i, (st_data_t)ary); args.value = rb_ary_new();
return ary; st_foreach(w->wmap2obj, wmap_keys_i, (st_data_t)&args);
return args.value;
} }
static int static int