summaryrefslogtreecommitdiffhomepage
path: root/src/gc.c
diff options
context:
space:
mode:
authorfleuria <[email protected]>2013-06-28 22:58:19 +0800
committerfleuria <[email protected]>2013-06-28 23:15:31 +0800
commit68f31e94f564c48d8677acc8acf3ba46deebf94f (patch)
tree7635064038d718076a1d89574565768bb753afc5 /src/gc.c
parentb44309b4b208a7649a4e3bfb02b2ae353a3c83fc (diff)
downloadmruby-68f31e94f564c48d8677acc8acf3ba46deebf94f.tar.gz
mruby-68f31e94f564c48d8677acc8acf3ba46deebf94f.zip
refactor mrb_realloc()
remove the redundant codes with mrb_malloc_simple()
Diffstat (limited to 'src/gc.c')
-rw-r--r--src/gc.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/gc.c b/src/gc.c
index 7eee61dc1..6fc400e32 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -148,18 +148,28 @@ gettimeofday_time(void)
#define GC_STEP_SIZE 1024
+
void*
-mrb_realloc(mrb_state *mrb, void *p, size_t len)
+mrb_realloc_simple(mrb_state *mrb, void *p, size_t len)
{
void *p2;
p2 = (mrb->allocf)(mrb, p, len, mrb->ud);
-
if (!p2 && len > 0 && mrb->heaps) {
mrb_garbage_collect(mrb);
p2 = (mrb->allocf)(mrb, p, len, mrb->ud);
}
+ return p2;
+}
+
+
+void*
+mrb_realloc(mrb_state *mrb, void *p, size_t len)
+{
+ void *p2;
+
+ p2 = mrb_realloc_simple(mrb, p, len);
if (!p2 && len) {
if (mrb->out_of_memory) {
/* mrb_panic(mrb); */
@@ -185,14 +195,7 @@ mrb_malloc(mrb_state *mrb, size_t len)
void*
mrb_malloc_simple(mrb_state *mrb, size_t len)
{
- void *p2;
-
- p2 = (mrb->allocf)(mrb, 0, len, mrb->ud);
- if (!p2 && len > 0 && mrb->heaps) {
- mrb_garbage_collect(mrb);
- p2 = (mrb->allocf)(mrb, 0, len, mrb->ud);
- }
- return p2;
+ return mrb_realloc_simple(mrb, 0, len);
}
void*