X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ftools.c;h=167f3c7e5e2b46d198a5e2114a5cba5933a87cf3;hb=0af1940f3fb59fe57b2281ef253fe1341c505c2c;hp=24bff1427b8081f72b816d7c11935cbb5a464506;hpb=888731e6c3a0976d6c0838cd4a60964df0368844;p=openldap

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 24bff1427b..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 <http://www.openldap.org/>.
  *
- * 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,6 +38,7 @@ 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)
@@ -46,8 +47,30 @@ static int bdb_tool_idl_flush( BackendDB *be );
 
 #define	IDBLOCK	1024
 
-static ID *bdb_tool_idls;
-static int bdb_tool_idl_next;
+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;
+
+static void * bdb_tool_index_task( void *ctx, void *ptr );
 
 int bdb_tool_entry_open(
 	BackendDB *be, int mode )
@@ -69,10 +92,25 @@ int bdb_tool_entry_open(
 		}
 	}
 
-	/* Get a block of memory for the IDL cache */
-	if ( !(slapMode & SLAP_TOOL_READONLY ) && bdb->bi_idl_cache_max_size )
-		bdb_tool_idls = ch_malloc( bdb->bi_idl_cache_max_size *
-			sizeof( ID ) * IDBLOCK );
+	/* 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; i<slap_tool_thread_max; i++) {
+				int *ptr = ch_malloc( sizeof( int ));
+				*ptr = i;
+				ldap_pvt_thread_pool_submit( &connection_pool,
+					bdb_tool_index_task, ptr );
+			}
+		}
+		bdb_tool_info = bdb;
+	}
 
 	return 0;
 }
@@ -80,7 +118,13 @@ int bdb_tool_entry_open(
 int bdb_tool_entry_close(
 	BackendDB *be )
 {
-	assert( be != NULL );
+	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 );
+	}
 
 	if( key.data ) {
 		ch_free( key.data );
@@ -96,11 +140,9 @@ int bdb_tool_entry_close(
 		cursor = NULL;
 	}
 
+#ifdef BDB_TOOL_IDL_CACHING
 	bdb_tool_idl_flush( be );
-
-	free( bdb_tool_idls );
-	bdb_tool_idls = NULL;
-	bdb_tool_idl_next = 0;
+#endif
 
 	if( nholes ) {
 		unsigned i;
@@ -341,6 +383,60 @@ 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 ( 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_mutex_unlock( &bdb_tool_index_mutex );
+			ldap_pvt_thread_yield();
+			ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
+		}
+		for ( i=1; i<slap_tool_thread_max; i++ )
+			bdb_tool_index_threads[i] = LDAP_BUSY;
+		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 );
+		rc = bdb_index_recrun( op, bdb, ir, e->e_id, 0 );
+		if ( rc )
+			return rc;
+		for ( i=1; i<slap_tool_thread_max; i++ ) {
+			if ( bdb_tool_index_threads[i] == LDAP_BUSY ) {
+				ldap_pvt_thread_yield();
+				i--;
+				continue;
+			}
+			if ( bdb_tool_index_threads[i] )
+				return bdb_tool_index_threads[i];
+		}
+		return 0;
+	} else {
+		return bdb_index_entry_add( op, txn, e );
+	}
+}
+
 ID bdb_tool_entry_put(
 	BackendDB *be,
 	Entry *e,
@@ -387,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",
@@ -399,11 +495,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",
@@ -507,7 +603,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 ) {
@@ -592,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)) {
@@ -650,14 +719,7 @@ done:
 	return e->e_id;
 }
 
-
-typedef struct bdb_tool_idl_cache {
-	struct berval kstr;
-	ID first, last;
-	int idls[BDB_IDL_DB_SIZE / IDBLOCK];
-	int idn, count;
-} bdb_tool_idl_cache;
-
+#ifdef BDB_TOOL_IDL_CACHING
 static int
 bdb_tool_idl_cmp( const void *v1, const void *v2 )
 {
@@ -673,13 +735,17 @@ 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;
 
-	if ( !ic->count )
+	/* Freshly allocated, ignore it */
+	if ( !ic->head && ic->count <= BDB_IDL_DB_SIZE ) {
 		return 0;
+	}
 
 	rc = db->cursor( db, NULL, &curs, 0 );
 	if ( rc )
