X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ftools.c;h=65d947b379e5c6d94a326fe16abd6cfe6c1baa0f;hb=87466fc7c89475e1f6882cca6b3754a0c0b6b55b;hp=ff912dc8948ca6ba286b975c5926f826b8002ee8;hpb=8a69f642b8cbb51fc02d3b8fd461a2691c9da134;p=openldap
diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index ff912dc894..65d947b379 100644
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 2000-2005 The OpenLDAP Foundation.
+ * Copyright 2000-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -18,6 +18,7 @@
#include
#include
+#include
#define AVL_INTERNAL
#include "back-bdb.h"
@@ -25,6 +26,8 @@
static DBC *cursor = NULL;
static DBT key, data;
+static EntryHeader eh;
+static int eoff;
typedef struct dn_id {
ID id;
@@ -36,14 +39,47 @@ static dn_id hbuf[HOLE_SIZE], *holes = hbuf;
static unsigned nhmax = HOLE_SIZE;
static unsigned nholes;
-static Avlnode *index_attrs, index_dummy;
+static int index_nattrs;
+#ifdef BDB_TOOL_IDL_CACHING
#define bdb_tool_idl_cmp BDB_SYMBOL(tool_idl_cmp)
#define bdb_tool_idl_flush_one BDB_SYMBOL(tool_idl_flush_one)
#define bdb_tool_idl_flush BDB_SYMBOL(tool_idl_flush)
static int bdb_tool_idl_flush( BackendDB *be );
+#define IDBLOCK 1024
+
+typedef struct bdb_tool_idl_cache_entry {
+ struct bdb_tool_idl_cache_entry *next;
+ ID ids[IDBLOCK];
+} bdb_tool_idl_cache_entry;
+
+typedef struct bdb_tool_idl_cache {
+ struct berval kstr;
+ bdb_tool_idl_cache_entry *head, *tail;
+ ID first, last;
+ int count;
+} bdb_tool_idl_cache;
+
+static bdb_tool_idl_cache_entry *bdb_tool_idl_free_list;
+#endif /* BDB_TOOL_IDL_CACHING */
+
+static ID bdb_tool_ix_id;
+static Operation *bdb_tool_ix_op;
+static int *bdb_tool_index_threads, bdb_tool_index_tcount;
+static void *bdb_tool_index_rec;
+static struct bdb_info *bdb_tool_info;
+static ldap_pvt_thread_mutex_t bdb_tool_index_mutex;
+static ldap_pvt_thread_cond_t bdb_tool_index_cond_main;
+static ldap_pvt_thread_cond_t bdb_tool_index_cond_work;
+
+static ldap_pvt_thread_mutex_t bdb_tool_trickle_mutex;
+static ldap_pvt_thread_cond_t bdb_tool_trickle_cond;
+
+static void * bdb_tool_index_task( void *ctx, void *ptr );
+static void * bdb_tool_trickle_task( void *ctx, void *ptr );
+
int bdb_tool_entry_open(
BackendDB *be, int mode )
{
@@ -53,7 +89,7 @@ int bdb_tool_entry_open(
DBTzero( &key );
DBTzero( &data );
key.flags = DB_DBT_REALLOC;
- data.flags = DB_DBT_REALLOC;
+ data.flags = DB_DBT_USERMEM;
if (cursor == NULL) {
int rc = bdb->bi_id2entry->bdi_db->cursor(
@@ -64,21 +100,56 @@ int bdb_tool_entry_open(
}
}
+ /* Set up for threaded slapindex */
+ if (( slapMode & (SLAP_TOOL_QUICK|SLAP_TOOL_READONLY)) == SLAP_TOOL_QUICK ) {
+ if ( !bdb_tool_info ) {
+ ldap_pvt_thread_mutex_init( &bdb_tool_trickle_mutex );
+ ldap_pvt_thread_cond_init( &bdb_tool_trickle_cond );
+ ldap_pvt_thread_pool_submit( &connection_pool, bdb_tool_trickle_task, bdb->bi_dbenv );
+
+ ldap_pvt_thread_mutex_init( &bdb_tool_index_mutex );
+ ldap_pvt_thread_cond_init( &bdb_tool_index_cond_main );
+ ldap_pvt_thread_cond_init( &bdb_tool_index_cond_work );
+ if ( bdb->bi_nattrs ) {
+ int i;
+ bdb_tool_index_threads = ch_malloc( slap_tool_thread_max * sizeof( int ));
+ bdb_tool_index_rec = ch_malloc( bdb->bi_nattrs * sizeof( IndexRec ));
+ bdb_tool_index_tcount = slap_tool_thread_max - 1;
+ for (i=1; ibe_private;
+ char buf[16], *dptr;
assert( be != NULL );
assert( slapMode & SLAP_TOOL_MODE );
assert( bdb != NULL );
+ /* Get the header */
+ data.ulen = data.dlen = sizeof( buf );
+ data.data = buf;
+ data.flags |= DB_DBT_PARTIAL;
rc = cursor->c_get( cursor, &key, &data, DB_NEXT );
- if( rc != 0 ) {
+ if( rc ) {
/* If we're doing linear indexing and there are more attrs to
* index, and we're at the end of the database, start over.
*/
- if ( bdb->bi_attrs == &index_dummy ) {
- if ( index_attrs && rc == DB_NOTFOUND ) {
- /* optional - do a checkpoint here? */
- index_dummy.avl_data = avl_delete(&index_attrs, NULL, bdb_reindex_cmp);
- rc = cursor->c_get( cursor, &key, &data, DB_FIRST );
- }
+ if ( index_nattrs && rc == DB_NOTFOUND ) {
+ /* optional - do a checkpoint here? */
+ bdb_attr_info_free( bdb->bi_attrs[0] );
+ bdb->bi_attrs[0] = bdb->bi_attrs[index_nattrs];
+ index_nattrs--;
+ rc = cursor->c_get( cursor, &key, &data, DB_FIRST );
if ( rc ) {
- bdb->bi_attrs = NULL;
return NOID;
}
} else {
@@ -135,7 +210,13 @@ ID bdb_tool_entry_next(
}
}
- if( data.data == NULL ) {
+ dptr = eh.bv.bv_val;
+ eh.bv.bv_val = buf;
+ eh.bv.bv_len = data.size;
+ rc = entry_header( &eh );
+ eoff = eh.data - eh.bv.bv_val;
+ eh.bv.bv_val = dptr;
+ if( rc ) {
return NOID;
}
@@ -195,46 +276,62 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id )
{
int rc;
Entry *e = NULL;
- struct berval bv;
assert( be != NULL );
assert( slapMode & SLAP_TOOL_MODE );
- assert( data.data != NULL );
- DBT2bv( &data, &bv );
+ /* Get the size */
+ data.flags ^= DB_DBT_PARTIAL;
+ data.ulen = 0;
+ rc = cursor->c_get( cursor, &key, &data, DB_CURRENT );
+ if ( rc != DB_BUFFER_SMALL ) goto leave;
+
+ /* Allocate a block and retrieve the data */
+ eh.bv.bv_len = eh.nvals * sizeof( struct berval ) + data.size;
+ eh.bv.bv_val = ch_realloc( eh.bv.bv_val, eh.bv.bv_len );
+ eh.data = eh.bv.bv_val + eh.nvals * sizeof( struct berval );
+ data.data = eh.data;
+ data.ulen = data.size;
+
+ /* Skip past already parsed nattr/nvals */
+ eh.data += eoff;
+
+ rc = cursor->c_get( cursor, &key, &data, DB_CURRENT );
+ if ( rc ) goto leave;
#ifdef SLAP_ZONE_ALLOC
/* FIXME: will add ctx later */
- rc = entry_decode( &bv, &e, NULL );
+ rc = entry_decode( &eh, &e, NULL );
#else
- rc = entry_decode( &bv, &e );
+ rc = entry_decode( &eh, &e );
#endif
if( rc == LDAP_SUCCESS ) {
e->e_id = id;
- }
#ifdef BDB_HIER
- if ( slapMode & SLAP_TOOL_READONLY ) {
- EntryInfo *ei = NULL;
- Operation op = {0};
- Opheader ohdr = {0};
-
- op.o_hdr = &ohdr;
- op.o_bd = be;
- op.o_tmpmemctx = NULL;
- op.o_tmpmfuncs = &ch_mfuncs;
-
- rc = bdb_cache_find_parent( &op, NULL, cursor->locker, id, &ei );
- if ( rc == LDAP_SUCCESS ) {
- bdb_cache_entryinfo_unlock( ei );
- e->e_private = ei;
- ei->bei_e = e;
- bdb_fix_dn( e, 0 );
- ei->bei_e = NULL;
- e->e_private = NULL;
+ if ( slapMode & SLAP_TOOL_READONLY ) {
+ EntryInfo *ei = NULL;
+ Operation op = {0};
+ Opheader ohdr = {0};
+
+ op.o_hdr = &ohdr;
+ op.o_bd = be;
+ op.o_tmpmemctx = NULL;
+ op.o_tmpmfuncs = &ch_mfuncs;
+
+ rc = bdb_cache_find_parent( &op, NULL, cursor->locker, id, &ei );
+ if ( rc == LDAP_SUCCESS ) {
+ bdb_cache_entryinfo_unlock( ei );
+ e->e_private = ei;
+ ei->bei_e = e;
+ bdb_fix_dn( e, 0 );
+ ei->bei_e = NULL;
+ e->e_private = NULL;
+ }
}
- }
#endif
+ }
+leave:
return e;
}
@@ -330,6 +427,67 @@ static int bdb_tool_next_id(
return rc;
}
+static int
+bdb_tool_index_add(
+ Operation *op,
+ DB_TXN *txn,
+ Entry *e )
+{
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+
+ if ( !bdb->bi_nattrs )
+ return 0;
+
+ if ( slapMode & SLAP_TOOL_QUICK ) {
+ IndexRec *ir;
+ int i, rc;
+ Attribute *a;
+
+ ir = bdb_tool_index_rec;
+ memset(ir, 0, bdb->bi_nattrs * sizeof( IndexRec ));
+
+ for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
+ rc = bdb_index_recset( bdb, a, a->a_desc->ad_type,
+ &a->a_desc->ad_tags, ir );
+ if ( rc )
+ return rc;
+ }
+ bdb_tool_ix_id = e->e_id;
+ bdb_tool_ix_op = op;
+ ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
+ /* Wait for all threads to be ready */
+ while ( bdb_tool_index_tcount ) {
+ ldap_pvt_thread_cond_wait( &bdb_tool_index_cond_main,
+ &bdb_tool_index_mutex );
+ }
+ for ( i=1; ie_id, 0 );
+ if ( rc )
+ return rc;
+ ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
+ for ( i=1; ie_id & 0xfff ) == 0xfff )) {
+ ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex );
+ ldap_pvt_thread_cond_signal( &bdb_tool_trickle_cond );
+ ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex );
+ }
+
+ if ( !bdb->bi_linear_index )
+ rc = bdb_tool_index_add( &op, tid, e );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
- "id2entry_add failed: %s (%d)",
+ "index_entry_add failed: %s (%d)",
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
@@ -388,11 +552,11 @@ ID bdb_tool_entry_put(
goto done;
}
- if ( !bdb->bi_linear_index )
- rc = bdb_index_entry_add( &op, tid, e );
+ /* id2entry index */
+ rc = bdb_id2entry_add( be, tid, e );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
- "index_entry_add failed: %s (%d)",
+ "id2entry_add failed: %s (%d)",
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
@@ -433,7 +597,8 @@ done:
int bdb_tool_entry_reindex(
BackendDB *be,
- ID id )
+ ID id,
+ AttributeDescription **adv )
{
struct bdb_info *bi = (struct bdb_info *) be->be_private;
int rc;
@@ -453,11 +618,51 @@ int bdb_tool_entry_reindex(
return 0;
}
+ /* Check for explicit list of attrs to index */
+ if ( adv ) {
+ int i, j, n;
+
+ if ( bi->bi_attrs[0]->ai_desc != adv[0] ) {
+ /* count */
+ for ( n = 0; adv[n]; n++ ) ;
+
+ /* insertion sort */
+ for ( i = 0; i < n; i++ ) {
+ AttributeDescription *ad = adv[i];
+ for ( j = i-1; j>=0; j--) {
+ if ( SLAP_PTRCMP( adv[j], ad ) <= 0 ) break;
+ adv[j+1] = adv[j];
+ }
+ adv[j+1] = ad;
+ }
+ }
+
+ for ( i = 0; adv[i]; i++ ) {
+ if ( bi->bi_attrs[i]->ai_desc != adv[i] ) {
+ for ( j = i+1; j < bi->bi_nattrs; j++ ) {
+ if ( bi->bi_attrs[j]->ai_desc == adv[i] ) {
+ AttrInfo *ai = bi->bi_attrs[i];
+ bi->bi_attrs[i] = bi->bi_attrs[j];
+ bi->bi_attrs[j] = ai;
+ break;
+ }
+ }
+ if ( j == bi->bi_nattrs ) {
+ Debug( LDAP_DEBUG_ANY,
+ LDAP_XSTRING(bdb_tool_entry_reindex)
+ ": no index configured for %s\n",
+ adv[i]->ad_cname.bv_val, 0, 0 );
+ return -1;
+ }
+ }
+ }
+ bi->bi_nattrs = i;
+ }
+
/* Get the first attribute to index */
- if (bi->bi_linear_index && !index_attrs && bi->bi_attrs != &index_dummy) {
- index_attrs = bi->bi_attrs;
- bi->bi_attrs = &index_dummy;
- index_dummy.avl_data = avl_delete(&index_attrs, NULL, bdb_reindex_cmp);
+ if (bi->bi_linear_index && !index_nattrs) {
+ index_nattrs = bi->bi_nattrs - 1;
+ bi->bi_nattrs = 1;
}
e = bdb_tool_entry_get( be, id );
@@ -497,7 +702,7 @@ int bdb_tool_entry_reindex(
op.o_tmpmemctx = NULL;
op.o_tmpmfuncs = &ch_mfuncs;
- rc = bdb_index_entry_add( &op, tid, e );
+ rc = bdb_tool_index_add( &op, tid, e );
done:
if( rc == 0 ) {
@@ -582,33 +787,6 @@ ID bdb_tool_entry_modify(
goto done;
}
-#if 0
- /* FIXME: this is bogus, we don't have the old values to delete
- * from the index because the given entry has already been modified.
- */
- rc = bdb_index_entry_del( &op, tid, e );
- if( rc != 0 ) {
- snprintf( text->bv_val, text->bv_len,
- "index_entry_del failed: %s (%d)",
- db_strerror(rc), rc );
- Debug( LDAP_DEBUG_ANY,
- "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
- text->bv_val, 0, 0 );
- goto done;
- }
-#endif
-
- rc = bdb_index_entry_add( &op, tid, e );
- if( rc != 0 ) {
- snprintf( text->bv_val, text->bv_len,
- "index_entry_add failed: %s (%d)",
- db_strerror(rc), rc );
- Debug( LDAP_DEBUG_ANY,
- "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
- text->bv_val, 0, 0 );
- goto done;
- }
-
done:
if( rc == 0 ) {
if (! (slapMode & SLAP_TOOL_QUICK)) {
@@ -640,22 +818,7 @@ done:
return e->e_id;
}
-#define IDBLOCK 1024
-
-typedef struct bdb_tool_idl_cache_entry {
- struct bdb_tool_idl_cache_entry *next;
- ID ids[IDBLOCK];
-} bdb_tool_idl_cache_entry;
-
-typedef struct bdb_tool_idl_cache {
- struct berval kstr;
- bdb_tool_idl_cache_entry *head, *tail;
- ID first, last;
- int count;
-} bdb_tool_idl_cache;
-
-static bdb_tool_idl_cache_entry *bdb_tool_idl_free_list;
-
+#ifdef BDB_TOOL_IDL_CACHING
static int
bdb_tool_idl_cmp( const void *v1, const void *v2 )
{
@@ -671,12 +834,18 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
{
bdb_tool_idl_cache *ic = v1;
DB *db = arg;
+ struct bdb_info *bdb = bdb_tool_info;
bdb_tool_idl_cache_entry *ice;
DBC *curs;
DBT key, data;
int i, rc;
ID id, nid;
+ /* Freshly allocated, ignore it */
+ if ( !ic->head && ic->count <= BDB_IDL_DB_SIZE ) {
+ return 0;
+ }
+
rc = db->cursor( db, NULL, &curs, 0 );
if ( rc )
return -1;
@@ -692,7 +861,7 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
rc = curs->c_get( curs, &key, &data, DB_SET );
/* If key already exists and we're writing a range... */
- if ( rc == 0 && ic->head == NULL ) {
+ if ( rc == 0 && ic->count > BDB_IDL_DB_SIZE ) {
/* If it's not currently a range, must delete old info */
if ( nid ) {
/* Skip lo */
@@ -718,7 +887,7 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
rc = 0;
} else if ( rc && rc != DB_NOTFOUND ) {
rc = -1;
- } else if ( ic->head == NULL ) {
+ } else if ( ic->count > BDB_IDL_DB_SIZE ) {
/* range, didn't exist before */
nid = 0;
rc = curs->c_put( curs, &key, &data, DB_KEYLAST );
@@ -734,11 +903,19 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
rc = -1;
}
} else {
+ int n;
+
/* Just a normal write */
rc = 0;
- for ( ice = ic->head; ice; ice = ic->head ) {
- int end = ice->next ? IDBLOCK : (ic->count & (IDBLOCK-1));
- ic->head = ice->next;
+ for ( ice = ic->head, n=0; ice; ice = ice->next, n++ ) {
+ int end;
+ if ( ice->next ) {
+ end = IDBLOCK;
+ } else {
+ end = ic->count & (IDBLOCK-1);
+ if ( !end )
+ end = IDBLOCK;
+ }
for ( i=0; iids[i] ) continue;
BDB_ID2DISK( ice->ids[i], &nid );
@@ -752,19 +929,43 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
break;
}
}
- ice->next = bdb_tool_idl_free_list;
- bdb_tool_idl_free_list = ice;
if ( rc ) {
rc = -1;
break;
}
}
+ if ( ic->head ) {
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
+ ic->tail->next = bdb_tool_idl_free_list;
+ bdb_tool_idl_free_list = ic->head;
+ bdb->bi_idl_cache_size -= n;
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
+ }
+ }
+ if ( ic != db->app_private ) {
+ ch_free( ic );
+ } else {
+ ic->head = ic->tail = NULL;
}
- ch_free( ic );
curs->c_close( curs );
return rc;
}
+static int
+bdb_tool_idl_flush_db( DB *db, bdb_tool_idl_cache *ic )
+{
+ Avlnode *root = db->app_private;
+ int rc;
+
+ db->app_private = ic;
+ rc = avl_apply( root, bdb_tool_idl_flush_one, db, -1, AVL_INORDER );
+ avl_free( root, NULL );
+ db->app_private = NULL;
+ if ( rc != -1 )
+ rc = 0;
+ return rc;
+}
+
static int
bdb_tool_idl_flush( BackendDB *be )
{
@@ -776,15 +977,13 @@ bdb_tool_idl_flush( BackendDB *be )
for ( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
db = bdb->bi_databases[i]->bdi_db;
if ( !db->app_private ) continue;
- rc = avl_apply( db->app_private, bdb_tool_idl_flush_one, db, -1,
- AVL_INORDER );
- avl_free( db->app_private, NULL );
- db->app_private = NULL;
- if ( rc == -1 ) break;
- rc = 0;
+ rc = bdb_tool_idl_flush_db( db, NULL );
+ if ( rc )
+ break;
}
- if ( !rc )
+ if ( !rc ) {
bdb->bi_idl_cache_size = 0;
+ }
return rc;
}
@@ -798,17 +997,14 @@ int bdb_tool_idl_add(
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
bdb_tool_idl_cache *ic, itmp;
bdb_tool_idl_cache_entry *ice;
- Avlnode *root;
int rc;
if ( !bdb->bi_idl_cache_max_size )
return bdb_idl_insert_key( be, db, txn, key, id );
- root = db->app_private;
-
DBT2bv( key, &itmp.kstr );
- ic = avl_find( root, &itmp, bdb_tool_idl_cmp );
+ ic = avl_find( (Avlnode *)db->app_private, &itmp, bdb_tool_idl_cmp );
/* No entry yet, create one */
if ( !ic ) {
@@ -824,8 +1020,8 @@ int bdb_tool_idl_add(
ic->head = ic->tail = NULL;
ic->last = 0;
ic->count = 0;
- avl_insert( &root, ic, bdb_tool_idl_cmp, avl_dup_error );
- db->app_private = root;
+ avl_insert( (Avlnode **)&db->app_private, ic, bdb_tool_idl_cmp,
+ avl_dup_error );
/* load existing key count here */
rc = db->cursor( db, NULL, &curs, 0 );
@@ -854,11 +1050,16 @@ int bdb_tool_idl_add(
return 0;
/* Are we at the limit, and converting to a range? */
} else if ( ic->count == BDB_IDL_DB_SIZE ) {
- for (ice = ic->head; ice; ice = ice->next ) {
- bdb->bi_idl_cache_size--;
+ int n;
+ for ( ice = ic->head, n=0; ice; ice = ice->next, n++ )
+ /* counting */ ;
+ if ( n ) {
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
+ ic->tail->next = bdb_tool_idl_free_list;
+ bdb_tool_idl_free_list = ic->head;
+ bdb->bi_idl_cache_size -= n;
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
}
- ic->tail->next = bdb_tool_idl_free_list;
- bdb_tool_idl_free_list = ic->head;
ic->head = ic->tail = NULL;
ic->last = id;
ic->count++;
@@ -866,10 +1067,24 @@ int bdb_tool_idl_add(
}
/* No free block, create that too */
if ( !ic->tail || ( ic->count & (IDBLOCK-1)) == 0) {
+ ice = NULL;
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
+ if ( bdb->bi_idl_cache_size >= bdb->bi_idl_cache_max_size ) {
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
+ rc = bdb_tool_idl_flush_db( db, ic );
+ if ( rc )
+ return rc;
+ avl_insert( (Avlnode **)&db->app_private, ic, bdb_tool_idl_cmp,
+ avl_dup_error );
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
+ }
+ bdb->bi_idl_cache_size++;
if ( bdb_tool_idl_free_list ) {
ice = bdb_tool_idl_free_list;
bdb_tool_idl_free_list = ice->next;
- } else {
+ }
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
+ if ( !ice ) {
ice = ch_malloc( sizeof( bdb_tool_idl_cache_entry ));
}
memset( ice, 0, sizeof( *ice ));
@@ -879,7 +1094,6 @@ int bdb_tool_idl_add(
ic->tail->next = ice;
}
ic->tail = ice;
- bdb->bi_idl_cache_size++;
if ( !ic->count )
ic->first = id;
}
@@ -887,10 +1101,47 @@ int bdb_tool_idl_add(
ice->ids[ ic->count & (IDBLOCK-1) ] = id;
ic->count++;
- rc = 0;
- /* Check for flush */
- if ( bdb->bi_idl_cache_size > bdb->bi_idl_cache_max_size ) {
- rc = bdb_tool_idl_flush( be );
+ return 0;
+}
+#endif
+
+static void *
+bdb_tool_trickle_task( void *ctx, void *ptr )
+{
+ DB_ENV *env = ptr;
+ int wrote;
+
+ ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex );
+ while ( 1 ) {
+ ldap_pvt_thread_cond_wait( &bdb_tool_trickle_cond,
+ &bdb_tool_trickle_mutex );
+ if ( slapd_shutdown )
+ break;
+ env->memp_trickle( env, 30, &wrote );
}
- return rc;
+ ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex );
+}
+
+static void *
+bdb_tool_index_task( void *ctx, void *ptr )
+{
+ int base = *(int *)ptr;
+
+ free( ptr );
+ while ( 1 ) {
+ ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
+ bdb_tool_index_tcount--;
+ if ( !bdb_tool_index_tcount )
+ ldap_pvt_thread_cond_signal( &bdb_tool_index_cond_main );
+ ldap_pvt_thread_cond_wait( &bdb_tool_index_cond_work,
+ &bdb_tool_index_mutex );
+ ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex );
+ if ( slapd_shutdown )
+ break;
+
+ bdb_tool_index_threads[base] = bdb_index_recrun( bdb_tool_ix_op,
+ bdb_tool_info, bdb_tool_index_rec, bdb_tool_ix_id, base );
+ }
+
+ return NULL;
}