summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-08-19 07:48:40 +0900
committerYukihiro Matsumoto <[email protected]>2012-08-19 07:48:40 +0900
commitb8fc484d2ea97e8eb6bc25744d3e192580e1504d (patch)
treebbe88d3c9a8a06c4789d0ad53e9463af4459a702 /src
parent9206dcb00d8484098cd2a89708eec3ac4b4a7441 (diff)
downloadmruby-b8fc484d2ea97e8eb6bc25744d3e192580e1504d.tar.gz
mruby-b8fc484d2ea97e8eb6bc25744d3e192580e1504d.zip
allocf should take ud; https://twitter.com/junjis0203/status/236949976461221889
Diffstat (limited to 'src')
-rw-r--r--src/gc.c6
-rw-r--r--src/state.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gc.c b/src/gc.c
index e0a923b89..3af163010 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -153,11 +153,11 @@ mrb_realloc(mrb_state *mrb, void *p, size_t len)
{
void *p2;
- p2 = (mrb->allocf)(mrb, p, len);
+ p2 = (mrb->allocf)(mrb, p, len, mrb->ud);
if (!p2 && len > 0 && mrb->heaps) {
mrb_garbage_collect(mrb);
- p2 = (mrb->allocf)(mrb, p, len);
+ p2 = (mrb->allocf)(mrb, p, len, mrb->ud);
}
return p2;
}
@@ -188,7 +188,7 @@ mrb_calloc(mrb_state *mrb, size_t nelem, size_t len)
void*
mrb_free(mrb_state *mrb, void *p)
{
- return (mrb->allocf)(mrb, p, 0);
+ return (mrb->allocf)(mrb, p, 0, mrb->ud);
}
#ifndef MRB_HEAP_PAGE_SIZE
diff --git a/src/state.c b/src/state.c
index 181cd00e0..41a851380 100644
--- a/src/state.c
+++ b/src/state.c
@@ -14,9 +14,9 @@ void mrb_init_core(mrb_state*);
void mrb_init_ext(mrb_state*);
mrb_state*
-mrb_open_allocf(mrb_allocf f)
+mrb_open_allocf(mrb_allocf f, void *ud)
{
- mrb_state *mrb = (mrb_state *)(f)(NULL, NULL, sizeof(mrb_state));
+ mrb_state *mrb = (mrb_state *)(f)(NULL, NULL, sizeof(mrb_state), ud);
if (mrb == NULL) return NULL;
memset(mrb, 0, sizeof(mrb_state));
@@ -30,7 +30,7 @@ mrb_open_allocf(mrb_allocf f)
}
static void*
-allocf(mrb_state *mrb, void *p, size_t size)
+allocf(mrb_state *mrb, void *p, size_t size, void *ud)
{
if (size == 0) {
free(p);
@@ -44,7 +44,7 @@ allocf(mrb_state *mrb, void *p, size_t size)
mrb_state*
mrb_open()
{
- mrb_state *mrb = mrb_open_allocf(allocf);
+ mrb_state *mrb = mrb_open_allocf(allocf, NULL);
return mrb;
}