@@ -696,7 +762,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->idn == -1 ) {
+	if ( rc == 0 && ic->count > BDB_IDL_DB_SIZE ) {
 		/* If it's not currently a range, must delete old info */
 		if ( nid ) {
 			/* Skip lo */
@@ -722,7 +788,7 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
 		rc = 0;
 	} else if ( rc && rc != DB_NOTFOUND ) {
 		rc = -1;
-	} else if ( ic->idn == -1 ) {
+	} else if ( ic->count > BDB_IDL_DB_SIZE ) {
 		/* range, didn't exist before */
 		nid = 0;
 		rc = curs->c_put( curs, &key, &data, DB_KEYLAST );
@@ -742,12 +808,18 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
 
 		/* Just a normal write */
 		rc = 0;
-		for ( n=0; n<=ic->idn; n++ ) {
-			ID *ids = bdb_tool_idls + ic->idls[n];
-			int end = ( n < ic->idn ) ? IDBLOCK : (ic->count & (IDBLOCK-1));
+		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; i<end; i++ ) {
-				if ( !ids[i] ) continue;
-				BDB_ID2DISK( ids[i], &nid );
+				if ( !ice->ids[i] ) continue;
+				BDB_ID2DISK( ice->ids[i], &nid );
 				rc = curs->c_put( curs, &key, &data, DB_NODUPDATA );
 				if ( rc ) {
 					if ( rc == DB_KEYEXIST ) {
@@ -763,12 +835,38 @@ bdb_tool_idl_flush_one( void *v1, void *arg )
 				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 )
 {
@@ -780,17 +878,12 @@ 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 )
+		rc = bdb_tool_idl_flush_db( db, NULL );
+		if ( rc )
 			break;
-		rc = 0;
 	}
 	if ( !rc ) {
 		bdb->bi_idl_cache_size = 0;
-		bdb_tool_idl_next = 0;
 	}
 	return rc;
 }
@@ -804,19 +897,15 @@ int bdb_tool_idl_add(
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	bdb_tool_idl_cache *ic, itmp;
-	ID *ids;
-	Avlnode *root;
+	bdb_tool_idl_cache_entry *ice;
 	int rc;
 
 	if ( !bdb->bi_idl_cache_max_size )
 		return bdb_idl_insert_key( be, db, txn, key, id );
 
-retry:
-	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 ) {
@@ -829,11 +918,11 @@ retry:
 		ic->kstr.bv_len = itmp.kstr.bv_len;
 		ic->kstr.bv_val = (char *)(ic+1);
 		AC_MEMCPY( ic->kstr.bv_val, itmp.kstr.bv_val, ic->kstr.bv_len );
-		ic->idn = -1;
+		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 );
@@ -862,31 +951,79 @@ retry:
 		return 0;
 	/* Are we at the limit, and converting to a range? */
 	} else if ( ic->count == BDB_IDL_DB_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->head = ic->tail = NULL;
 		ic->last = id;
 		ic->count++;
-		ic->idn = -1;
 		return 0;
 	}
 	/* No free block, create that too */
-	if ( ic->idn == -1 || ( ic->count & (IDBLOCK-1)) == 0) {
-		bdb->bi_idl_cache_size++;
-		if ( bdb->bi_idl_cache_size > bdb->bi_idl_cache_max_size ) {
-			rc = bdb_tool_idl_flush( be );
+	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;
-			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 );
 		}
-		ic->idls[++ic->idn] = bdb_tool_idl_next;
-		ids = bdb_tool_idls + bdb_tool_idl_next;
-		bdb_tool_idl_next += IDBLOCK;
-
-		memset( ids, 0, IDBLOCK * sizeof( ID ));
+		bdb->bi_idl_cache_size++;
+		if ( bdb_tool_idl_free_list ) {
+			ice = bdb_tool_idl_free_list;
+			bdb_tool_idl_free_list = ice->next;
+		}
+		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 ));
+		if ( !ic->head ) {
+			ic->head = ice;
+		} else {
+			ic->tail->next = ice;
+		}
+		ic->tail = ice;
 		if ( !ic->count )
 			ic->first = id;
 	}
-	ids = bdb_tool_idls + ic->idls[ic->idn];
-	ids[ ic->count & (IDBLOCK-1) ] = id;
+	ice = ic->tail;
+	ice->ids[ ic->count & (IDBLOCK-1) ] = id;
 	ic->count++;
 
 	return 0;
 }
+#endif
+
+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--;
+		ldap_pvt_thread_cond_wait( &bdb_tool_index_cond,
+			&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;
+}