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

More for #6011, rearrange teardown steps

Browse Source
This commit is contained in:
Howard Chu 2009-03-19 18:50:44 +00:00
parent 1d16ee5622
commit 30d80e30ee
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
servers/slapd/syncrepl.c
View File

@ -1261,6 +1261,8 @@ do_syncrepl(
if ( si == NULL ) if ( si == NULL )
return NULL; return NULL;
if ( slapd_shutdown )
return NULL;
Debug( LDAP_DEBUG_TRACE, "=>do_syncrepl %s\n", si->si_ridtxt, 0, 0 ); 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", Debug( LDAP_DEBUG_TRACE, "syncinfo_free: %s\n",
sie->si_ridtxt, 0, 0 ); 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 { do {
struct re_s *re;
si_next = sie->si_next; si_next = sie->si_next;
sie->si_re = NULL;
if ( sie->si_ld ) { if ( sie->si_ld ) {
if ( sie->si_conn ) { if ( sie->si_conn ) {
connection_client_stop( 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 */ /* re-fetch it, in case it was already removed */
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
sie->si_re = ldap_pvt_runqueue_find( &slapd_rq, do_syncrepl, sie ); re = ldap_pvt_runqueue_find( &slapd_rq, do_syncrepl, sie );
if ( sie->si_re ) { if ( re ) {
if ( ldap_pvt_runqueue_isrunning( &slapd_rq, sie->si_re ) ) if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ) )
ldap_pvt_runqueue_stoptask( &slapd_rq, sie->si_re ); ldap_pvt_runqueue_stoptask( &slapd_rq, re );
ldap_pvt_runqueue_remove( &slapd_rq, sie->si_re ); ldap_pvt_runqueue_remove( &slapd_rq, re );
} }
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
@ -3709,6 +3708,13 @@ syncinfo_free( syncinfo_t *sie, int free_all )
} }
ch_free( npe ); 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 ); ch_free( sie );
sie = si_next; sie = si_next;
} while ( free_all && si_next ); } while ( free_all && si_next );