upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-01 20:49:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6437 cleanup (noop change): Simplify slap_sl_free() code reclaiming space

Browse source
This commit is contained in:
Hallvard Furuseth 2010-01-02 18:42:33 +00:00
parent d8d00ec45c
commit 4c36193a5c
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
servers/slapd/sl_malloc.c
View file

@ -427,23 +427,21 @@ slap_sl_free(void *ptr, void *ctx)
if (!sh || ptr < sh->sh_base || ptr >= sh->sh_end) {
ber_memfree_x(ptr, NULL);
} else if (sh->sh_stack) {
tmpp = (ber_len_t *)((char *)ptr + p[-1]);
size = p[-1];
p = (ber_len_t *) ((char *) ptr + size);
/* mark it free */
tmpp[-1] |= 1;
p[-1] = size |= 1;
/* reclaim free space off tail */
while ( tmpp == sh->sh_last ) {
if ( tmpp[-1] & 1 ) {
size = tmpp[-1] ^ 1;
ptr = (char *)tmpp - size;
p = (ber_len_t *)ptr;
p--;
sh->sh_last = p;
tmpp = sh->sh_last;
} else {
break;
}
if (sh->sh_last == p) {
do {
p = (ber_len_t *) ((char *) p - size + 1) - 1;
size = p[-1];
} while (size & 1);
sh->sh_last = p;
}
} else {
int size_shift, order_size;
struct slab_object *so;