ITS#2895 store a copy in the entry cache

[openldap] / servers / slapd / sl_malloc.c

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 8e037662d7421c4e6ea7e9941646d483703cb1de..15c5b4da395dc52e68366ffcde996425f48f78ff 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 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
@@ -26,8 +35,8 @@ sl_mem_destroy(
 {
        struct slab_heap *sh = data;
 
-       ch_free(sh->h_base);
-       ch_free(sh);
+       ber_memfree_x(sh->h_base, NULL);
+       ber_memfree_x(sh, NULL);
 }
 
 BER_MEMALLOC_FN sl_malloc;
@@ -54,7 +63,7 @@ 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 );
+       ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, (void **)&sh, NULL );
 
        /* round up to doubleword boundary */
        size += pad;
@@ -63,15 +72,25 @@ 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 ) {
+               ldap_pvt_thread_pool_setkey( ctx, (void *)sl_mem_init, (void *)sh, sl_mem_destroy );
+       } 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
+)
+{
+       /* separate from context */
+       ldap_pvt_thread_pool_setkey( ctx, (void *)sl_mem_init, NULL, NULL );
+}
+
 void *
 sl_malloc(
     ber_len_t  size,
@@ -89,7 +108,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 +120,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 );
 }
@@ -130,18 +149,42 @@ sl_realloc( void *ptr, ber_len_t size, void *ctx )
 
        /* Not our memory? */
        if ( !sh || ptr < sh->h_base || ptr >= sh->h_end ) {
-               return ch_realloc( ptr, size );
+               /* duplicate of ch_realloc behavior, oh well */
+               new = ber_memrealloc_x( ptr, size, NULL );
+               if (new ) {
+                       return new;
+               }
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                          "ch_realloc: reallocation of %lu bytes failed\n", (long)size, 0,0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
+                       (long) size, 0, 0 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
-       if ( size == 0 ) return NULL;
+       if ( size == 0 ) {
+               sl_free( ptr, ctx );
+               return NULL;
+       }
 
        /* round up to doubleword boundary */
        size += pad + sizeof( ber_len_t );
        size &= ~pad;
 
-       /* Never shrink blocks, always alloc if growth needed */
+       /* Never shrink blocks */
        if (size <= p[-1]) {
                new = p;
+       
+       /* If reallocing the last block, we can grow it */
+       } else if ( (char *)ptr + p[-1] == sh->h_last ) {
+               new = p;
+               sh->h_last = (char *) sh->h_last + size - p[-1];
+               p[-1] = size;
+       
+       /* Nowhere to grow, need to alloc and copy */
        } else {
                new = sl_malloc( size, ctx );
                AC_MEMCPY( new, ptr, p[-1] );
@@ -153,29 +196,28 @@ void
 sl_free( void *ptr, void *ctx )
 {
        struct slab_heap *sh = ctx;
+       ber_len_t *p = (ber_len_t *)ptr;
 
        if ( !sh || ptr < sh->h_base || ptr >= sh->h_end ) {
-               ch_free( ptr );
-       }
-}
-
-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;
+               ber_memfree_x( ptr, NULL );
+       } else if ( (char *)ptr + p[-1] == sh->h_last ) {
+               p--;
+               sh->h_last = p;
        }
 }
 
 void *
-sl_mark( void *ctx )
+sl_context( void *ptr )
 {
-       struct slab_heap *sh = ctx;
-       void *ret = NULL;
+       struct slab_heap *sh = NULL;
+       void *ctx;
 
-       if (sh) ret = sh->h_last;
+       ctx = ldap_pvt_thread_pool_context();
 
-       return ret;
+       ldap_pvt_thread_pool_getkey( ctx, (void *)sl_mem_init, (void **)&sh, NULL );
+
+       if ( sh && ptr >= sh->h_base && ptr <= sh->h_end ) {
+               return sh;
+       }
+       return NULL;
 }