Move SLAB_SIZE def to slap.h

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index da5b9ec43ebf247e1faaaccfd45ffe4a2fc1c10a..9ee80e6d86c2a8183239daa30e690ebd3600ac56 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -976,12 +976,11 @@ connection_operation( void *ctx, void *arg_v )
        /* We can use Thread-Local storage for most mallocs. We can
         * also use TL for ber parsing, but not on Add or Modify.
         */
-#define        SLAB_SIZE       1048576
 #if 0
        memsiz = ber_len( op->o_ber ) * 64;
-       if ( SLAB_SIZE > memsiz ) memsiz = SLAB_SIZE;
+       if ( SLMALLOC_SLAB_SIZE > memsiz ) memsiz = SLMALLOC_SLAB_SIZE;
 #endif
-       memsiz = SLAB_SIZE;
+       memsiz = SLMALLOC_SLAB_SIZE;
 
        memctx = sl_mem_create( memsiz, ctx );
        op->o_tmpmemctx = memctx;

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 17aaa4861a305802a47b0f3535ad75eff36df65b..ac4f84c1101fd0f5e12455ff4ab61cb876134e7a 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2292,6 +2292,8 @@ typedef int (SLAP_CTRL_PARSE_FN) LDAP_P((
        SlapReply *rs,
        LDAPControl *ctrl ));
 
+#define SLMALLOC_SLAB_SIZE     1048576
+
 LDAP_END_DECL
 
 #include "proto-slap.h"

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index c2a757a4e467d2702c4740adda569dae87e257e4..0b89dfb6ac65f383fe1149a4a770b416803f4642 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -817,8 +817,7 @@ do_syncrepl(
        conn.c_peer_name = slap_empty_bv;
 
        /* set memory context */
-#define SLAB_SIZE 1048576
-       op.o_tmpmemctx = sl_mem_create( SLAB_SIZE, ctx );
+       op.o_tmpmemctx = sl_mem_create( SLMALLOC_SLAB_SIZE, ctx );
        op.o_tmpmfuncs = &sl_mfuncs;
 
        op.o_dn = si->si_updatedn;