mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-03-19 14:30:57 +08:00
ITS#9642 Remove redundant calls to slap_wake_listener()
This commit is contained in:
parent
19d4a69882
commit
bc37a9fdfa
@ -191,7 +191,6 @@ kinit_qtask( void *ctx, void *arg )
|
||||
nextcheck/3600, (nextcheck%3600)/60, nextcheck%60);
|
||||
rtask->interval.tv_sec = nextcheck;
|
||||
ldap_pvt_runqueue_resched( &slapd_rq, rtask, 0 );
|
||||
slap_wake_listener();
|
||||
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
|
||||
return NULL;
|
||||
}
|
||||
|
@ -3178,12 +3178,6 @@ ldap_back_conn_prune( ldapinfo_t *li )
|
||||
li->li_conn_expire_task->interval.tv_sec = next_timeout - now;
|
||||
ldap_pvt_runqueue_resched( &slapd_rq, li->li_conn_expire_task, 0 );
|
||||
|
||||
/*
|
||||
* The thread that handles runqueue might have already processed all tasks
|
||||
* before we insertered new task or rescheduled the existing task with new
|
||||
* timeout period. Wake it up to ensure that the task will be picked up.
|
||||
*/
|
||||
slap_wake_listener();
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldap_back_conn_prune: scheduled connection expiry timer to %ld sec\n",
|
||||
li->li_conn_expire_task->interval.tv_sec );
|
||||
@ -3219,7 +3213,6 @@ ldap_back_schedule_conn_expiry( ldapinfo_t *li, ldapconn_t *lc ) {
|
||||
ldap_back_conn_expire_time( li, lc ) - slap_get_time(),
|
||||
ldap_back_conn_expire_fn, li, "ldap_back_conn_expire_fn",
|
||||
"ldap_back_conn_expire_timer" );
|
||||
slap_wake_listener();
|
||||
Debug( LDAP_DEBUG_TRACE,
|
||||
"ldap_back_conn_prune: scheduled connection expiry timer to %ld sec\n",
|
||||
li->li_conn_expire_task->interval.tv_sec );
|
||||
|
@ -939,7 +939,6 @@ refint_response(
|
||||
refint_data *id;
|
||||
refint_q *rq;
|
||||
refint_attrs *ip;
|
||||
int ac;
|
||||
|
||||
/* If the main op failed or is not a Delete or ModRdn, ignore it */
|
||||
if (( op->o_tag != LDAP_REQ_DELETE && op->o_tag != LDAP_REQ_MODRDN ) ||
|
||||
@ -971,25 +970,20 @@ refint_response(
|
||||
id->qtail = rq;
|
||||
ldap_pvt_thread_mutex_unlock( &id->qmutex );
|
||||
|
||||
ac = 0;
|
||||
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
|
||||
if ( !id->qtask ) {
|
||||
id->qtask = ldap_pvt_runqueue_insert( &slapd_rq, RUNQ_INTERVAL,
|
||||
refint_qtask, id, "refint_qtask",
|
||||
op->o_bd->be_suffix[0].bv_val );
|
||||
ac = 1;
|
||||
} else {
|
||||
if ( !ldap_pvt_runqueue_isrunning( &slapd_rq, id->qtask ) &&
|
||||
!id->qtask->next_sched.tv_sec ) {
|
||||
id->qtask->interval.tv_sec = 0;
|
||||
ldap_pvt_runqueue_resched( &slapd_rq, id->qtask, 0 );
|
||||
id->qtask->interval.tv_sec = RUNQ_INTERVAL;
|
||||
ac = 1;
|
||||
}
|
||||
}
|
||||
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
|
||||
if ( ac )
|
||||
slap_wake_listener();
|
||||
|
||||
return SLAP_CB_CONTINUE;
|
||||
}
|
||||
|
@ -2201,7 +2201,6 @@ deleted:
|
||||
}
|
||||
si->si_retrynum[i] = RETRYNUM_TAIL;
|
||||
}
|
||||
slap_wake_listener();
|
||||
rc = 0;
|
||||
} else {
|
||||
for ( i = 0; si->si_retrynum && si->si_retrynum[i] <= 0; i++ ) {
|
||||
@ -2222,7 +2221,6 @@ deleted:
|
||||
fail = si->si_retrynum[i];
|
||||
rtask->interval.tv_sec = si->si_retryinterval[i];
|
||||
ldap_pvt_runqueue_resched( &slapd_rq, rtask, 0 );
|
||||
slap_wake_listener();
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user