X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ftools.c;h=167f3c7e5e2b46d198a5e2114a5cba5933a87cf3;hb=0af1940f3fb59fe57b2281ef253fe1341c505c2c;hp=714adf7a6e5e8426660b3a6a6a31a5fa084c0c87;hpb=d85cb6efbbf262b91a773294a8d80e12bcb9d48a;p=openldap
diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 714adf7a6e..167f3c7e5e 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-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,13 +38,12 @@ static unsigned nholes;
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 );
-static int bdb_tool_ix_rec( int base );
-static void * bdb_tool_index_task( void *ctx, void *ptr );
#define IDBLOCK 1024
@@ -61,15 +60,18 @@ typedef struct bdb_tool_idl_cache {
} 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 volatile int *bdb_tool_index_threads;
+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;
+static void * bdb_tool_index_task( void *ctx, void *ptr );
+
int bdb_tool_entry_open(
BackendDB *be, int mode )
{
@@ -90,20 +92,21 @@ int bdb_tool_entry_open(
}
}
- /* Set up for slapindex */
- if ( !(slapMode & SLAP_TOOL_READONLY )) {
- int i;
- if ( !bdb_tool_info && ( slapMode & SLAP_TOOL_QUICK )) {
+ /* Set up for threaded slapindex */
+ if (( slapMode & (SLAP_TOOL_QUICK|SLAP_TOOL_READONLY)) == SLAP_TOOL_QUICK
+ && bdb->bi_nattrs ) {
+ if ( !bdb_tool_info ) {
+ int i;
ldap_pvt_thread_mutex_init( &bdb_tool_index_mutex );
ldap_pvt_thread_cond_init( &bdb_tool_index_cond );
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;
-
if ( bdb_tool_info ) {
slapd_shutdown = 1;
ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
+ bdb_tool_index_tcount = slap_tool_thread_max - 1;
ldap_pvt_thread_cond_broadcast( &bdb_tool_index_cond );
ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex );
}
@@ -138,7 +140,9 @@ int bdb_tool_entry_close(
cursor = NULL;
}
+#ifdef BDB_TOOL_IDL_CACHING
bdb_tool_idl_flush( be );
+#endif
if( nholes ) {
unsigned i;
@@ -404,8 +408,15 @@ bdb_tool_index_add(
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_mutex_unlock( &bdb_tool_index_mutex );
+ ldap_pvt_thread_yield();
+ ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
+ }
for ( i=1; ie_id, 0 );
@@ -472,11 +483,11 @@ ID bdb_tool_entry_put(
goto done;
}
- /* id2entry index */
- rc = bdb_id2entry_add( be, tid, e );
+ 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",
@@ -484,11 +495,11 @@ ID bdb_tool_entry_put(
goto done;
}
- if ( !bdb->bi_linear_index )
- rc = bdb_tool_index_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",
@@ -677,33 +688,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)) {
@@ -735,7 +719,7 @@ done:
return e->e_id;
}
-
+#ifdef BDB_TOOL_IDL_CACHING
static int
bdb_tool_idl_cmp( const void *v1, const void *v2 )
{
@@ -758,8 +742,8 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
int i, rc;
ID id, nid;
- if ( !ic->count ) {
- ch_free( ic );
+ /* Freshly allocated, ignore it */
+ if ( !ic->head && ic->count <= BDB_IDL_DB_SIZE ) {
return 0;
}
@@ -852,22 +836,31 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
}
}
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 );
}
}
- ch_free( ic );
+ if ( ic != db->app_private ) {
+ ch_free( ic );
+ } else {
+ ic->head = ic->tail = NULL;
+ }
curs->c_close( curs );
return rc;
}
static int
-bdb_tool_idl_flush_db( DB *db )
+bdb_tool_idl_flush_db( DB *db, bdb_tool_idl_cache *ic )
{
- int rc = avl_apply( db->app_private, bdb_tool_idl_flush_one, db, -1,
- AVL_INORDER );
- avl_free( db->app_private, NULL );
+ 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;
@@ -885,7 +878,7 @@ 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 = bdb_tool_idl_flush_db( db );
+ rc = bdb_tool_idl_flush_db( db, NULL );
if ( rc )
break;
}
@@ -905,18 +898,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, do_retry = 1;
+ int rc;
if ( !bdb->bi_idl_cache_max_size )
return bdb_idl_insert_key( be, db, txn, key, id );
DBT2bv( key, &itmp.kstr );
-retry:
- root = db->app_private;
-
- 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 ) {
@@ -932,8 +921,8 @@ retry:
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 );
@@ -979,21 +968,24 @@ retry:
}
/* 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 ( do_retry &&
- bdb->bi_idl_cache_size >= bdb->bi_idl_cache_max_size ) {
- do_retry = 0;
- rc = bdb_tool_idl_flush_db( db );
+ 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;
- goto retry;
+ 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 ));
@@ -1003,7 +995,6 @@ retry:
ic->tail->next = ice;
}
ic->tail = ice;
- ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
if ( !ic->count )
ic->first = id;
}
@@ -1013,6 +1004,7 @@ retry:
return 0;
}
+#endif
static void *
bdb_tool_index_task( void *ctx, void *ptr )
@@ -1022,6 +1014,7 @@ bdb_tool_index_task( void *ctx, void *ptr )
free( ptr );
while ( 1 ) {
ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
+ bdb_tool_index_tcount--;
ldap_pvt_thread_cond_wait( &bdb_tool_index_cond,
&bdb_tool_index_mutex );
ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex );