summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-09-10 21:54:42 +0900
committerYukihiro Matsumoto <[email protected]>2012-09-10 21:54:42 +0900
commit1a816db854ef952acbb35777d5bb04fd3b6e7c05 (patch)
tree2f1affb0989bc564a81e851b7b143a20d59edc20
parent22f22cc2e2726c1c236d08167c03dad72fad08bf (diff)
downloadmruby-1a816db854ef952acbb35777d5bb04fd3b6e7c05.tar.gz
mruby-1a816db854ef952acbb35777d5bb04fd3b6e7c05.zip
eagerly reduce allocated array memory
-rw-r--r--src/array.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/array.c b/src/array.c
index f1f034aa2..fa43bdd35 100644
--- a/src/array.c
+++ b/src/array.c
@@ -37,9 +37,6 @@ ary_new_capa(mrb_state *mrb, int capa)
mrb_raise(mrb, E_ARGUMENT_ERROR, "ary size too big");
}
#endif
- if (capa < ARY_DEFAULT_LEN) {
- capa = ARY_DEFAULT_LEN;
- }
blen = capa * sizeof(mrb_value) ;
if (blen < capa) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "ary size too big");
@@ -859,9 +856,11 @@ mrb_ary_clear(mrb_state *mrb, mrb_value self)
{
struct RArray *a = mrb_ary_ptr(self);
- a->len = 0;
ary_modify(mrb, a);
- ary_shrink_capa(mrb, a);
+ a->len = 0;
+ a->aux.capa = 0;
+ mrb_free(mrb, a->ptr);
+ a->ptr = 0;
return self;
}