X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsl_malloc.c;h=b19507ab2adb324d0bcf5a7154bfe85706d22961;hb=dbaf7c5c2503b2770c9075e30a9a63b6ff577d6f;hp=00136e84b1fcb3112f54dc13b589d5723a82910a;hpb=dc0eacd40b625258355eea866d62188e5aa7ce3b;p=openldap

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 00136e84b1..b19507ab2a 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-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,9 @@
 #include "slap.h"
 
 static struct slab_object * slap_replenish_sopool(struct slab_heap* sh);
+#ifdef SLAPD_UNUSED
 static void print_slheap(int level, void *ctx);
+#endif
 
 void
 slap_sl_mem_destroy(
@@ -95,18 +97,20 @@ slap_sl_mem_create(
 	void *ctx
 )
 {
-	struct slab_heap *sh = NULL;
+	struct slab_heap *sh;
 	ber_len_t size_shift;
 	int pad = 2*sizeof(int)-1, pad_shift;
 	int order = -1, order_start = -1, order_end = -1;
-	int i, k;
+	int i;
 	struct slab_object *so;
 
 #ifdef NO_THREADS
 	sh = slheap;
 #else
+	void *sh_tmp = NULL;
 	ldap_pvt_thread_pool_getkey(
-		ctx, (void *)slap_sl_mem_init, (void **)&sh, NULL );
+		ctx, (void *)slap_sl_mem_init, &sh_tmp, NULL );
+	sh = sh_tmp;
 #endif
 
 	/* round up to doubleword boundary */
@@ -124,7 +128,11 @@ slap_sl_mem_create(
 				(void *)sh, slap_sl_mem_destroy);
 #endif
 		} else if ( size > (char *)sh->sh_end - (char *)sh->sh_base ) {
-			sh->sh_base = ch_realloc(sh->sh_base, size);
+			void	*newptr;
+
+			newptr = ch_realloc( sh->sh_base, size );
+			if ( newptr == NULL ) return NULL;
+			sh->sh_base = newptr;
 		}
 		sh->sh_last = sh->sh_base;
 		sh->sh_end = (char *) sh->sh_base + size;
@@ -181,7 +189,11 @@ slap_sl_mem_create(
 			}
 
 			if (size > (char *)sh->sh_end - (char *)sh->sh_base) {
-				sh->sh_base = realloc(sh->sh_base, size);
+				void	*newptr;
+
+				newptr = realloc( sh->sh_base, size );
+				if ( newptr == NULL ) return NULL;
+				sh->sh_base = newptr;
 			}
 		}
 		sh->sh_end = (char *)sh->sh_base + size;
@@ -245,9 +257,13 @@ slap_sl_malloc(
 	int pad = 2*sizeof(int)-1, pad_shift;
 	int order = -1, order_start = -1;
 	struct slab_object *so_new, *so_left, *so_right;
-	ber_len_t *ptr, *new;
+	ber_len_t *ptr, *newptr;
 	unsigned long diff;
-	int i, j, k;
+	int i, j;
+
+#ifdef SLAP_NO_SL_MALLOC
+	return ber_malloc_x( size, NULL );
+#endif
 
 	/* ber_set_option calls us like this */
 	if (!ctx) return ber_memalloc_x(size, NULL);
@@ -263,10 +279,10 @@ slap_sl_malloc(
 				(long)size, 0, 0);
 			return ch_malloc(size);
 		}
-		new = sh->sh_last;
-		*new++ = size - sizeof(ber_len_t);
+		newptr = sh->sh_last;
+		*newptr++ = size - sizeof(ber_len_t);
 		sh->sh_last = (char *) sh->sh_last + size;
-		return( (void *)new );
+		return( (void *)newptr );
 	} else {
 		size_shift = size - 1;
 		do {
@@ -300,7 +316,7 @@ slap_sl_malloc(
 				}
 				so_right = LDAP_LIST_FIRST(&sh->sh_sopool);
 				LDAP_LIST_REMOVE(so_right, so_link);
-				so_right->so_ptr = so_left->so_ptr + (1 << j);
+				so_right->so_ptr = (void *)((char *)so_left->so_ptr + (1 << j));
 				if (j == order + 1) {
 					ptr = so_left->so_ptr;
 					diff = (unsigned long)((char*)ptr -
@@ -326,40 +342,43 @@ slap_sl_malloc(
 			return (void*)ch_malloc(size);
 		}
 	}
+
+	/* FIXME: missing return; guessing... */
+	return NULL;
 }
 
 void *
 slap_sl_calloc( ber_len_t n, ber_len_t size, void *ctx )
 {
-	void *new;
+	void *newptr;
 
-	new = slap_sl_malloc( n*size, ctx );
-	if ( new ) {
-		memset( new, 0, n*size );
+	newptr = slap_sl_malloc( n*size, ctx );
+	if ( newptr ) {
+		memset( newptr, 0, n*size );
 	}
-	return new;
+	return newptr;
 }
 
 void *
 slap_sl_realloc(void *ptr, ber_len_t size, void *ctx)
 {
 	struct slab_heap *sh = ctx;
-	int size_shift;
-	int pad = 2*sizeof(int)-1, pad_shift;
-	int order_start = -1, order = -1;
-	struct slab_object *so;
-	ber_len_t *p = (ber_len_t *)ptr, *new;
-	unsigned long diff;
+	int pad = 2*sizeof(int) -1;
+	ber_len_t *p = (ber_len_t *)ptr, *newptr;
 
 	if (ptr == NULL)
 		return slap_sl_malloc(size, ctx);
 
+#ifdef SLAP_NO_SL_MALLOC
+	return ber_memrealloc_x( ptr, size, NULL );
+#endif
+
 	/* Not our memory? */
 	if (!sh || ptr < sh->sh_base || ptr >= sh->sh_end) {
 		/* duplicate of realloc behavior, oh well */
-		new = ber_memrealloc_x(ptr, size, NULL);
-		if (new) {
-			return new;
+		newptr = ber_memrealloc_x(ptr, size, NULL);
+		if (newptr) {
+			return newptr;
 		}
 		Debug(LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
 				(long) size, 0, 0);
@@ -373,33 +392,38 @@ slap_sl_realloc(void *ptr, ber_len_t size, void *ctx)
 	}
 
 	if (sh->sh_stack) {
+		/* round up to doubleword boundary */
+		size += pad + sizeof( ber_len_t );
+		size &= ~pad;
+
 		/* Never shrink blocks */
 		if (size <= p[-1]) {
-			new = p;
+			newptr = p;
 	
 		/* If reallocing the last block, we can grow it */
 		} else if ((char *)ptr + p[-1] == sh->sh_last &&
 			(char *)ptr + size < (char *)sh->sh_end ) {
-			new = p;
+			newptr = p;
 			sh->sh_last = (char *)sh->sh_last + size - p[-1];
 			p[-1] = size;
 	
 		/* Nowhere to grow, need to alloc and copy */
 		} else {
-			new = slap_sl_malloc(size, ctx);
-			AC_MEMCPY(new, ptr, p[-1]);
+			newptr = slap_sl_malloc(size, ctx);
+			AC_MEMCPY(newptr, ptr, p[-1]);
 		}
-		return new;
+		return newptr;
 	} else {
-		void *newptr;
-		newptr = slap_sl_malloc(size, ctx);
+		void *newptr2;
+
+		newptr2 = slap_sl_malloc(size, ctx);
 		if (size < p[-1]) {
-			AC_MEMCPY(newptr, ptr, size);
+			AC_MEMCPY(newptr2, ptr, size);
 		} else {
-			AC_MEMCPY(newptr, ptr, p[-1]);
+			AC_MEMCPY(newptr2, ptr, p[-1]);
 		}
 		slap_sl_free(ptr, ctx);
-		return newptr;
+		return newptr2;
 	}
 }
 
@@ -413,7 +437,15 @@ slap_sl_free(void *ptr, void *ctx)
 	int order_start = -1, order = -1;
 	struct slab_object *so;
 	unsigned long diff;
-	int i, k, inserted = 0;
+	int i, inserted = 0;
+
+	if (!ptr)
+		return;
+
+#ifdef SLAP_NO_SL_MALLOC
+	ber_memfree_x( ptr, NULL );
+	return;
+#endif
 
 	if (!sh || ptr < sh->sh_base || ptr >= sh->sh_end) {
 		ber_memfree_x(ptr, NULL);
@@ -472,7 +504,7 @@ slap_sl_free(void *ptr, void *ctx)
 						Debug(LDAP_DEBUG_TRACE, "slap_sl_free: "
 							"free object not found while bit is clear.\n",
 							0, 0, 0);
-						assert(so);
+						assert(so != NULL);
 
 					}
 				} else {
@@ -495,7 +527,7 @@ slap_sl_free(void *ptr, void *ctx)
 					while (so) {
 						if ((char*)so->so_ptr == (char*)tmpp) {
 							LDAP_LIST_REMOVE(so, so_link);
-						} else if ((char*)tmpp == so->so_ptr + order_size) {
+						} else if ((char*)tmpp == (char *)so->so_ptr + order_size) {
 							LDAP_LIST_REMOVE(so, so_link);
 							tmpp = so->so_ptr;
 							break;
@@ -522,7 +554,7 @@ slap_sl_free(void *ptr, void *ctx)
 						Debug(LDAP_DEBUG_TRACE, "slap_sl_free: "
 							"free object not found while bit is clear.\n",
 							0, 0, 0 );
-						assert( so );
+						assert(so != NULL);
 
 					}
 				} else {
@@ -546,16 +578,20 @@ slap_sl_free(void *ptr, void *ctx)
 void *
 slap_sl_context( void *ptr )
 {
-	struct slab_heap *sh = NULL;
-	void *ctx;
+	struct slab_heap *sh;
+	void *ctx, *sh_tmp;
+
+	if ( slapMode & SLAP_TOOL_MODE ) return NULL;
 
 #ifdef NO_THREADS
 	sh = slheap;
 #else
 	ctx = ldap_pvt_thread_pool_context();
 
-	ldap_pvt_thread_pool_getkey(ctx, (void *)slap_sl_mem_init,
-			(void **)&sh, NULL);
+	sh_tmp = NULL;
+	ldap_pvt_thread_pool_getkey(
+		ctx, (void *)slap_sl_mem_init, &sh_tmp, NULL);
+	sh = sh_tmp;
 #endif
 
 	if (sh && ptr >= sh->sh_base && ptr <= sh->sh_end) {
@@ -589,6 +625,7 @@ slap_replenish_sopool(
     return so_block;
 }
 
+#ifdef SLAPD_UNUSED
 static void
 print_slheap(int level, void *ctx)
 {
@@ -624,8 +661,9 @@ print_slheap(int level, void *ctx)
 		Debug(level, "free list:\n", 0, 0, 0);
 		so = LDAP_LIST_FIRST(&sh->sh_free[i-order_start]);
 		while (so) {
-			Debug(level, "%x\n",so->so_ptr, 0, 0);
+			Debug(level, "%lx\n", (unsigned long) so->so_ptr, 0, 0);
 			so = LDAP_LIST_NEXT(so, so_link);
 		}
 	}
 }
+#endif