Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-bdb / idl.h

diff --git a/servers/slapd/back-bdb/idl.h b/servers/slapd/back-bdb/idl.h
index 3ce8e19ed126bc7a552ef1dab858b26e6db887e5..44c8fa9259160424249d31ae447811869777de47 100644 (file)
--- a/servers/slapd/back-bdb/idl.h
+++ b/servers/slapd/back-bdb/idl.h
@@ -1,29 +1,42 @@
-/* back-bdb.h - ldap ldbm back-end header file */
+/* idl.h - ldap bdb back-end ID list header file */
 /* $OpenLDAP$ */
-/*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _BDB_IDL_H_
 #define _BDB_IDL_H_
 
-#include <portable.h>
-
-#include "slap.h"
+/* IDL sizes - likely should be even bigger
+ *   limiting factors: sizeof(ID), thread stack size
+ */
+#define        BDB_IDL_LOGN    16      /* DB_SIZE is 2^16, UM_SIZE is 2^17 */
+#define BDB_IDL_DB_SIZE                (1<<BDB_IDL_LOGN)
+#define BDB_IDL_UM_SIZE                (1<<(BDB_IDL_LOGN+1))
+#define BDB_IDL_UM_SIZEOF      (BDB_IDL_UM_SIZE * sizeof(ID))
 
-#define BDB_IDL_DB_SIZE                (1<<16) /* 64K IDL on disk */
-#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_SIZE           (1<<17) /* 128K IDL in memory */
-#define BDB_IDL_MAX                    (BDB_IDL_DB_SIZE-32)
-/* #define BDB_IDL_DB_ALLOC    (BDB_IDL_DB_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 * 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_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_RANGE_FIRST(ids)       ((ids)[1])
+#define BDB_IDL_RANGE_LAST(ids)                ((ids)[2])
 
 #define BDB_IDL_RANGE( ids, f, l ) \
        do { \
@@ -37,21 +50,25 @@
                (ids)[0] = 0; \
                (ids)[1] = 0; \
                (ids)[2] = 0; \
-       } while(0);
+       } while(0)
 
 #define BDB_IDL_IS_ZERO(ids) ( (ids)[0] == 0 )
 #define BDB_IDL_IS_ALL( range, ids ) ( (ids)[0] == NOID \
        && (ids)[1] <= (range)[1] && (range)[2] <= (ids)[2] )
 
-#define BDB_IDL_CPY( dst, src ) (memcpy( dst, src, BDB_IDL_SIZEOF( src ) ))
+#define BDB_IDL_CPY( dst, src ) (AC_MEMCPY( dst, src, BDB_IDL_SIZEOF( src ) ))
 
 #define BDB_IDL_ID( bdb, ids, id ) BDB_IDL_RANGE( ids, id, ((bdb)->bi_lastid) )
 #define BDB_IDL_ALL( bdb, ids ) BDB_IDL_RANGE( ids, 1, ((bdb)->bi_lastid) )
 
-#define BDB_IDL_FIRST( ids )   ( ids[1] )
-#define BDB_IDL_LAST( ids )            ( BDB_IDL_IS_RANGE(ids) ? ids[2] : ids[ids[0]] )
+#define BDB_IDL_FIRST( ids )   ( (ids)[1] )
+#define BDB_IDL_LAST( ids )            ( BDB_IDL_IS_RANGE(ids) \
+       ? (ids)[2] : (ids)[(ids)[0]] )
+
+#define BDB_IDL_N( ids )               ( BDB_IDL_IS_RANGE(ids) \
+       ? ((ids)[2]-(ids)[1])+1 : (ids)[0] )
 
 LDAP_BEGIN_DECL
 LDAP_END_DECL
 
-#endif
\ No newline at end of file
+#endif