Lua 4.04.0

1 files changed, 94 insertions, 84 deletions

diff --git a/src/lmem.c b/src/lmem.c
index 5f840b00..03a804c9 100644
--- a/src/lmem.c
+++ b/src/lmem.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.c,v 1.17 1999/05/24 17:51:05 roberto Exp $
+** $Id: lmem.c,v 1.39 2000/10/30 16:29:59 roberto Exp $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
@@ -7,134 +7,144 @@
 
 #include <stdlib.h>
 
-#include "lmem.h"
-#include "lstate.h"
 #include "lua.h"
 
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
 
-/*
-** real ANSI systems do not need these tests;
-** but some systems (Sun OS) are not that ANSI...
-*/
-#ifdef OLD_ANSI
-#define realloc(b,s)	((b) == NULL ? malloc(s) : (realloc)(b, s))
-#define free(b)		if (b) (free)(b)
-#endif
-
-
-#define MINSIZE	8	/* minimum size for "growing" vectors */
-
-
-
-
-static unsigned long power2 (unsigned long n) {
-  unsigned long p = MINSIZE;
-  while (p<=n) p<<=1;
-  return p;
-}
-
-
-void *luaM_growaux (void *block, unsigned long nelems, int inc, int size,
-                       char *errormsg, unsigned long limit) {
-  unsigned long newn = nelems+inc;
-  if (newn >= limit) lua_error(errormsg);
-  if ((newn ^ nelems) <= nelems ||  /* still the same power of 2 limit? */
-       (nelems > 0 && newn < MINSIZE))  /* or block already is MINSIZE? */
-      return block;  /* do not need to reallocate */
-  else  /* it crossed a power of 2 boundary; grow to next power */
-    return luaM_realloc(block, power2(newn)*size);
-}
 
 
-#ifndef DEBUG
 
+#ifdef LUA_DEBUG
 /*
-** generic allocation routine.
+** {======================================================================
+** Controlled version for realloc.
+** =======================================================================
 */
-void *luaM_realloc (void *block, unsigned long size) {
-  size_t s = (size_t)size;
-  if (s != size)
-    lua_error("memory allocation error: block too big");
-  if (size == 0) {
-    free(block);  /* block may be NULL, that is OK for free */
-    return NULL;
-  }
-  block = realloc(block, s);
-  if (block == NULL)
-    lua_error(memEM);
-  return block;
-}
 
 
+#include <assert.h>
+#include <limits.h>
+#include <string.h>
 
-#else
-/* DEBUG */
+#define realloc(b, s)	debug_realloc(b, s)
+#define malloc(b)	debug_realloc(NULL, b)
+#define free(b)		debug_realloc(b, 0)
 
-#include <string.h>
 
+/* ensures maximum alignment for HEADER */
+#define HEADER	(sizeof(union L_Umaxalign))
 
-#define HEADER	(sizeof(double))
 #define MARKSIZE	16
-
-#define MARK    55
+#define MARK		0x55  /* 01010101 (a nice pattern) */
 
 
 #define blocksize(b)	((unsigned long *)((char *)(b) - HEADER))
 
-unsigned long numblocks = 0;
-unsigned long totalmem = 0;
+unsigned long memdebug_numblocks = 0;
+unsigned long memdebug_total = 0;
+unsigned long memdebug_maxmem = 0;
+unsigned long memdebug_memlimit = LONG_MAX;
 
 
 static void *checkblock (void *block) {
-  if (block == NULL)
-    return NULL;
-  else {
-    unsigned long *b = blocksize(block);
-    unsigned long size = *b;
-    int i;
-    for (i=0;i<MARKSIZE;i++)
-      LUA_ASSERT(*(((char *)b)+HEADER+size+i) == MARK+i, "corrupted block");
-    numblocks--;
-    totalmem -= size;
-    return b;
-  }
+  unsigned long *b = blocksize(block);
+  unsigned long size = *b;
+  int i;
+  for (i=0;i<MARKSIZE;i++)
+    assert(*(((char *)b)+HEADER+size+i) == MARK+i);  /* corrupted block? */
+  memdebug_numblocks--;
+  memdebug_total -= size;
+  return b;
 }
 
 
 static void freeblock (void *block) {
-  if (block)
-    memset(block, -1, *blocksize(block));  /* erase block */
-  free(checkblock(block));
+  if (block) {
+    size_t size = *blocksize(block);
+    block = checkblock(block);
+    memset(block, -1, size+HEADER+MARKSIZE);  /* erase block */
+    (free)(block);  /* free original block */
+  }
 }
 
 
