ITS#2562: add missing arg to hash_lanman

[openldap] / libraries / libldap_r / rq.c

diff --git a/libraries/libldap_r/rq.c b/libraries/libldap_r/rq.c
index 80f065a418145f17bc34cd1a7408a6ecf31b9081..29153ccc7270ef1d7b260ef4d65ae627cfeb7fd4 100644 (file)
--- a/libraries/libldap_r/rq.c
+++ b/libraries/libldap_r/rq.c
@@ -1,4 +1,8 @@
 /* $OpenLDAP$ */
+/* 
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 #include "portable.h"
 
 #include <stdio.h>
@@ -18,66 +22,163 @@ void
 ldap_pvt_runqueue_insert(
        struct runqueue_s* rq,
        time_t interval,
-       void *private
+       ldap_pvt_thread_start_t *routine,
+       void *arg
 )
 {
        struct re_s* entry;
-       entry = (struct re_s *) ch_calloc( 1, sizeof( struct re_s ));
+
+       entry = (struct re_s *) LDAP_CALLOC( 1, sizeof( struct re_s ));
        entry->interval.tv_sec = interval;
        entry->interval.tv_usec = 0;
        entry->next_sched.tv_sec = time( NULL );
        entry->next_sched.tv_usec = 0;
-       entry->private = private;
-       LDAP_STAILQ_INSERT_HEAD( &rq->run_list, entry, next );
+       entry->routine = routine;
+       entry->arg = arg;
+       LDAP_STAILQ_INSERT_HEAD( &rq->task_list, entry, tnext );
 }
 
 void
+ldap_pvt_runqueue_remove(
+       struct runqueue_s* rq,
+       struct re_s* entry
+)
+{
+       struct re_s* e;
+
+       LDAP_STAILQ_FOREACH( e, &rq->task_list, tnext ) {
+               if ( e == entry)
+                       break;
+       }
+
+       assert ( e == entry );
+
+       LDAP_STAILQ_REMOVE( &rq->task_list, entry, re_s, tnext );
+
+       LDAP_FREE( entry );
+
+}
+
+struct re_s*
 ldap_pvt_runqueue_next_sched(
        struct runqueue_s* rq,
-       struct timeval** next_run,
-       void **private
+       struct timeval** next_run
 )
 {
        struct re_s* entry;
-       entry = LDAP_STAILQ_FIRST( &rq->run_list );
+
+       entry = LDAP_STAILQ_FIRST( &rq->task_list );
        if ( entry == NULL ) {
                *next_run = NULL;
-               *private = NULL;
+               return NULL;
+       } else if ( entry->next_sched.tv_sec == 0 ) {
+               *next_run = NULL;
+               return NULL;
        } else {
                *next_run = &entry->next_sched;
-               *private = entry->private;
+               return entry;
+       }
+}
+
+void
+ldap_pvt_runqueue_runtask(
+       struct runqueue_s* rq,
+       struct re_s* entry
+)
+{
+       LDAP_STAILQ_INSERT_HEAD( &rq->run_list, entry, rnext );
+}
+
+void
+ldap_pvt_runqueue_stoptask(
+       struct runqueue_s* rq,
+       struct re_s* entry
+)
+{
+       LDAP_STAILQ_REMOVE( &rq->run_list, entry, re_s, rnext );
+}
+
+int
+ldap_pvt_runqueue_isrunning(
+       struct runqueue_s* rq,
+       struct re_s* entry
+)
+{
+       struct re_s* e;
+
+       LDAP_STAILQ_FOREACH( e, &rq->run_list, rnext ) {
+               if ( e == entry ) {
+                       return 1;
+               }
        }
+       return 0;
 }
 
 void 
 ldap_pvt_runqueue_resched(
-       struct runqueue_s* rq
+       struct runqueue_s* rq,
+       struct re_s* entry
 )
 {
-       struct re_s* entry;
        struct re_s* prev;
        struct re_s* e;
 
-       entry = LDAP_STAILQ_FIRST( &rq->run_list );
-       if ( entry == NULL ) {
-               return;
-       } else {
+       LDAP_STAILQ_FOREACH( e, &rq->task_list, tnext ) {
+               if ( e == entry )
+                       break;
+       }
+
+       assert ( e == entry );
+
+       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;
-               LDAP_STAILQ_REMOVE_HEAD( &rq->run_list, next );
-               if ( LDAP_STAILQ_EMPTY( &rq->run_list )) {
-                       LDAP_STAILQ_INSERT_HEAD( &rq->run_list, entry, next );
-               } else {
-                       prev = entry;
-                       LDAP_STAILQ_FOREACH( e, &rq->run_list, next ) {
-                               if ( e->next_sched.tv_sec > entry->next_sched.tv_sec ) {
-                                       if ( prev == entry ) {
-                                               LDAP_STAILQ_INSERT_HEAD( &rq->run_list, entry, next );
-                                       } else {
-                                               LDAP_STAILQ_INSERT_AFTER( &rq->run_list, prev, entry, next );
-                                       }
+       } else {
+               entry->next_sched.tv_sec = 0;
+       }
+
+       if ( LDAP_STAILQ_EMPTY( &rq->task_list )) {
+               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 {
+               prev = NULL;
+               LDAP_STAILQ_FOREACH( e, &rq->task_list, tnext ) {
+                       if ( e->next_sched.tv_sec == 0 ) {
+                               if ( prev == NULL ) {
+                                       LDAP_STAILQ_INSERT_HEAD( &rq->task_list, entry, tnext );
+                               } else {
+                                       LDAP_STAILQ_INSERT_AFTER( &rq->task_list, prev, entry, tnext );
                                }
-                               prev = e;
+                               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;
                }
        }
 }
+
+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;
+}
+