upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 00:59:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8081 - more for #8063

Browse source 
Prev patch broke underlying assumption that mods queue and execute
in order. Now must search list for matching mod to dequeue.
This commit is contained in:
Howard Chu 2015-03-21 21:32:48 +00:00
parent 2d9f33072b
commit ff7c0e5779
1 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
servers/slapd/overlays/syncprov.c
View file

@ -1414,8 +1414,16 @@ syncprov_op_cleanup( Operation *op, SlapReply *rs )
/* Remove op from lock table */
mt = opc->smt;
if ( mt ) {
modinst *mi = (modinst *)(opc+1), **m2;
ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
mt->mt_mods = mt->mt_mods->mi_next;
for (m2 = &mt->mt_mods; ; m2 = &(*m2)->mi_next) {
if ( *m2 == mi ) {
*m2 = mi->mi_next;
if ( mt->mt_tail == mi )
mt->mt_tail = ( m2 == &mt->mt_mods ) ? NULL : (modinst *)m2;
break;
}
}
/* If there are more, promote the next one */
if ( mt->mt_mods ) {
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
@ -2102,34 +2110,36 @@ syncprov_op_mod( Operation *op, SlapReply *rs )
/* See if we're already modifying this entry... */
mtdummy.mt_dn = op->o_req_ndn;
retry:
ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );
mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp );
if ( mt ) {
ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
if ( mt->mt_mods == NULL ) {
/* Cannot reuse this mt, as another thread is about
* to release it in syncprov_op_cleanup.
* to release it in syncprov_op_cleanup. Wait for them
* to finish; our own insert is required to succeed.
*/
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
mt = NULL;
ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
ldap_pvt_thread_yield();
goto retry;
}
}
if ( mt ) {
ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
mt->mt_tail->mi_next = mi;
mt->mt_tail = mi;
ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
/* wait for this op to get to head of list */
while ( mt->mt_mods != mi ) {
modinst *m2;
int same = 0;
/* don't wait on other mods from the same thread */
for ( m2 = mt->mt_mods; m2; m2 = m2->mi_next ) {
if ( m2->mi_op->o_threadctx == op->o_threadctx ) {
same = 1;
break;
}
}
if ( same )
if ( m2 )
break;
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
@ -2147,12 +2157,21 @@ syncprov_op_mod( Operation *op, SlapReply *rs )
/* clean up if the caller is giving up */
if ( op->o_abandon ) {
modinst *m2;
for ( m2 = mt->mt_mods; m2 && m2->mi_next != mi;
m2 = m2->mi_next );
if ( m2 ) {
m2->mi_next = mi->mi_next;
if ( mt->mt_tail == mi ) mt->mt_tail = m2;
modinst **m2;
slap_callback **sc;
for (m2 = &mt->mt_mods; ; m2 = &(*m2)->mi_next) {
if ( *m2 == mi ) {
*m2 = mi->mi_next;
if ( mt->mt_tail == mi )
mt->mt_tail = ( m2 == &mt->mt_mods ) ? NULL : (modinst *)m2;
break;
}
}
for (sc = &op->o_callback; ; sc = &(*sc)->sc_next) {
if ( *sc == cb ) {
*sc = cb->sc_next;
break;
}
}
op->o_tmpfree( cb, op->o_tmpmemctx );
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );