admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimize Array#unshift using shared body object

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-06-13 02:29:13 +09:00
parent d39a355af3
commit 3b1b9b050b
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+26 -11
View File
@@ -501,12 +501,20 @@ mrb_ary_unshift(mrb_state *mrb, mrb_value self, mrb_value item)
{
struct RArray *a = mrb_ary_ptr(self);
ary_modify(mrb, a);
if (a->aux.capa < a->len + 1)
ary_expand_capa(mrb, a, a->len + 1);
memmove(a->ptr + 1, a->ptr, sizeof(mrb_value)*a->len);
memcpy(a->ptr, &item, sizeof(mrb_value));
a->len += 1;
if ((a->flags & MRB_ARY_SHARED)
&& a->aux.shared->refcnt == 1 /* shared only referenced from this array */
&& a->ptr - a->aux.shared->ptr >= 1) /* there's room for unshifted item */ {
a->ptr--;
a->ptr[0] = item;
}
else {
ary_modify(mrb, a);
if (a->aux.capa < a->len + 1)
ary_expand_capa(mrb, a, a->len + 1);
memmove(a->ptr + 1, a->ptr, sizeof(mrb_value)*a->len);
a->ptr[0] = item;
}
a->len++;
mrb_write_barrier(mrb, (struct RBasic*)a);
return self;
@@ -519,12 +527,19 @@ mrb_ary_unshift_m(mrb_state *mrb, mrb_value self)
mrb_value *vals;
int len;
ary_modify(mrb, a);
mrb_get_args(mrb, "*", &vals, &len);
if (len == 0) return self;
if (a->aux.capa < a->len + len)
ary_expand_capa(mrb, a, a->len + len);
memmove(a->ptr + len, a->ptr, sizeof(mrb_value)*a->len);
if ((a->flags & MRB_ARY_SHARED)
&& a->aux.shared->refcnt == 1 /* shared only referenced from this array */
&& a->ptr - a->aux.shared->ptr >= len) /* there's room for unshifted item */ {
a->ptr -= len;
}
else {
ary_modify(mrb, a);
if (len == 0) return self;
if (a->aux.capa < a->len + len)
ary_expand_capa(mrb, a, a->len + len);
memmove(a->ptr + len, a->ptr, sizeof(mrb_value)*a->len);
}
memcpy(a->ptr, vals, sizeof(mrb_value)*len);
a->len += len;
mrb_write_barrier(mrb, (struct RBasic*)a);