X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsl_malloc.c;h=3feb7739030a64c2bac5337239b56836c20ff89b;hb=01f698bce979660270207ce052f3bdbbd79365a5;hp=07ac96247e0306879d17379a7ccdbcf2a563f772;hpb=d58f4ff849698987df2434113d80249131a58465;p=openldap

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 07ac96247e..3feb773903 100644
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2010 The OpenLDAP Foundation.
+ * Copyright 2003-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,6 +21,22 @@
 
 #include "slap.h"
 
+#ifdef USE_VALGRIND
+/* Get debugging help from Valgrind */
+#include <valgrind/memcheck.h>
+#define	VGMEMP_MARK(m,s)	VALGRIND_MAKE_MEM_NOACCESS(m,s)
+#define VGMEMP_CREATE(h,r,z)	VALGRIND_CREATE_MEMPOOL(h,r,z)
+#define VGMEMP_TRIM(h,a,s)	VALGRIND_MEMPOOL_TRIM(h,a,s)
+#define VGMEMP_ALLOC(h,a,s)	VALGRIND_MEMPOOL_ALLOC(h,a,s)
+#define VGMEMP_CHANGE(h,a,b,s)	VALGRIND_MEMPOOL_CHANGE(h,a,b,s)
+#else
+#define	VGMEMP_MARK(m,s)
+#define VGMEMP_CREATE(h,r,z)
+#define VGMEMP_TRIM(h,a,s)
+#define VGMEMP_ALLOC(h,a,s)
+#define VGMEMP_CHANGE(h,a,b,s)
+#endif
+
 /*
  * This allocator returns temporary memory from a slab in a given memory
  * context, aligned on a 2-int boundary.  It cannot be used for data
@@ -98,7 +114,7 @@ static void print_slheap(int level, void *ctx);
 #ifdef NO_THREADS
 static struct slab_heap *slheap;
 # define SET_MEMCTX(thrctx, memctx, sfree)	((void) (slheap = (memctx)))
-# define GET_MEMCTX(thrctx, memctxp)		(*(memctxp) = slheap))
+# define GET_MEMCTX(thrctx, memctxp)		(*(memctxp) = slheap)
 #else
 # define memctx_key ((void *) slap_sl_mem_init)
 # define SET_MEMCTX(thrctx, memctx, kfree) \
@@ -195,14 +211,18 @@ slap_sl_mem_create(
 		sh = ch_malloc(sizeof(struct slab_heap));
 		base = ch_malloc(size);
 		SET_MEMCTX(thrctx, sh, slap_sl_mem_destroy);
+		VGMEMP_MARK(base, size);
+		VGMEMP_CREATE(sh, 0, 0);
 	} else {
 		slap_sl_mem_destroy(NULL, sh);
 		base = sh->sh_base;
 		if (size > (ber_len_t) ((char *) sh->sh_end - base)) {
 			newptr = ch_realloc(base, size);
 			if ( newptr == NULL ) return NULL;
+			VGMEMP_CHANGE(sh, base, newptr, size);
 			base = newptr;
 		}
+		VGMEMP_TRIM(sh, base, 0);
 	}
 	sh->sh_base = base;
 	sh->sh_end = base + size;
@@ -298,6 +318,7 @@ slap_sl_malloc(
 		if (size < (ber_len_t) ((char *) sh->sh_end - (char *) sh->sh_last)) {
 			newptr = sh->sh_last;
 			sh->sh_last = (char *) sh->sh_last + size;
+			VGMEMP_ALLOC(sh, newptr, size);
 			*newptr++ = size;
 			return( (void *)newptr );
 		}
@@ -363,7 +384,7 @@ slap_sl_malloc(
 	}
 
 	Debug(LDAP_DEBUG_TRACE,
-		"slap_sl_malloc of %lu bytes falling back to ch_malloc\n",
+		"sl_malloc %lu: ch_malloc\n",
 		(unsigned long) size, 0, 0);
 	return ch_malloc(size);
 }
@@ -491,12 +512,18 @@ slap_sl_free(void *ptr, void *ctx)
 			/* Mark it free: tail = size, head of next block |= 1 */
 			nextp[-1] = size;
 			nextp[0] |= 1;
+			/* We can't tell Valgrind about it yet, because we
+			 * still need read/write access to this block for
+			 * when we eventually get to reclaim it.
+			 */
 		} else {
 			/* Reclaim freed block(s) off tail */
 			while (*p & 1) {
 				p = (ber_len_t *) ((char *) p - p[-1]);
 			}
 			sh->sh_last = p;
+			VGMEMP_TRIM(sh, sh->sh_base,
+				(char *) sh->sh_last - (char *) sh->sh_base);
 		}
 
 	} else {