upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

select loop changes for persistent threads

Browse source
This commit is contained in:
Jong Hyuk Choi 2003-05-20 23:52:11 +00:00
parent 2b62559aa5
commit 4192c4aaaa
3 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/ldap_rq.h
View file

@ -61,4 +61,9 @@ ldap_pvt_runqueue_resched(
struct re_s* entry struct re_s* entry
); );
LDAP_F( int )
ldap_pvt_runqueue_persistent_backload(
struct runqueue_s* rq
);
#endif #endif

37
libraries/libldap_r/rq.c
View file

@ -69,6 +69,9 @@ ldap_pvt_runqueue_next_sched(
if ( entry == NULL ) { if ( entry == NULL ) {
*next_run = NULL; *next_run = NULL;
return NULL; return NULL;
} else if ( entry->next_sched.tv_sec == 0 ) {
*next_run = NULL;
return NULL;
} else { } else {
*next_run = &entry->next_sched; *next_run = &entry->next_sched;
return entry; return entry;
@ -127,22 +130,54 @@ ldap_pvt_runqueue_resched(
LDAP_STAILQ_REMOVE( &rq->task_list, entry, re_s, tnext ); LDAP_STAILQ_REMOVE( &rq->task_list, entry, re_s, tnext );
if ( entry->interval.tv_sec ) {
entry->next_sched.tv_sec = time( NULL ) + entry->interval.tv_sec; entry->next_sched.tv_sec = time( NULL ) + entry->interval.tv_sec;
} else {
entry->next_sched.tv_sec = 0;
}
if ( LDAP_STAILQ_EMPTY( &rq->task_list )) { if ( LDAP_STAILQ_EMPTY( &rq->task_list )) {
LDAP_STAILQ_INSERT_HEAD( &rq->task_list, entry, tnext ); LDAP_STAILQ_INSERT_HEAD( &rq->task_list, entry, tnext );
} else if ( entry->next_sched.tv_sec == 0 ) {
LDAP_STAILQ_INSERT_TAIL( &rq->task_list, entry, tnext );
} else { } else {
prev = NULL; prev = NULL;
LDAP_STAILQ_FOREACH( e, &rq->task_list, tnext ) { LDAP_STAILQ_FOREACH( e, &rq->task_list, tnext ) {
if ( e->next_sched.tv_sec > entry->next_sched.tv_sec ) { if ( e->next_sched.tv_sec == 0 ) {
if ( prev == NULL ) { if ( prev == NULL ) {
LDAP_STAILQ_INSERT_HEAD( &rq->task_list, entry, tnext ); LDAP_STAILQ_INSERT_HEAD( &rq->task_list, entry, tnext );
} else { } else {
LDAP_STAILQ_INSERT_AFTER( &rq->task_list, prev, entry, tnext ); LDAP_STAILQ_INSERT_AFTER( &rq->task_list, prev, entry, tnext );
} }
break;
} else if ( e->next_sched.tv_sec > entry->next_sched.tv_sec ) {
if ( prev == NULL ) {
LDAP_STAILQ_INSERT_HEAD( &rq->task_list, entry, tnext );
} else {
LDAP_STAILQ_INSERT_AFTER( &rq->task_list, prev, entry, tnext );
}
break;
} }
prev = e; prev = e;
} }
} }
} }
int
ldap_pvt_runqueue_persistent_backload(
struct runqueue_s* rq
)
{
struct re_s* e;
int count = 0;
if ( !LDAP_STAILQ_EMPTY( &rq->task_list )) {
LDAP_STAILQ_FOREACH( e, &rq->task_list, tnext ) {
if ( e->next_sched.tv_sec == 0 )
count++;
}
}
return count;
}
#endif #endif

6
servers/slapd/daemon.c
View file

@ -1329,8 +1329,10 @@ slapd_daemon_task(
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex ); ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
if ( !at ) if ( !at ) {
at = ldap_pvt_thread_pool_backload(&connection_pool); at = ldap_pvt_thread_pool_backload(&connection_pool) -
ldap_pvt_runqueue_persistent_backload( &syncrepl_rq );
}
tvp = at ? &tv : NULL; tvp = at ? &tv : NULL;