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

ITS#5405 fix race condition

Browse Source
This commit is contained in:
Howard Chu 2008-03-08 02:00:36 +00:00
parent 17f22b3ee7
commit 44b1af6e65
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
servers/slapd/overlays/syncprov.c
View File

@ -853,10 +853,10 @@ syncprov_qplay( Operation *op, slap_overinst *on, syncops *so )
so->s_res = sr->s_next;
if ( !so->s_res )
so->s_restail = NULL;
ldap_pvt_thread_mutex_unlock( &so->s_mutex );
/* Exit loop with mutex held */
if ( !sr || so->s_op->o_abandon )
break;
ldap_pvt_thread_mutex_unlock( &so->s_mutex );
opc.sdn = sr->s_dn;
opc.sndn = sr->s_ndn;
@ -883,9 +883,24 @@ syncprov_qplay( Operation *op, slap_overinst *on, syncops *so )
ch_free( sr );
if ( rc )
if ( rc ) {
/* Exit loop with mutex held */
ldap_pvt_thread_mutex_lock( &so->s_mutex );
break;
}
}
/* wait until we get explicitly scheduled again */
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
if ( rc == 0 ) {
ldap_pvt_runqueue_resched( &slapd_rq, rtask, 1 );
} else {
/* bail out on any error */
ldap_pvt_runqueue_remove( &slapd_rq, rtask );
}
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
ldap_pvt_thread_mutex_unlock( &so->s_mutex );
return rc;
}
@ -925,17 +940,6 @@ syncprov_qtask( void *ctx, void *arg )
/* decrement use count... */
syncprov_free_syncop( so );
/* wait until we get explicitly scheduled again */
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
if ( rc == 0 ) {
ldap_pvt_runqueue_resched( &slapd_rq, rtask, 1 );
} else {
/* bail out on any error */
ldap_pvt_runqueue_remove( &slapd_rq, rtask );
}
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
#if 0 /* FIXME: connection_close isn't exported from slapd.
* should it be?
*/