Commit e4529c06 authored by Yukihiro Matsumoto's avatar Yukihiro Matsumoto

make arrays to share bodies

parent 3be1c889
...@@ -11,10 +11,19 @@ ...@@ -11,10 +11,19 @@
extern "C" { extern "C" {
#endif #endif
struct mrb_shared_array {
int refcnt;
mrb_value *buf;
int len;
};
struct RArray { struct RArray {
MRUBY_OBJECT_HEADER; MRUBY_OBJECT_HEADER;
int len; int len;
int capa; union {
int capa;
struct mrb_shared_array *shared;
} aux;
mrb_value *buf; mrb_value *buf;
}; };
...@@ -24,7 +33,9 @@ struct RArray { ...@@ -24,7 +33,9 @@ struct RArray {
#define RARRAY_LEN(a) (RARRAY(a)->len) #define RARRAY_LEN(a) (RARRAY(a)->len)
#define RARRAY_PTR(a) (RARRAY(a)->buf) #define RARRAY_PTR(a) (RARRAY(a)->buf)
#define MRB_ARY_SHARED 256
void mrb_ary_decref(mrb_state*, struct mrb_shared_array*);
mrb_value mrb_ary_new_capa(mrb_state*, int); mrb_value mrb_ary_new_capa(mrb_state*, int);
mrb_value mrb_ary_new(mrb_state *mrb); mrb_value mrb_ary_new(mrb_state *mrb);
mrb_value mrb_ary_new_elts(mrb_state *mrb, int n, const mrb_value *elts); mrb_value mrb_ary_new_elts(mrb_state *mrb, int n, const mrb_value *elts);
...@@ -43,7 +54,6 @@ mrb_value mrb_ary_unshift(mrb_state *mrb, mrb_value self, mrb_value item); ...@@ -43,7 +54,6 @@ mrb_value mrb_ary_unshift(mrb_state *mrb, mrb_value self, mrb_value item);
mrb_value mrb_ary_new4(mrb_state *mrb, int n, const mrb_value *elts); mrb_value mrb_ary_new4(mrb_state *mrb, int n, const mrb_value *elts);
mrb_value mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr); mrb_value mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr);
mrb_value mrb_ary_entry(mrb_value ary, int offset); mrb_value mrb_ary_entry(mrb_value ary, int offset);
mrb_value mrb_ary_tmp_new(mrb_state *mrb, int capa);
mrb_value mrb_ary_sort(mrb_state *mrb, mrb_value ary); mrb_value mrb_ary_sort(mrb_state *mrb, mrb_value ary);
mrb_value mrb_ary_shift(mrb_state *mrb, mrb_value self); mrb_value mrb_ary_shift(mrb_state *mrb, mrb_value self);
......
This diff is collapsed.
...@@ -457,7 +457,10 @@ obj_free(mrb_state *mrb, struct RBasic *obj) ...@@ -457,7 +457,10 @@ obj_free(mrb_state *mrb, struct RBasic *obj)
break; break;
case MRB_TT_ARRAY: case MRB_TT_ARRAY:
mrb_free(mrb, ((struct RArray*)obj)->buf); if (obj->flags & MRB_ARY_SHARED)
mrb_ary_decref(mrb, ((struct RArray*)obj)->aux.shared);
else
mrb_free(mrb, ((struct RArray*)obj)->buf);
break; break;
case MRB_TT_HASH: case MRB_TT_HASH:
......
...@@ -450,7 +450,7 @@ mrb_struct_new(mrb_state *mrb, struct RClass *klass, ...) ...@@ -450,7 +450,7 @@ mrb_struct_new(mrb_state *mrb, struct RClass *klass, ...)
size = mrb_long2int(num_members(mrb, klass)); size = mrb_long2int(num_members(mrb, klass));
if (size > numberof(tmpargs)) { if (size > numberof(tmpargs)) {
tmpargs[0] = mrb_ary_tmp_new(mrb, size); tmpargs[0] = mrb_ary_new_capa(mrb, size);
mem = RARRAY_PTR(tmpargs[0]); mem = RARRAY_PTR(tmpargs[0]);
} }
va_start(args, klass); va_start(args, klass);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment