Import ITS#4158 fixes from HEAD

[openldap] / servers / slapd / sl_malloc.c

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 070cb8d43f234e78eb73b5916f538d42426c731f..c34dff60f62e39f81de66c0c795f019056eb5869 100644 (file)
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -1,8 +1,17 @@
 /* sl_malloc.c - malloc routines using a per-thread slab */
 /* $OpenLDAP$ */
-/*
- * Copyright 2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2003-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -18,7 +27,7 @@ struct slab_heap {
        void *h_end;
 };
 
-static void
+void
 sl_mem_destroy(
        void *key,
        void *data
@@ -45,6 +54,10 @@ sl_mem_init()
        ber_set_option( NULL, LBER_OPT_MEMORY_FNS, &sl_mfuncs );
 }
 
+#ifdef NO_THREADS
+static struct slab_heap *slheap;
+#endif
+
 void *
 sl_mem_create(
        ber_len_t size,
@@ -54,7 +67,11 @@ sl_mem_create(
        struct slab_heap *sh = NULL;
        int pad = 2*sizeof(int)-1;
 
-       ldap_pvt_thread_pool_getkey( ctx, sl_mem_init, (void **)&sh, NULL );
+#ifdef NO_THREADS
+       sh = slheap;
+#else
+       ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, (void **)&sh, NULL );
+#endif
 
        /* round up to doubleword boundary */
        size += pad;
@@ -63,15 +80,33 @@ sl_mem_create(
        if (!sh) {
                sh = ch_malloc( sizeof(struct slab_heap) );
                sh->h_base = ch_malloc( size );
-               ldap_pvt_thread_pool_setkey( ctx, sl_mem_init, (void *)sh, sl_mem_destroy );
-       } else if ( size > sh->h_end - sh->h_base ) {
+#ifdef NO_THREADS
+               slheap = sh;
+#else
+               ldap_pvt_thread_pool_setkey( ctx, (void *)sl_mem_init, (void *)sh, sl_mem_destroy );
+#endif
+       } else if ( size > (char *) sh->h_end - (char *) sh->h_base ) {
                sh->h_base = ch_realloc( sh->h_base, size );
        }
        sh->h_last = sh->h_base;
-       sh->h_end = sh->h_base + size;
+       sh->h_end = (char *) sh->h_base + size;
        return sh;
 }
 
+void
+sl_mem_detach(
+       void *ctx,
+       void *memctx
+)
+{
+#ifdef NO_THREADS
+       slheap = NULL;
+#else
+       /* separate from context */
+       ldap_pvt_thread_pool_setkey( ctx, (void *)sl_mem_init, NULL, NULL );
+#endif
+}
+
 void *
 sl_malloc(
     ber_len_t  size,
@@ -89,7 +124,7 @@ sl_malloc(
        size += pad + sizeof( ber_len_t );
        size &= ~pad;
 
-       if (sh->h_last + size >= sh->h_end ) {
+       if ((char *) sh->h_last + size >= (char *) sh->h_end ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, INFO, 
                           "sl_malloc of %lu bytes failed, using ch_malloc\n", (long)size, 0,0 );
@@ -101,7 +136,7 @@ sl_malloc(
        }
        new = sh->h_last;
        *new++ = size - sizeof(ber_len_t);
-       sh->h_last += size;
+       sh->h_last = (char *) sh->h_last + size;
        
        return( (void *)new );
 }
@@ -160,9 +195,10 @@ sl_realloc( void *ptr, ber_len_t size, void *ctx )
                new = p;
        
        /* If reallocing the last block, we can grow it */
-       } else if ( (char *)ptr + p[-1] == sh->h_last ) {
+       } else if ( (char *)ptr + p[-1] == sh->h_last &&
+               (char *)ptr + size < (char *)sh->h_end ) {
                new = p;
-               sh->h_last += size - p[-1];
+               sh->h_last = (char *) sh->h_last + size - p[-1];
                p[-1] = size;
        
        /* Nowhere to grow, need to alloc and copy */
@@ -187,36 +223,19 @@ sl_free( void *ptr, void *ctx )
        }
 }
 
-void
-sl_release( void *ptr, void *ctx )
-{
-       struct slab_heap *sh = ctx;
-
-       if ( sh && ptr >= sh->h_base && ptr <= sh->h_end ) {
-               sh->h_last = ptr;
-       }
-}
-
-void *
-sl_mark( void *ctx )
-{
-       struct slab_heap *sh = ctx;
-       void *ret = NULL;
-
-       if (sh) ret = sh->h_last;
-
-       return ret;
-}
-
 void *
 sl_context( void *ptr )
 {
        struct slab_heap *sh = NULL;
        void *ctx;
 
+#ifdef NO_THREADS
+       sh = slheap;
+#else
        ctx = ldap_pvt_thread_pool_context();
 
-       ldap_pvt_thread_pool_getkey( ctx, sl_mem_init, (void **)&sh, NULL );
+       ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, (void **)&sh, NULL );
+#endif
 
        if ( sh && ptr >= sh->h_base && ptr <= sh->h_end ) {
                return sh;