upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 17:49:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6437, move structs slab_object and slab_heap from slap.h to sl_malloc.c

Browse source
This commit is contained in:
Hallvard Furuseth 2010-01-05 23:14:14 +00:00
parent 1af33a46c9
commit 705bd5bf40
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
servers/slapd/sl_malloc.c
View file

@ -62,6 +62,25 @@ enum { No_sl_malloc = 1 };
enum { No_sl_malloc = 0 };
#endif
#define SLAP_SLAB_SOBLOCK 64
struct slab_object {
void *so_ptr;
int so_blockhead;
LDAP_LIST_ENTRY(slab_object) so_link;
};
struct slab_heap {
void *sh_base;
void *sh_last;
void *sh_end;
int sh_stack;
int sh_maxorder;
unsigned char **sh_map;
LDAP_LIST_HEAD(sh_freelist, slab_object) *sh_free;
LDAP_LIST_HEAD(sh_so, slab_object) sh_sopool;
};
enum {
Align = sizeof(ber_len_t) > 2*sizeof(int)
? sizeof(ber_len_t) : 2*sizeof(int),

20
servers/slapd/slap.h
View file

@ -3016,7 +3016,6 @@ typedef int (*SLAP_ENTRY_INFO_FN) LDAP_P(( void *arg, Entry *e ));
#define SLAP_SLAB_SIZE (1024*1024)
#define SLAP_SLAB_STACK 1
#define SLAP_SLAB_SOBLOCK 64
#define SLAP_ZONE_ALLOC 1
#undef SLAP_ZONE_ALLOC
@ -3246,25 +3245,6 @@ struct ComponentSyntaxInfo {
#endif /* LDAP_COMP_MATCH */
/* slab heap data structures */
struct slab_object {
void *so_ptr;
int so_blockhead;
LDAP_LIST_ENTRY(slab_object) so_link;
};
struct slab_heap {
void *sh_base;
void *sh_last;
void *sh_end;
int sh_stack;
int sh_maxorder;
unsigned char **sh_map;
LDAP_LIST_HEAD( sh_freelist, slab_object ) *sh_free;
LDAP_LIST_HEAD( sh_so, slab_object ) sh_sopool;
};
#ifdef SLAP_ZONE_ALLOC
#define SLAP_ZONE_SIZE 0x80000 /* 512KB */
#define SLAP_ZONE_SHIFT 19