diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2009-12-17 13:46:44 -0200 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2009-12-17 13:46:44 -0200 |
commit | 0bbdddc86b1353fec36ae886b4142986f3c4713f (patch) | |
tree | 9eb933c8123911f9477e8b8b55344035c8077c01 /lmem.c | |
parent | b3b8dfaaea2dba7e7b4b898a5f767a80f36319f1 (diff) | |
download | lua-0bbdddc86b1353fec36ae886b4142986f3c4713f.tar.gz lua-0bbdddc86b1353fec36ae886b4142986f3c4713f.tar.bz2 lua-0bbdddc86b1353fec36ae886b4142986f3c4713f.zip |
allocator function receives the tag of object being allocated in 'osize'
when 'ptr' is NULL.
Diffstat (limited to 'lmem.c')
-rw-r--r-- | lmem.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lmem.c,v 1.72 2006/09/14 12:59:06 roberto Exp roberto $ | 2 | ** $Id: lmem.c,v 1.73 2006/09/14 18:42:28 roberto Exp roberto $ |
3 | ** Interface to Memory Manager | 3 | ** Interface to Memory Manager |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -26,12 +26,11 @@ | |||
26 | ** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize); | 26 | ** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize); |
27 | ** (`osize' is the old size, `nsize' is the new size) | 27 | ** (`osize' is the old size, `nsize' is the new size) |
28 | ** | 28 | ** |
29 | ** Lua ensures that (ptr == NULL) iff (osize == 0). | 29 | ** * frealloc(ud, NULL, x, s) creates a new block of size `s' (no |
30 | ** | 30 | ** matter 'x'). |
31 | ** * frealloc(ud, NULL, 0, x) creates a new block of size `x' | ||
32 | ** | 31 | ** |
33 | ** * frealloc(ud, p, x, 0) frees the block `p' | 32 | ** * frealloc(ud, p, x, 0) frees the block `p' |
34 | ** (in this specific case, frealloc must return NULL). | 33 | ** (in this specific case, frealloc must return NULL); |
35 | ** particularly, frealloc(ud, NULL, 0, 0) does nothing | 34 | ** particularly, frealloc(ud, NULL, 0, 0) does nothing |
36 | ** (which is equivalent to free(NULL) in ANSI C) | 35 | ** (which is equivalent to free(NULL) in ANSI C) |
37 | ** | 36 | ** |
@@ -77,14 +76,15 @@ void *luaM_toobig (lua_State *L) { | |||
77 | void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) { | 76 | void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) { |
78 | void *newblock; | 77 | void *newblock; |
79 | global_State *g = G(L); | 78 | global_State *g = G(L); |
80 | lua_assert((osize == 0) == (block == NULL)); | 79 | size_t realosize = (block) ? osize : 0; |
80 | lua_assert((realosize == 0) == (block == NULL)); | ||
81 | #if defined(HARDMEMTESTS) | 81 | #if defined(HARDMEMTESTS) |
82 | if (nsize > osize && g->GCthreshold != MAX_LUMEM) | 82 | if (nsize > realosize && g->GCthreshold != MAX_LUMEM) |
83 | luaC_fullgc(L, 1); /* force a GC whenever possible */ | 83 | luaC_fullgc(L, 1); /* force a GC whenever possible */ |
84 | #endif | 84 | #endif |
85 | newblock = (*g->frealloc)(g->ud, block, osize, nsize); | 85 | newblock = (*g->frealloc)(g->ud, block, osize, nsize); |
86 | if (newblock == NULL && nsize > 0) { | 86 | if (newblock == NULL && nsize > 0) { |
87 | lua_assert(nsize > osize); /* cannot fail when shrinking a block */ | 87 | lua_assert(nsize > realosize); /* cannot fail when shrinking a block */ |
88 | if (g->GCthreshold != MAX_LUMEM) { | 88 | if (g->GCthreshold != MAX_LUMEM) { |
89 | luaC_fullgc(L, 1); /* try to free some memory... */ | 89 | luaC_fullgc(L, 1); /* try to free some memory... */ |
90 | newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ | 90 | newblock = (*g->frealloc)(g->ud, block, osize, nsize); /* try again */ |
@@ -93,7 +93,7 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) { | |||
93 | luaD_throw(L, LUA_ERRMEM); | 93 | luaD_throw(L, LUA_ERRMEM); |
94 | } | 94 | } |
95 | lua_assert((nsize == 0) == (newblock == NULL)); | 95 | lua_assert((nsize == 0) == (newblock == NULL)); |
96 | g->totalbytes = (g->totalbytes - osize) + nsize; | 96 | g->totalbytes = (g->totalbytes - realosize) + nsize; |
97 | return newblock; | 97 | return newblock; |
98 | } | 98 | } |
99 | 99 | ||