nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"realloc" usually implements "malloc"; handle non ANSI case separately.

Browse Source
This commit is contained in:
Roberto Ierusalimschy
1999-01-22 15:28:00 -02:00
parent eec31aaca5
commit 758a381644
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lmem.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lmem.c,v 1.6 1998/06/19 16:14:09 roberto Exp roberto $ ** $Id: lmem.c,v 1.7 1998/06/29 22:03:06 roberto Exp $
** Interface to Memory Manager ** Interface to Memory Manager
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -12,10 +12,19 @@
#include "lua.h" #include "lua.h"
/*
** real ANSI systems do not need some of these tests,
** since realloc(NULL, s)==malloc(s).
** But some systems (Sun OS) are not that ANSI...
*/
#ifdef OLD_ANSI
#define realloc(b,s) ((b) == NULL ? malloc(s) : (realloc)(b, s))
#endif
int luaM_growaux (void **block, unsigned long nelems, int size, int luaM_growaux (void **block, unsigned long nelems, int size,
char *errormsg, unsigned long limit) char *errormsg, unsigned long limit) {
{
if (nelems >= limit) if (nelems >= limit)
lua_error(errormsg); lua_error(errormsg);
nelems = (nelems == 0) ? 32 : nelems*2; nelems = (nelems == 0) ? 32 : nelems*2;
@@ -31,22 +40,16 @@ int luaM_growaux (void **block, unsigned long nelems, int size,
/* /*
** generic allocation routine. ** generic allocation routine.
** real ANSI systems do not need some of these tests,
** since realloc(NULL, s)==malloc(s) and realloc(b, 0)==free(b).
** But some systems (e.g. Sun OS) are not that ANSI...
*/ */
void *luaM_realloc (void *block, unsigned long size) void *luaM_realloc (void *block, unsigned long size) {
{
size_t s = (size_t)size; size_t s = (size_t)size;
if (s != size) if (s != size)
lua_error("Allocation Error: Block too big"); lua_error("Allocation Error: Block too big");
if (size == 0) { if (size == 0) {
if (block) { free(block); /* block may be NULL, that is OK for free */
free(block);
}
return NULL; return NULL;
} }
block = block ? realloc(block, s) : malloc(s); block = realloc(block, s);
if (block == NULL) if (block == NULL)
lua_error(memEM); lua_error(memEM);
return block; return block;
@@ -68,8 +71,7 @@ unsigned long numblocks = 0;
unsigned long totalmem = 0; unsigned long totalmem = 0;
static void *checkblock (void *block) static void *checkblock (void *block) {
{
unsigned long *b = (unsigned long *)((char *)block - HEADER); unsigned long *b = (unsigned long *)((char *)block - HEADER);
unsigned long size = *b; unsigned long size = *b;
LUA_ASSERT(*(((char *)b)+size+HEADER) == MARK, LUA_ASSERT(*(((char *)b)+size+HEADER) == MARK,
@@ -80,26 +82,22 @@ static void *checkblock (void *block)
} }
void *luaM_realloc (void *block, unsigned long size) void *luaM_realloc (void *block, unsigned long size) {
{
unsigned long realsize = HEADER+size+1; unsigned long realsize = HEADER+size+1;
if (realsize != (size_t)realsize) if (realsize != (size_t)realsize)
lua_error("Allocation Error: Block too big"); lua_error("Allocation Error: Block too big");
if (size == 0) { /* ANSI dosen't need this, but some machines... */ if (size == 0) {
if (block) { if (block) {
unsigned long *b = (unsigned long *)((char *)block - HEADER); unsigned long *b = (unsigned long *)((char *)block - HEADER);
memset(block, -1, *b); /* erase block */ memset(block, -1, *b); /* erase block */
block = checkblock(block); block = checkblock(block);
free(block);
} }
free(block);
return NULL; return NULL;
} }
if (block) { if (block)
block = checkblock(block); block = checkblock(block);
block = (unsigned long *)realloc(block, realsize); block = (unsigned long *)realloc(block, realsize);
}
else
block = (unsigned long *)malloc(realsize);
if (block == NULL) if (block == NULL)
lua_error(memEM); lua_error(memEM);
totalmem += size; totalmem += size;