Merge.

[irc/quakenet/newserv.git] / core / nsmalloc.h

diff --git a/core/nsmalloc.h b/core/nsmalloc.h
index 97da8f9ee82dbcdcf559bb12f07e97e701f71cc7..657a582804aea3cf3019b4b6baa0f16140aef55f 100644 (file)
--- a/core/nsmalloc.h
+++ b/core/nsmalloc.h
@@ -5,12 +5,12 @@
 
 #ifdef __NSMALLOC_C
 #define pool(x) #x
-#define beginpools() char *poolnames[MAXPOOL] =
+#define beginpools() char *nsmpoolnames[MAXPOOL] =
 #define endpools();
 #else
 #define pool(x) POOL_ ## x
-#define beginpools(x) enum
-#define endpools() nsmallocpools;
+#define beginpools(x) typedef enum nsmallocpools
+#define endpools() nsmallocpools; extern char *nsmpoolnames[MAXPOOL];
 
 #include <stdlib.h>
 
@@ -19,10 +19,27 @@ void nsfree(unsigned int poolid, void *ptr);
 void nsfreeall(unsigned int poolid);
 void nsexit(void);
 void *nsrealloc(unsigned int poolid, void *ptr, size_t size);
-int nspoolstats(unsigned int poolid, size_t *size, unsigned long *count, char **poolname, size_t *realsize);
+void nscheckfreeall(unsigned int poolid);
 
 #define MAXPOOL                100
 
+struct nsminfo {
+  struct nsminfo *next;
+  struct nsminfo *prev;
+
+  size_t size;
+  char data[];
+};
+
+struct nsmpool {
+  struct nsminfo first;
+
+  unsigned long count;
+  size_t size;
+};
+
+extern struct nsmpool nsmpools[MAXPOOL];
+
 #endif
 
 /* Pools here in the order they were created */
@@ -40,6 +57,9 @@ beginpools() {
   pool(LUA),
   pool(TROJANSCAN),
   pool(NTERFACER),
+  pool(SQLITE),
+  pool(PQSQL),
+  pool(PATRICIA),
 } endpools()
 
 #undef pool