upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-24 15:52:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ldap_pvt_thread_pool_retract() to cancel pending threads

Browse source
This commit is contained in:
Howard Chu 2009-06-11 04:46:04 +00:00
parent df85e3173d
commit 23783a9164
3 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/ldap_pvt_thread.h
View file

@ -215,6 +215,12 @@ ldap_pvt_thread_pool_submit LDAP_P((
ldap_pvt_thread_start_t *start,
void *arg ));
LDAP_F( int )
ldap_pvt_thread_pool_retract LDAP_P((
ldap_pvt_thread_pool_t *pool,
ldap_pvt_thread_start_t *start,
void *arg ));
LDAP_F( int )
ldap_pvt_thread_pool_maxthreads LDAP_P((
ldap_pvt_thread_pool_t *pool,

34
libraries/libldap_r/tpool.c
View file

@ -373,6 +373,40 @@ ldap_pvt_thread_pool_submit (
return(-1);
}
/* Cancel a pending thread that was previously submitted.
* Return 1 if the thread was successfully cancelled, 0 if
* not found, -1 for invalid parameters
*/
int
ldap_pvt_thread_pool_retract (
ldap_pvt_thread_pool_t *tpool,
ldap_pvt_thread_start_t *start_routine, void *arg )
{
struct ldap_int_thread_pool_s *pool;
ldap_int_thread_task_t *task;
if (tpool == NULL)
return(-1);
pool = *tpool;
if (pool == NULL)
return(-1);
ldap_pvt_thread_mutex_lock(&pool->ltp_mutex);
LDAP_STAILQ_FOREACH(task, &pool->ltp_pending_list, ltt_next.q)
if (task->ltt_start_routine == start_routine &&
task->ltt_arg == arg) {
pool->ltp_pending_count--;
LDAP_STAILQ_REMOVE(&pool->ltp_pending_list, task,
ldap_int_thread_task_s, ltt_next.q);
LDAP_SLIST_INSERT_HEAD(&pool->ltp_free_list, task,
ltt_next.l);
return 1;
}
return 0;
}
/* Set max #threads. value <= 0 means max supported #threads (LDAP_MAXTHR) */
int
ldap_pvt_thread_pool_maxthreads(

20
servers/slapd/syncrepl.c
View file

@ -4631,21 +4631,13 @@ syncrepl_config( ConfigArgs *c )
isrunning = 1;
} else {
if ( si->si_conn ) {
isrunning = 1;
/* If there's a persistent connection, we don't
* know if it's already got a thread queued.
* so defer the free, but reschedule the task.
* If there's a connection thread queued, it
* will cleanup as necessary. If not, then the
* runqueue task will cleanup.
/* If there's a persistent connection, it may
* already have a thread queued. We know it's
* not active, so it must be pending and we
* can simply cancel it now.
*/
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
if ( !ldap_pvt_runqueue_isrunning( &slapd_rq, si->si_re )) {
si->si_re->interval.tv_sec = 0;
ldap_pvt_runqueue_resched( &slapd_rq, si->si_re, 0 );
si->si_re->interval.tv_sec = si->si_interval;
}
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
ldap_pvt_thread_pool_retract( &connection_pool,
si->si_re->routine, si->si_re );
}
ldap_pvt_thread_mutex_unlock( &si->si_mutex );
}