TRUSTS: use correct socket opt...

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

diff --git a/core/nsmalloc.c b/core/nsmalloc.c
index 0575c55c05f913f9ab21388876d6c2719d5b50d4..801d02daed506069c5f69790965b0c7afa740d47 100644 (file)
--- a/core/nsmalloc.c
+++ b/core/nsmalloc.c
@@ -2,19 +2,20 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include "nsmalloc.h"
 #define __NSMALLOC_C
 #undef __NSMALLOC_H
 #include "nsmalloc.h"
 
+#include "../lib/valgrind.h"
+#include "../lib/memcheck.h"
 #include "../core/hooks.h"
 #include "../core/error.h"
 
 struct nsmpool nsmpools[MAXPOOL];
 
-#ifndef USE_NSMALLOC_VALGRIND
-
 void *nsmalloc(unsigned int poolid, size_t size) {
   struct nsminfo *nsmp;
   
@@ -26,16 +27,24 @@ void *nsmalloc(unsigned int poolid, size_t size) {
 
   if (!nsmp)
     return NULL;
-  
+
+  VALGRIND_CREATE_MEMPOOL(nsmp, 0, 0);
+
   nsmp->size=size;
   nsmpools[poolid].size+=size;
   nsmpools[poolid].count++;
 
-  nsmp->next=nsmpools[poolid].first.next;
-  nsmp->prev=&nsmpools[poolid].first;
-  if (nsmpools[poolid].first.next)
-    nsmpools[poolid].first.next->prev=nsmp;
-  nsmpools[poolid].first.next=nsmp;
+  if (nsmpools[poolid].blocks) {
+    nsmpools[poolid].blocks->prev = nsmp;
+  }
+  nsmp->next=nsmpools[poolid].blocks;
+  nsmp->prev=NULL;
+  nsmpools[poolid].blocks=nsmp;
+
+  VALGRIND_MEMPOOL_ALLOC(nsmp, nsmp->data, nsmp->size);
+
+  nsmp->redzone = REDZONE_MAGIC;
+  VALGRIND_MAKE_MEM_NOACCESS(&nsmp->redzone, sizeof(nsmp->redzone));
 
   return (void *)nsmp->data;
 }
@@ -53,7 +62,6 @@ void *nscalloc(unsigned int poolid, size_t nmemb, size_t size) {
   return m;
 }
 
-/* we dump core on ptr == NULL */
 void nsfree(unsigned int poolid, void *ptr) {
   struct nsminfo *nsmp;
   
@@ -63,15 +71,26 @@ void nsfree(unsigned int poolid, void *ptr) {
   /* evil */
   nsmp=(struct nsminfo*)ptr - 1;
 
-  /* always set as we have a sentinel */
-  nsmp->prev->next=nsmp->next;
-  if (nsmp->next)
-    nsmp->next->prev=nsmp->prev;
+  VALGRIND_MAKE_MEM_DEFINED(&nsmp->redzone, sizeof(nsmp->redzone));
+  assert(nsmp->redzone == REDZONE_MAGIC);
+
+  if (nsmp->prev) {
+    nsmp->prev->next = nsmp->next;
+  } else
+    nsmpools[poolid].blocks = NULL;
+
+  if (nsmp->next) {
+    nsmp->next->prev = nsmp->prev;
+  }
 
   nsmpools[poolid].size-=nsmp->size;
   nsmpools[poolid].count--;
 
+  VALGRIND_MEMPOOL_FREE(nsmp, nsmp->data);
+
+  VALGRIND_DESTROY_MEMPOOL(nsmp);
   free(nsmp);
+
   return;
 }
 
@@ -92,6 +111,8 @@ void *nsrealloc(unsigned int poolid, void *ptr, size_t size) {
   /* evil */
   nsmp=(struct nsminfo *)ptr - 1;
 
+  VALGRIND_MAKE_MEM_DEFINED(nsmp, sizeof(struct nsminfo));
+
   if (size == nsmp->size)
     return (void *)nsmp->data;
 
@@ -99,14 +120,21 @@ void *nsrealloc(unsigned int poolid, void *ptr, size_t size) {
   if (!nsmpn)
     return NULL;
 
+  VALGRIND_MOVE_MEMPOOL(nsmp, nsmpn);
+
   nsmpools[poolid].size+=size-nsmpn->size;
   nsmpn->size=size;
 
-  /* always set as we have a sentinel */
-  nsmpn->prev->next=nsmpn;
+  if (nsmpn->prev) {
+    nsmpn->prev->next=nsmpn;
+  } else
+    nsmpools[poolid].blocks = nsmpn;
 
-  if (nsmpn->next)
+  if (nsmpn->next) {
     nsmpn->next->prev=nsmpn;
+  }
+
+  VALGRIND_MEMPOOL_CHANGE(nsmpn, nsmp->data, nsmpn->data, nsmpn->size);
 
   return (void *)nsmpn->data;
 }
@@ -117,12 +145,15 @@ void nsfreeall(unsigned int poolid) {
   if (poolid >= MAXPOOL)
     return;
  
-  for (nsmp=nsmpools[poolid].first.next;nsmp;nsmp=nnsmp) {
+  for (nsmp=nsmpools[poolid].blocks;nsmp;nsmp=nnsmp) {
     nnsmp=nsmp->next;
+    VALGRIND_MEMPOOL_FREE(nsmp, nsmp->data);
+
+    VALGRIND_DESTROY_MEMPOOL(nsmp);
     free(nsmp);
   }
   
-  nsmpools[poolid].first.next=NULL;
+  nsmpools[poolid].blocks=NULL;
   nsmpools[poolid].size=0;
   nsmpools[poolid].count=0;
 }
@@ -131,12 +162,16 @@ void nscheckfreeall(unsigned int poolid) {
   if (poolid >= MAXPOOL)
     return;
  
-  if (nsmpools[poolid].first.next) {
+  if (nsmpools[poolid].blocks) {
     Error("core",ERR_INFO,"nsmalloc: Blocks still allocated in pool #%d (%s): %zub, %lu items",poolid,nsmpoolnames[poolid]?nsmpoolnames[poolid]:"??",nsmpools[poolid].size,nsmpools[poolid].count);
     nsfreeall(poolid);
   }
 }
 
+void nsinit(void) {
+  memset(nsmpools, 0, sizeof(nsmpools));
+}
+
 void nsexit(void) {
   unsigned int i;
   
@@ -144,33 +179,3 @@ void nsexit(void) {
     nsfreeall(i);
 }
 
-#else
-
-void *nsmalloc(unsigned int poolid, size_t size) {
-  return malloc(size);
-}
-
-void *nscalloc(unsigned int poolid, size_t nmemb, size_t size) {
-  return calloc(nmemb, size);
-}
-
-void *nsrealloc(unsigned int poolid, void *ptr, size_t size) {
-  return realloc(ptr, size);
-}
-
-void nsfree(unsigned int poolid, void *ptr) {
-  if(ptr)
-    free(ptr);
-}
-
-void nsfreeall(unsigned int poolid) {
-}
-
-void nsexit(void) {
-}
-
-void nscheckfreeall(unsigned int poolid) {
-}
-
-#endif
-