mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
gc.c: live keys only
* 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:
parent
58d50800e8
commit
86e2038c27
1 changed files with 12 additions and 5 deletions
17
gc.c
17
gc.c
|
@ -6476,7 +6476,13 @@ wmap_each_value(VALUE self)
|
|||
static int
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -6485,12 +6491,13 @@ static VALUE
|
|||
wmap_keys(VALUE self)
|
||||
{
|
||||
struct weakmap *w;
|
||||
VALUE ary;
|
||||
struct wmap_iter_arg args;
|
||||
|
||||
TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
|
||||
ary = rb_ary_new();
|
||||
st_foreach(w->wmap2obj, wmap_keys_i, (st_data_t)ary);
|
||||
return ary;
|
||||
args.objspace = &rb_objspace;
|
||||
args.value = rb_ary_new();
|
||||
st_foreach(w->wmap2obj, wmap_keys_i, (st_data_t)&args);
|
||||
return args.value;
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
Loading…
Reference in a new issue