/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2005 The OpenLDAP Foundation.
+ * Copyright 2000-2008 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#define IDL_CMP(x,y) ( x < y ? -1 : ( x > y ? 1 : 0 ) )
-#define IDL_LRU_DELETE( bdb, e ) do { \
- if ( e->idl_lru_prev != NULL ) { \
- e->idl_lru_prev->idl_lru_next = e->idl_lru_next; \
- } else { \
- bdb->bi_idl_lru_head = e->idl_lru_next; \
- } \
- if ( e->idl_lru_next != NULL ) { \
- e->idl_lru_next->idl_lru_prev = e->idl_lru_prev; \
- } else { \
- bdb->bi_idl_lru_tail = e->idl_lru_prev; \
- } \
-} while ( 0 )
-
-#define IDL_LRU_ADD( bdb, e ) do { \
- e->idl_lru_next = bdb->bi_idl_lru_head; \
- if ( e->idl_lru_next != NULL ) { \
- e->idl_lru_next->idl_lru_prev = (e); \
- } \
- (bdb)->bi_idl_lru_head = (e); \
- e->idl_lru_prev = NULL; \
- if ( (bdb)->bi_idl_lru_tail == NULL ) { \
- (bdb)->bi_idl_lru_tail = (e); \
- } \
+#define IDL_LRU_DELETE( bdb, e ) do { \
+ if ( (e) == (bdb)->bi_idl_lru_head ) { \
+ if ( (e)->idl_lru_next == (bdb)->bi_idl_lru_head ) { \
+ (bdb)->bi_idl_lru_head = NULL; \
+ } else { \
+ (bdb)->bi_idl_lru_head = (e)->idl_lru_next; \
+ } \
+ } \
+ if ( (e) == (bdb)->bi_idl_lru_tail ) { \
+ if ( (e)->idl_lru_prev == (bdb)->bi_idl_lru_tail ) { \
+ assert( (bdb)->bi_idl_lru_head == NULL ); \
+ (bdb)->bi_idl_lru_tail = NULL; \
+ } else { \
+ (bdb)->bi_idl_lru_tail = (e)->idl_lru_prev; \
+ } \
+ } \
+ (e)->idl_lru_next->idl_lru_prev = (e)->idl_lru_prev; \
+ (e)->idl_lru_prev->idl_lru_next = (e)->idl_lru_next; \
} while ( 0 )
static int
return 0;
}
-#if 0 /* unused */
-static int idl_delete( ID *ids, ID id )
+static int bdb_idl_delete( ID *ids, ID id )
{
- unsigned x = bdb_idl_search( ids, id );
+ unsigned x;
#if IDL_DEBUG > 1
Debug( LDAP_DEBUG_ANY, "delete: %04lx at %d\n", (long) id, x, 0 );
idl_check( ids );
#endif
+ if (BDB_IDL_IS_RANGE( ids )) {
+ /* If deleting a range boundary, adjust */
+ if ( ids[1] == id )
+ ids[1]++;
+ else if ( ids[2] == id )
+ ids[2]--;
+ /* deleting from inside a range is a no-op */
+
+ /* If the range has collapsed, re-adjust */
+ if ( ids[1] > ids[2] )
+ ids[0] = 0;
+ else if ( ids[1] == ids[2] )
+ ids[1] = 1;
+ return 0;
+ }
+
+ x = bdb_idl_search( ids, id );
assert( x > 0 );
if( x <= 0 ) {
return 0;
}
-#endif /* unused */
static char *
bdb_show_key(
if ( matched_idl_entry != NULL ) {
if ( matched_idl_entry->idl && ids )
BDB_IDL_CPY( ids, matched_idl_entry->idl );
- ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
- IDL_LRU_DELETE( bdb, matched_idl_entry );
- IDL_LRU_ADD( bdb, matched_idl_entry );
- ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
+ matched_idl_entry->idl_flags |= CACHE_ENTRY_REFERENCED;
if ( matched_idl_entry->idl )
rc = LDAP_SUCCESS;
else
int rc )
{
bdb_idl_cache_entry_t idl_tmp;
- bdb_idl_cache_entry_t *ee;
+ bdb_idl_cache_entry_t *ee, *eprev;
+
+ if ( rc == DB_NOTFOUND || BDB_IDL_IS_ZERO( ids ))
+ return;
DBT2bv( key, &idl_tmp.kstr );
ee = (bdb_idl_cache_entry_t *) ch_malloc(
sizeof( bdb_idl_cache_entry_t ) );
ee->db = db;
- if ( rc == DB_NOTFOUND || BDB_IDL_IS_ZERO( ids )) {
- ee->idl = NULL;
- } else {
- ee->idl = (ID*) ch_malloc( BDB_IDL_SIZEOF ( ids ) );
- BDB_IDL_CPY( ee->idl, ids );
- }
+ ee->idl = (ID*) ch_malloc( BDB_IDL_SIZEOF ( ids ) );
+ BDB_IDL_CPY( ee->idl, ids );
+
ee->idl_lru_prev = NULL;
ee->idl_lru_next = NULL;
+ ee->idl_flags = 0;
ber_dupbv( &ee->kstr, &idl_tmp.kstr );
ldap_pvt_thread_rdwr_wlock( &bdb->bi_idl_tree_rwlock );
if ( avl_insert( &bdb->bi_idl_tree, (caddr_t) ee,
return;
}
ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
- IDL_LRU_ADD( bdb, ee );
+ /* LRU_ADD */
+ if ( bdb->bi_idl_lru_head ) {
+ assert( bdb->bi_idl_lru_tail != NULL );
+ assert( bdb->bi_idl_lru_head->idl_lru_prev != NULL );
+ assert( bdb->bi_idl_lru_head->idl_lru_next != NULL );
+
+ ee->idl_lru_next = bdb->bi_idl_lru_head;
+ ee->idl_lru_prev = bdb->bi_idl_lru_head->idl_lru_prev;
+ bdb->bi_idl_lru_head->idl_lru_prev->idl_lru_next = ee;
+ bdb->bi_idl_lru_head->idl_lru_prev = ee;
+ } else {
+ ee->idl_lru_next = ee->idl_lru_prev = ee;
+ bdb->bi_idl_lru_tail = ee;
+ }
+ bdb->bi_idl_lru_head = ee;
+
if ( ++bdb->bi_idl_cache_size > bdb->bi_idl_cache_max_size ) {
- int i = 0;
- while ( bdb->bi_idl_lru_tail != NULL && i < 10 ) {
- ee = bdb->bi_idl_lru_tail;
+ int i;
+ ee = bdb->bi_idl_lru_tail;
+ for ( i = 0; ee != NULL && i < 10; i++, ee = eprev ) {
+ eprev = ee->idl_lru_prev;
+ if ( eprev == ee ) {
+ eprev = NULL;
+ }
+ if ( ee->idl_flags & CACHE_ENTRY_REFERENCED ) {
+ ee->idl_flags ^= CACHE_ENTRY_REFERENCED;
+ continue;
+ }
if ( avl_delete( &bdb->bi_idl_tree, (caddr_t) ee,
bdb_idl_entry_cmp ) == NULL ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_cache_put: "
ch_free( ee->idl );
ch_free( ee );
}
+ bdb->bi_idl_lru_tail = eprev;
+ assert( bdb->bi_idl_lru_tail != NULL
+ || bdb->bi_idl_lru_head == NULL );
}
-
ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
ldap_pvt_thread_rdwr_wunlock( &bdb->bi_idl_tree_rwlock );
}
ldap_pvt_thread_rdwr_wunlock( &bdb->bi_idl_tree_rwlock );
}
+void
+bdb_idl_cache_add_id(
+ struct bdb_info *bdb,
+ DB *db,
+ DBT *key,
+ ID id )
+{
+ bdb_idl_cache_entry_t *cache_entry, idl_tmp;
+ DBT2bv( key, &idl_tmp.kstr );
+ idl_tmp.db = db;
+ ldap_pvt_thread_rdwr_wlock( &bdb->bi_idl_tree_rwlock );
+ cache_entry = avl_find( bdb->bi_idl_tree, &idl_tmp,
+ bdb_idl_entry_cmp );
+ if ( cache_entry != NULL ) {
+ if ( !BDB_IDL_IS_RANGE( cache_entry->idl ) &&
+ cache_entry->idl[0] < BDB_IDL_DB_MAX ) {
+ size_t s = BDB_IDL_SIZEOF( cache_entry->idl ) + sizeof(ID);
+ cache_entry->idl = ch_realloc( cache_entry->idl, s );
+ }
+ bdb_idl_insert( cache_entry->idl, id );
+ }
+ ldap_pvt_thread_rdwr_wunlock( &bdb->bi_idl_tree_rwlock );
+}
+
+void
+bdb_idl_cache_del_id(
+ struct bdb_info *bdb,
+ DB *db,
+ DBT *key,
+ ID id )
+{
+ bdb_idl_cache_entry_t *cache_entry, idl_tmp;
+ DBT2bv( key, &idl_tmp.kstr );
+ idl_tmp.db = db;
+ ldap_pvt_thread_rdwr_wlock( &bdb->bi_idl_tree_rwlock );
+ cache_entry = avl_find( bdb->bi_idl_tree, &idl_tmp,
+ bdb_idl_entry_cmp );
+ if ( cache_entry != NULL ) {
+ bdb_idl_delete( cache_entry->idl, id );
+ if ( cache_entry->idl[0] == 0 ) {
+ if ( avl_delete( &bdb->bi_idl_tree, (caddr_t) cache_entry,
+ bdb_idl_entry_cmp ) == NULL ) {
+ Debug( LDAP_DEBUG_ANY, "=> bdb_idl_cache_del: "
+ "AVL delete failed\n",
+ 0, 0, 0 );
+ }
+ --bdb->bi_idl_cache_size;
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
+ IDL_LRU_DELETE( bdb, cache_entry );
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
+ free( cache_entry->kstr.bv_val );
+ free( cache_entry->idl );
+ free( cache_entry );
+ }
+ }
+ ldap_pvt_thread_rdwr_wunlock( &bdb->bi_idl_tree_rwlock );
+}
+
int
bdb_idl_fetch_key(
BackendDB *be,
DB *db,
- DB_TXN *tid,
+ DB_TXN *txn,
DBT *key,
ID *ids,
DBC **saved_cursor,
/* If we're not reusing an existing cursor, get a new one */
if( opflag != DB_NEXT ) {
- rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
+ rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
assert( id != NOID );
- if ( bdb->bi_idl_cache_size ) {
- bdb_idl_cache_del( bdb, db, key );
- }
-
DBTzero( &data );
data.size = sizeof( ID );
data.ulen = data.size;
cursor->c_close( cursor );
return rc;
}
+ /* If key was added (didn't already exist) and using IDL cache,
+ * update key in IDL cache.
+ */
+ if ( !rc && bdb->bi_idl_cache_max_size ) {
+ bdb_idl_cache_add_id( bdb, db, key, id );
+ }
rc = cursor->c_close( cursor );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
}
assert( id != NOID );
- if ( bdb->bi_idl_cache_max_size ) {
+ if ( bdb->bi_idl_cache_size ) {
bdb_idl_cache_del( bdb, db, key );
}
*/
int bdb_idl_append( ID *a, ID *b )
{
- ID ida, idb, tmp;
+ ID ida, idb, tmp, swap = 0;
if ( BDB_IDL_IS_ZERO( b ) ) {
return 0;
}
if ( b[0] > 1 && ida > idb ) {
+ swap = idb;
a[a[0]] = idb;
b[b[0]] = ida;
}
AC_MEMCPY(a+a[0]+1, b+2, i * sizeof(ID));
a[0] += i;
}
+ if ( swap ) {
+ b[b[0]] = swap;
+ }
return 0;
}
-#if 0
+#if 1
/* Quicksort + Insertion sort for small arrays */
bdb_idl_sort( ID *ids, ID *tmp )
{
int count, soft_limit, phase = 0, size = ids[0];
- ID *idls[2], mask, maxval = ids[size];
+ ID *idls[2];
+ unsigned char *maxv = (unsigned char *)&ids[size];
if ( BDB_IDL_IS_RANGE( ids ))
return;
idls[0] = ids;
idls[1] = tmp;
- soft_limit = sizeof(ID) - 1;
- mask = (ID)0xff << (sizeof(ID) - 1) * 8;
-
- while (!(maxval & mask)) {
- soft_limit--;
- mask >>= 8;
- }
+#if BYTE_ORDER == BIG_ENDIAN
+ for (soft_limit = 0; !maxv[soft_limit]; soft_limit++);
+#else
+ for (soft_limit = sizeof(ID)-1; !maxv[soft_limit]; soft_limit--);
+#endif
for (
#if BYTE_ORDER == BIG_ENDIAN
- count = soft_limit; count >= 0; --count
+ count = sizeof(ID)-1; count >= soft_limit; --count
#else
count = 0; count <= soft_limit; ++count
#endif
projects / openldap / blobdiff