Cleanup code so it builds with C++ again

[ircu2.10.12-pk.git] / include / ircd_alloc.h

diff --git a/include/ircd_alloc.h b/include/ircd_alloc.h
index 63d916fcb770d5c60dbd855ee6e4a3f0a8542ee4..2bfa0186b80dff29bc93702a2b2231f55aad71c7 100644 (file)
--- a/include/ircd_alloc.h
+++ b/include/ircd_alloc.h
@@ -30,35 +30,66 @@
 typedef void (*OutOfMemoryHandler)(void);
 extern void set_nomem_handler(OutOfMemoryHandler handler);
 
-#if !defined(MDEBUG)
-/* 
- * RELEASE: allocation functions
+/* The mappings for the My* functions... */
+#define MyMalloc(size) \
+  DoMalloc(size, "malloc", __FILE__, __LINE__)
+
+#define MyCalloc(nelem, size) \
+  DoMallocZero(size * nelem, "calloc", __FILE__, __LINE__)
+
+#define MyFree(p) \
+  if (p) \
+    DoFree(p, __FILE__, __LINE__)
+
+/* No realloc because it is not currently used, and it is not really the
+ * nicest function to be using anyway(i.e. its evil if you want it
+ * go ahead and write it).
  */
+
+
+/* First version: fast non-debugging macros... */
+#ifndef MDEBUG
 #ifndef INCLUDED_stdlib_h
-#include <stdlib.h>       /* free */
+#include <stdlib.h> /* free */
 #define INCLUDED_stdlib_h
 #endif
 
-#define MyFree(x) do { free((x)); (x) = 0; } while(0)
-
-extern void* MyMalloc(size_t size);
-extern void* MyCalloc(size_t nelem, size_t size);
-extern void* MyRealloc(void* p, size_t size);
+extern OutOfMemoryHandler noMemHandler;
 
-#else /* defined(MDEBUG) */
+#define DoFree(x, file, line) do { free((x)); (x) = 0; } while(0)
+extern void* DoMalloc(size_t len, const char*, const char*, int);
+extern void* DoMallocZero(size_t len, const char*, const char*, int);
+#if 0
+extern void *malloc_tmp;
 /*
- * DEBUG: allocation functions
- */
-#ifndef INCLUDED_fda_h
-#include "fda.h"
+  Bleah, this is silly, the function call overhead for doing
+  the RightThing(tm) well worth the cost of avoiding this
+  non-reentrant mess of this macro, and accompanying global.
+*/
+#define DoMalloc(size, type, file, line) \
+  (\
+     (malloc_tmp = malloc(size), \
+     (malloc_tmp == NULL) ? (*noMemHandler)() : 0), \
+  malloc_tmp)
+
+#define DoMallocZero(size, type, file, line) \
+  (\
+    (DoMalloc(size, type, file, line), \
+    memset(malloc_tmp, 0, size)), \
+  malloc_tmp)
 #endif
 
-#define MyMalloc(s)     fda_malloc((s), __FILE__, __LINE__)
-#define MyCalloc(n, s)  fda_calloc((n), (s), __FILE__, __LINE__)
-#define MyFree(p)       fda_free((p))
-#define MyRealloc(p, s) fda_realloc((p), (s), __FILE__, __LINE__)
+/* Second version: slower debugging versions... */
+#else /* defined(MDEBUG) */
+#include <sys/types.h>
+#include "memdebug.h"
 
+#define DoMalloc(size, type, file, line) \
+  dbg_malloc(size, type, file, line)
+#define DoMallocZero(size, type, file, line) \
+  dbg_malloc_zero(size, type, file, line)
+#define DoFree(p, file, line) \
+  dbg_free(p, file, line)
 #endif /* defined(MDEBUG) */
 
 #endif /* INCLUDED_ircd_alloc_h */
-