-void *luaM_realloc (void *block, unsigned long size) {
-  unsigned long realsize = HEADER+size+MARKSIZE;
-  if (realsize != (size_t)realsize)
-    lua_error("memory allocation error: block too big");
+static void *debug_realloc (void *block, size_t size) {
   if (size == 0) {
     freeblock(block);
     return NULL;
   }
+  else if (memdebug_total+size > memdebug_memlimit)
+    return NULL;  /* to test memory allocation errors */
   else {
-    char *newblock = malloc(realsize);
+    size_t realsize = HEADER+size+MARKSIZE;
+    char *newblock = (char *)(malloc)(realsize);  /* alloc a new block */
     int i;
+    if (realsize < size) return NULL;  /* overflow! */
+    if (newblock == NULL) return NULL;
     if (block) {
-      unsigned long oldsize = *blocksize(block);
+      size_t oldsize = *blocksize(block);
       if (oldsize > size) oldsize = size;
       memcpy(newblock+HEADER, block, oldsize);
       freeblock(block);  /* erase (and check) old copy */
     }
-    if (newblock == NULL)
-      lua_error(memEM);
-    totalmem += size;
-    numblocks++;
+    memdebug_total += size;
+    if (memdebug_total > memdebug_maxmem) memdebug_maxmem = memdebug_total;
+    memdebug_numblocks++;
     *(unsigned long *)newblock = size;
     for (i=0;i<MARKSIZE;i++)
-      *(newblock+HEADER+size+i) = MARK+i;
+      *(newblock+HEADER+size+i) = (char)(MARK+i);
     return newblock+HEADER;
   }
 }
 
 
+/* }====================================================================== */
+#endif
+
+
+
+/*
+** Real ISO (ANSI) systems do not need these tests;
+** but some systems (Sun OS) are not that ISO...
+*/
+#ifdef OLD_ANSI
+#define realloc(b,s)	((b) == NULL ? malloc(s) : (realloc)(b, s))
+#define free(b)		if (b) (free)(b)
 #endif
+
+
+void *luaM_growaux (lua_State *L, void *block, size_t nelems,
+               int inc, size_t size, const char *errormsg, size_t limit) {
+  size_t newn = nelems+inc;
+  if (nelems >= limit-inc) lua_error(L, errormsg);
+  if ((newn ^ nelems) <= nelems ||  /* still the same power-of-2 limit? */
+       (nelems > 0 && newn < MINPOWER2))  /* or block already is MINPOWER2? */
+      return block;  /* do not need to reallocate */
+  else  /* it crossed a power-of-2 boundary; grow to next power */
+    return luaM_realloc(L, block, luaO_power2(newn)*size);
+}
+
+
+/*
+** generic allocation routine.
+*/
+void *luaM_realloc (lua_State *L, void *block, lint32 size) {
+  if (size == 0) {
+    free(block);  /* block may be NULL; that is OK for free */
+    return NULL;
+  }
+  else if (size >= MAX_SIZET)
+    lua_error(L, "memory allocation error: block too big");
+  block = realloc(block, size);
+  if (block == NULL) {
+    if (L)
+      luaD_breakrun(L, LUA_ERRMEM);  /* break run without error message */
+    else return NULL;  /* error before creating state! */
+  }
+  return block;
+}
+
+