mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove some more yield() calls

Browse Source
This commit is contained in:
Howard Chu 2006-05-03 07:41:12 +00:00
parent 286a168203
commit 2a5ecbccaa
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
servers/slapd/back-bdb/tools.c
View File

@ -68,7 +68,8 @@ static int *bdb_tool_index_threads, bdb_tool_index_tcount;
static void *bdb_tool_index_rec; static void *bdb_tool_index_rec;
static struct bdb_info *bdb_tool_info; static struct bdb_info *bdb_tool_info;
static ldap_pvt_thread_mutex_t bdb_tool_index_mutex; static ldap_pvt_thread_mutex_t bdb_tool_index_mutex;
static ldap_pvt_thread_cond_t bdb_tool_index_cond; static ldap_pvt_thread_cond_t bdb_tool_index_cond_main;
static ldap_pvt_thread_cond_t bdb_tool_index_cond_work;
static void * bdb_tool_index_task( void *ctx, void *ptr ); static void * bdb_tool_index_task( void *ctx, void *ptr );
@ -98,7 +99,8 @@ int bdb_tool_entry_open(
if ( !bdb_tool_info ) { if ( !bdb_tool_info ) {
int i; int i;
ldap_pvt_thread_mutex_init( &bdb_tool_index_mutex ); ldap_pvt_thread_mutex_init( &bdb_tool_index_mutex );
ldap_pvt_thread_cond_init( &bdb_tool_index_cond ); ldap_pvt_thread_cond_init( &bdb_tool_index_cond_main );
ldap_pvt_thread_cond_init( &bdb_tool_index_cond_work );
bdb_tool_index_threads = ch_malloc( slap_tool_thread_max * sizeof( int )); 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_rec = ch_malloc( bdb->bi_nattrs * sizeof( IndexRec ));
bdb_tool_index_tcount = slap_tool_thread_max - 1; bdb_tool_index_tcount = slap_tool_thread_max - 1;
@ -122,7 +124,7 @@ int bdb_tool_entry_close(
slapd_shutdown = 1; slapd_shutdown = 1;
ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex ); ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
bdb_tool_index_tcount = slap_tool_thread_max - 1; bdb_tool_index_tcount = slap_tool_thread_max - 1;
ldap_pvt_thread_cond_broadcast( &bdb_tool_index_cond ); ldap_pvt_thread_cond_broadcast( &bdb_tool_index_cond_work );
ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex ); ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex );
} }
@ -410,28 +412,32 @@ bdb_tool_index_add(
ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex ); ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
/* Wait for all threads to be ready */ /* Wait for all threads to be ready */
while ( bdb_tool_index_tcount ) { while ( bdb_tool_index_tcount ) {
ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex ); ldap_pvt_thread_cond_wait( &bdb_tool_index_cond_main,
ldap_pvt_thread_yield(); &bdb_tool_index_mutex );
ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
} }
for ( i=1; i<slap_tool_thread_max; i++ ) for ( i=1; i<slap_tool_thread_max; i++ )
bdb_tool_index_threads[i] = LDAP_BUSY; bdb_tool_index_threads[i] = LDAP_BUSY;
bdb_tool_index_tcount = slap_tool_thread_max - 1; bdb_tool_index_tcount = slap_tool_thread_max - 1;
ldap_pvt_thread_cond_broadcast( &bdb_tool_index_cond ); ldap_pvt_thread_cond_broadcast( &bdb_tool_index_cond_work );
ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex ); ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex );
rc = bdb_index_recrun( op, bdb, ir, e->e_id, 0 ); rc = bdb_index_recrun( op, bdb, ir, e->e_id, 0 );
if ( rc ) if ( rc )
return rc; return rc;
ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
for ( i=1; i<slap_tool_thread_max; i++ ) { for ( i=1; i<slap_tool_thread_max; i++ ) {
if ( bdb_tool_index_threads[i] == LDAP_BUSY ) { if ( bdb_tool_index_threads[i] == LDAP_BUSY ) {
ldap_pvt_thread_yield(); ldap_pvt_thread_cond_wait( &bdb_tool_index_cond_main,
&bdb_tool_index_mutex );
i--; i--;
continue; continue;
} }
if ( bdb_tool_index_threads[i] ) if ( bdb_tool_index_threads[i] ) {
return bdb_tool_index_threads[i]; rc = bdb_tool_index_threads[i];
break;
}
} }
return 0; ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex );
return rc;
} else { } else {
return bdb_index_entry_add( op, txn, e ); return bdb_index_entry_add( op, txn, e );
} }
@ -1015,7 +1021,9 @@ bdb_tool_index_task( void *ctx, void *ptr )
while ( 1 ) { while ( 1 ) {
ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex ); ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
bdb_tool_index_tcount--; bdb_tool_index_tcount--;
ldap_pvt_thread_cond_wait( &bdb_tool_index_cond, 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 ); &bdb_tool_index_mutex );
ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex ); ldap_pvt_thread_mutex_unlock( &bdb_tool_index_mutex );
if ( slapd_shutdown ) if ( slapd_shutdown )