From 30d80e30eedc8c57a9b862e022e967a67ecf0505 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 19 Mar 2009 18:50:44 +0000 Subject: [PATCH] More for #6011, rearrange teardown steps --- servers/slapd/syncrepl.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index fdf79b0849..215f657aa9 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -1261,6 +1261,8 @@ do_syncrepl( if ( si == NULL ) return NULL; + if ( slapd_shutdown ) + return NULL; Debug( LDAP_DEBUG_TRACE, "=>do_syncrepl %s\n", si->si_ridtxt, 0, 0 ); @@ -3602,16 +3604,13 @@ syncinfo_free( syncinfo_t *sie, int free_all ) Debug( LDAP_DEBUG_TRACE, "syncinfo_free: %s\n", sie->si_ridtxt, 0, 0 ); - sie->si_cookieState->cs_ref--; - if ( !sie->si_cookieState->cs_ref ) { - ch_free( sie->si_cookieState->cs_sids ); - ber_bvarray_free( sie->si_cookieState->cs_vals ); - ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_mutex ); - ch_free( sie->si_cookieState ); - } do { + struct re_s *re; + si_next = sie->si_next; + sie->si_re = NULL; + if ( sie->si_ld ) { if ( sie->si_conn ) { connection_client_stop( sie->si_conn ); @@ -3622,11 +3621,11 @@ syncinfo_free( syncinfo_t *sie, int free_all ) /* re-fetch it, in case it was already removed */ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); - sie->si_re = ldap_pvt_runqueue_find( &slapd_rq, do_syncrepl, sie ); - if ( sie->si_re ) { - if ( ldap_pvt_runqueue_isrunning( &slapd_rq, sie->si_re ) ) - ldap_pvt_runqueue_stoptask( &slapd_rq, sie->si_re ); - ldap_pvt_runqueue_remove( &slapd_rq, sie->si_re ); + re = ldap_pvt_runqueue_find( &slapd_rq, do_syncrepl, sie ); + if ( re ) { + if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ) ) + ldap_pvt_runqueue_stoptask( &slapd_rq, re ); + ldap_pvt_runqueue_remove( &slapd_rq, re ); } ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); @@ -3709,6 +3708,13 @@ syncinfo_free( syncinfo_t *sie, int free_all ) } ch_free( npe ); } + sie->si_cookieState->cs_ref--; + if ( !sie->si_cookieState->cs_ref ) { + ch_free( sie->si_cookieState->cs_sids ); + ber_bvarray_free( sie->si_cookieState->cs_vals ); + ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_mutex ); + ch_free( sie->si_cookieState ); + } ch_free( sie ); sie = si_next; } while ( free_all && si_next ); -- 2.39.5