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

add mrb_malloc_simple() that returns NULL on error

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-06-25 15:38:28 +09:00
parent d90c5c8e84
commit 3ceeb0be95
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+4 -3
View File
@@ -239,9 +239,10 @@ mrb_sym mrb_intern(mrb_state *mrb,const char *cstr)
return mrb_intern_cstr(mrb, cstr);
}
void *mrb_malloc(mrb_state*, size_t);
void *mrb_calloc(mrb_state*, size_t, size_t);
void *mrb_realloc(mrb_state*, void*, size_t);
void *mrb_malloc(mrb_state*, size_t); /* raise RuntimeError if no mem */
void *mrb_calloc(mrb_state*, size_t, size_t); /* ditto */
void *mrb_realloc(mrb_state*, void*, size_t); /* ditto */
void *mrb_malloc_simple(mrb_state*, size_t); /* return NULL if no memory available */
struct RBasic *mrb_obj_alloc(mrb_state*, enum mrb_vtype, struct RClass*);
void mrb_free(mrb_state*, void*);
src/gc.c
+13
View File
@@ -182,6 +182,19 @@ mrb_malloc(mrb_state *mrb, size_t len)
return mrb_realloc(mrb, 0, 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;
}
void*
mrb_calloc(mrb_state *mrb, size_t nelem, size_t len)
{