/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#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(
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;
- struct slab_object *so, *so_block;
+ 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 */
LDAP_LIST_INIT(&sh->sh_sopool);
if (LDAP_LIST_EMPTY(&sh->sh_sopool)) {
- so_block = (struct slab_object *)ch_malloc(
- SLAP_SLAB_SOBLOCK * sizeof( struct slab_object));
- so_block[0].so_blockhead = 1;
- LDAP_LIST_INSERT_HEAD(&sh->sh_sopool, &so_block[0], so_link);
- for (k = 1; k < SLAP_SLAB_SOBLOCK; k++) {
- so_block[k].so_blockhead = 0;
- LDAP_LIST_INSERT_HEAD(&sh->sh_sopool, &so_block[k], so_link);
- }
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = sh->sh_base;
- } else {
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = sh->sh_base;
+ slap_replenish_sopool(sh);
}
+ so = LDAP_LIST_FIRST(&sh->sh_sopool);
+ LDAP_LIST_REMOVE(so, so_link);
+ so->so_ptr = sh->sh_base;
LDAP_LIST_INSERT_HEAD(&sh->sh_free[order-1], so, so_link);
sh->sh_map = (unsigned char **)
- ch_malloc(order * sizeof(unsigned long *));
+ ch_malloc(order * sizeof(unsigned char *));
for (i = 0; i < order; i++) {
- sh->sh_map[i] = (unsigned char *)
- ch_malloc(size >> (1 << (order_start + i + 3)));
- memset(sh->sh_map[i], 0, size >> (1 << (order_start + i + 3)));
+ int shiftamt = order_start + 1 + i;
+ int nummaps = size >> shiftamt;
+ assert(nummaps);
+ nummaps >>= 3;
+ if (!nummaps) nummaps = 1;
+ sh->sh_map[i] = (unsigned char *) ch_malloc(nummaps);
+ memset(sh->sh_map[i], 0, nummaps);
}
sh->sh_stack = stack;
return sh;
)
{
struct slab_heap *sh = ctx;
- int size_shift;
+ ber_len_t size_shift;
int pad = 2*sizeof(int)-1, pad_shift;
int order = -1, order_start = -1;
- struct slab_object *so_new, *so_left, *so_right, *so_block;
+ struct slab_object *so_new, *so_left, *so_right;
ber_len_t *ptr, *new;
unsigned long diff;
- int i, j, k;
+ int i, j;
/* ber_set_option calls us like this */
if (!ctx) return ber_memalloc_x(size, NULL);
- Debug(LDAP_DEBUG_ANY, "slap_sl_malloc (%d)\n", size, 0, 0);
-
/* round up to doubleword boundary */
- size += pad + sizeof(ber_len_t);
+ size += sizeof(ber_len_t) + pad;
size &= ~pad;
if (sh->sh_stack) {
so_left = LDAP_LIST_FIRST(&sh->sh_free[j-order_start]);
LDAP_LIST_REMOVE(so_left, so_link);
if (LDAP_LIST_EMPTY(&sh->sh_sopool)) {
- so_block = (struct slab_object *)ch_malloc(
- SLAP_SLAB_SOBLOCK * sizeof(struct slab_object));
- so_block[0].so_blockhead = 1;
- LDAP_LIST_INSERT_HEAD(
- &sh->sh_sopool, &so_block[0], so_link);
- for (k = 1; k < SLAP_SLAB_SOBLOCK; k++) {
- so_block[k].so_blockhead = 0;
- LDAP_LIST_INSERT_HEAD(
- &sh->sh_sopool, &so_block[k], so_link);
- }
- 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);
- } else {
- 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);
+ slap_replenish_sopool(sh);
}
+ so_right = LDAP_LIST_FIRST(&sh->sh_sopool);
+ LDAP_LIST_REMOVE(so_right, so_link);
+ 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 -
return (void*)ch_malloc(size);
}
}
+
+ /* FIXME: missing return; guessing... */
+ return NULL;
}
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;
+ int pad = 2*sizeof(int) -1;
ber_len_t *p = (ber_len_t *)ptr, *new;
- unsigned long diff;
if (ptr == NULL)
return slap_sl_malloc(size, 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;
/* If reallocing the last block, we can grow it */
- } else if ((char *)ptr + p[-1] == sh->sh_last) {
+ } else if ((char *)ptr + p[-1] == sh->sh_last &&
+ (char *)ptr + size < (char *)sh->sh_end ) {
new = p;
sh->sh_last = (char *)sh->sh_last + size - p[-1];
p[-1] = size;
int pad = 2*sizeof(int)-1, pad_shift;
ber_len_t *p = (ber_len_t *)ptr, *tmpp;
int order_start = -1, order = -1;
- struct slab_object *so, *so_block;
+ struct slab_object *so;
unsigned long diff;
- int i, k, inserted = 0;
-
- Debug( LDAP_DEBUG_ANY, "==> slap_sl_free \n", 0, 0, 0);
+ int i, inserted = 0;
if (!sh || ptr < sh->sh_base || ptr >= sh->sh_end) {
ber_memfree_x(ptr, NULL);
continue;
} else {
if (LDAP_LIST_EMPTY(&sh->sh_sopool)) {
- so_block = (struct slab_object *)ch_malloc(
- SLAP_SLAB_SOBLOCK *
- sizeof( struct slab_object));
- so_block[0].so_blockhead = 1;
- LDAP_LIST_INSERT_HEAD( &sh->sh_sopool,
- &so_block[0], so_link );
- for ( k = 1; k < SLAP_SLAB_SOBLOCK; k++ ) {
- so_block[k].so_blockhead = 0;
- LDAP_LIST_INSERT_HEAD( &sh->sh_sopool,
- &so_block[k], so_link );
- }
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = tmpp;
- } else {
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = tmpp;
+ slap_replenish_sopool(sh);
}
+ so = LDAP_LIST_FIRST(&sh->sh_sopool);
+ LDAP_LIST_REMOVE(so, so_link);
+ so->so_ptr = tmpp;
LDAP_LIST_INSERT_HEAD(&sh->sh_free[i-order_start],
so, so_link);
break;
- Debug(LDAP_DEBUG_ANY, "slap_sl_free: "
+ 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 {
if (!inserted) {
if (LDAP_LIST_EMPTY(&sh->sh_sopool)) {
- so_block = (struct slab_object *)ch_malloc(
- SLAP_SLAB_SOBLOCK *
- sizeof(struct slab_object));
- so_block[0].so_blockhead = 1;
- LDAP_LIST_INSERT_HEAD(&sh->sh_sopool,
- &so_block[0], so_link);
- for (k = 1; k < SLAP_SLAB_SOBLOCK; k++) {
- so_block[k].so_blockhead = 0;
- LDAP_LIST_INSERT_HEAD(&sh->sh_sopool,
- &so_block[k], so_link);
- }
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = tmpp;
- } else {
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = tmpp;
+ slap_replenish_sopool(sh);
}
+ so = LDAP_LIST_FIRST(&sh->sh_sopool);
+ LDAP_LIST_REMOVE(so, so_link);
+ so->so_ptr = tmpp;
LDAP_LIST_INSERT_HEAD(&sh->sh_free[i-order_start],
so, so_link);
}
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;
}
} else {
if (LDAP_LIST_EMPTY(&sh->sh_sopool)) {
- so_block = (struct slab_object *)ch_malloc(
- SLAP_SLAB_SOBLOCK *
- sizeof(struct slab_object));
- so_block[0].so_blockhead = 1;
- LDAP_LIST_INSERT_HEAD(&sh->sh_sopool,
- &so_block[0], so_link);
- for (k = 1; k < SLAP_SLAB_SOBLOCK; k++) {
- so_block[k].so_blockhead = 0;
- LDAP_LIST_INSERT_HEAD(&sh->sh_sopool,
- &so_block[k], so_link );
- }
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = tmpp;
- } else {
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = tmpp;
+ slap_replenish_sopool(sh);
}
+ so = LDAP_LIST_FIRST(&sh->sh_sopool);
+ LDAP_LIST_REMOVE(so, so_link);
+ so->so_ptr = tmpp;
LDAP_LIST_INSERT_HEAD(&sh->sh_free[i-order_start],
so, so_link);
break;
- Debug(LDAP_DEBUG_ANY, "slap_sl_free: "
+ 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 {
if ( !inserted ) {
if (LDAP_LIST_EMPTY(&sh->sh_sopool)) {
- so_block = (struct slab_object *)ch_malloc(
- SLAP_SLAB_SOBLOCK *
- sizeof(struct slab_object));
- so_block[0].so_blockhead = 1;
- LDAP_LIST_INSERT_HEAD(&sh->sh_sopool,
- &so_block[0], so_link );
- for (k = 1; k < SLAP_SLAB_SOBLOCK; k++) {
- so_block[k].so_blockhead = 0;
- LDAP_LIST_INSERT_HEAD(&sh->sh_sopool,
- &so_block[k], so_link );
- }
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = tmpp;
- } else {
- so = LDAP_LIST_FIRST(&sh->sh_sopool);
- LDAP_LIST_REMOVE(so, so_link);
- so->so_ptr = tmpp;
+ slap_replenish_sopool(sh);
}
+ so = LDAP_LIST_FIRST(&sh->sh_sopool);
+ LDAP_LIST_REMOVE(so, so_link);
+ so->so_ptr = tmpp;
LDAP_LIST_INSERT_HEAD(&sh->sh_free[i-order_start],
so, so_link);
}
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) {
return NULL;
}
+static struct slab_object *
+slap_replenish_sopool(
+ struct slab_heap* sh
+)
+{
+ struct slab_object *so_block;
+ int i;
+
+ so_block = (struct slab_object *)ch_malloc(
+ SLAP_SLAB_SOBLOCK * sizeof(struct slab_object));
+
+ if ( so_block == NULL ) {
+ return NULL;
+ }
+
+ so_block[0].so_blockhead = 1;
+ LDAP_LIST_INSERT_HEAD(&sh->sh_sopool, &so_block[0], so_link);
+ for (i = 1; i < SLAP_SLAB_SOBLOCK; i++) {
+ so_block[i].so_blockhead = 0;
+ LDAP_LIST_INSERT_HEAD(&sh->sh_sopool, &so_block[i], so_link );
+ }
+
+ return so_block;
+}
+
+#ifdef SLAPD_UNUSED
static void
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
projects / openldap / blobdiff