X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-bdb%2Fidl.h;h=7bccd3e41fd18a0715628d8d82218bde85ac4e9c;hb=ee1cddf6fd730afcfd9aa60551daf2ee99ccbef0;hp=2eac4c6b5013f2e77aa3c10c24e9ec09d68dfb3d;hpb=d6730e5f50de71c509e25910942b1ce316ec7e96;p=openldap diff --git a/servers/slapd/back-bdb/idl.h b/servers/slapd/back-bdb/idl.h index 2eac4c6b50..7bccd3e41f 100644 --- a/servers/slapd/back-bdb/idl.h +++ b/servers/slapd/back-bdb/idl.h @@ -1,35 +1,29 @@ -/* back-bdb.h - ldap ldbm back-end header file */ +/* back-bdb.h - ldap bdb back-end header file */ /* $OpenLDAP$ */ /* - * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 2000-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #ifndef _BDB_IDL_H_ #define _BDB_IDL_H_ -#include - -#include "slap.h" - /* IDL sizes - likely should be even bigger * limiting factors: sizeof(ID), thread stack size */ -#define BDB_IDL_DB_SIZE (1<<16) /* 32K IDL on disk */ -#define BDB_IDL_UM_SIZE (1<<17) /* 64K IDL in memory */ +#define BDB_IDL_DB_SIZE (1<<16) /* 64K IDL on disk */ +#define BDB_IDL_UM_SIZE (1<<17) /* 128K IDL in memory */ #define BDB_IDL_UM_SIZEOF (BDB_IDL_UM_SIZE * sizeof(ID)) -#define BDB_IDL_DB_MAX (BDB_IDL_DB_SIZE-32) -/* #define BDB_IDL_DB_ALLOC (BDB_IDL_DB_SIZE * sizeof(ID)) */ +#define BDB_IDL_DB_MAX (BDB_IDL_DB_SIZE-1) -#define BDB_IDL_UM_MAX (BDB_IDL_UM_SIZE-32) -/* #define BDB_IDL_UM_ALLOC (BDB_IDL_UM_SIZE * sizeof(ID)) */ +#define BDB_IDL_UM_MAX (BDB_IDL_UM_SIZE-1) #define BDB_IDL_IS_RANGE(ids) ((ids)[0] == NOID) #define BDB_IDL_RANGE_SIZE (3) #define BDB_IDL_RANGE_SIZEOF (BDB_IDL_RANGE_SIZE * sizeof(ID)) -#define BDB_IDL_SIZEOF(ids) (BDB_IDL_IS_RANGE(ids) \ - ? BDB_IDL_RANGE_SIZE : ((ids)[0]+1) * sizeof(ID)) +#define BDB_IDL_SIZEOF(ids) ((BDB_IDL_IS_RANGE(ids) \ + ? BDB_IDL_RANGE_SIZE : ((ids)[0]+1)) * sizeof(ID)) #define BDB_IDL_RANGE_FIRST(ids) ((ids)[1]) #define BDB_IDL_RANGE_LAST(ids) ((ids)[2])