/* 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-2004 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"
void *h_end;
};
-static void
+void
sl_mem_destroy(
void *key,
void *data
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,
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;
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,
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 );
}
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 );
}
/* If reallocing the last block, we can grow it */
} else if ( (char *)ptr + p[-1] == sh->h_last ) {
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 */
}
}
-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;