--- deliantra/server/common/utils.C 2007/09/09 06:56:10 1.66
+++ deliantra/server/common/utils.C 2008/01/22 15:53:01 1.69
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/*
@@ -39,7 +39,7 @@
#include
refcnt_base::refcnt_t refcnt_dummy;
-
+size_t slice_alloc;
rand_gen rndm;
void
@@ -474,6 +474,7 @@
#ifdef PREFER_MALLOC
void *ptr = malloc (n);
#else
+ slice_alloc += n;
void *ptr = g_slice_alloc (n);
#endif
@@ -495,6 +496,46 @@
return ptr;
}
+/******************************************************************************/
+
+#ifdef DEBUG_SALLOC
+
+#define MAGIC 0xa1b2c35543deadL
+
+void *g_slice_alloc (unsigned long size)
+{
+ unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
+ *p++ = size ^ MAGIC;
+ //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
+ return (void *)p;
+}
+
+void *g_slice_alloc0 (unsigned long size)
+{
+ return memset (g_slice_alloc (size), 0, size);
+}
+
+void g_slice_free1 (unsigned long size, void *ptr)
+{
+ if (expect_true (ptr))
+ {
+ //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
+ unsigned long *p = (unsigned long *)ptr;
+ unsigned long s = *--p ^ MAGIC;
+
+ if ((*p ^ MAGIC) != size)
+ LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
+
+ *p = MAGIC;
+
+ (g_slice_free1)(s + sizeof (unsigned long), p);
+ }
+}
+
+#endif
+
+/******************************************************************************/
+
void assign (char *dst, const char *src, int maxlen)
{
if (!src)