Removed active_threads count and associated mutex/cond. Replaced with

[openldap] / servers / slurpd / slurp.h

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index e32246b0ea24b4a3fa53f4cda694156fcb0543cc..26368bd4876fa2e1c4ffc08afedee795f49ceaf7 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -15,19 +16,26 @@
 #ifndef _SLURPD_H_
 #define _SLURPD_H_
 
-#define LDAP_SYSLOG
+#ifndef LDAP_SYSLOG
+#define LDAP_SYSLOG 1
+#endif
 
-#include <ac/syslog.h>
 #include <ac/errno.h>
+#include <ac/param.h>
+#include <ac/signal.h>
+#include <ac/syslog.h>
+#include <ac/time.h>
+
+#include <sys/types.h>
 
-#include <sys/param.h>
+#include <ldap.h>
 
-#include "lber.h"
-#include "ldap.h"
+#undef  ldap_debug
+#define ldap_debug slurp_debug
 #include "ldap_log.h"
 
-#include "lthread.h"
-#include "ldapconfig.h"
+#include "ldap_pvt_thread.h"
+#include "ldap_defaults.h"
 #include "ldif.h"
 
 
@@ -80,6 +88,8 @@
 #define        T_DELETECTSTR           "delete"
 #define        T_DELETECT              6
 #define        T_MODRDNCTSTR           "modrdn"
+#define        T_MODDNCTSTR            "moddn"
+#define        T_RENAMECTSTR           "rename"
 #define        T_MODRDNCT              7
 
 #define        T_MODOPADDSTR           "add"
@@ -92,7 +102,8 @@
 #define        T_MODSEP                11
 
 #define        T_NEWRDNSTR             "newrdn"
-#define        T_DRDNFLAGSTR           "deleteoldrdn"
+#define        T_DELOLDRDNSTR  "deleteoldrdn"
+#define T_NEWSUPSTR            "newsuperior"
 
 #define        T_ERR                   -1
 
@@ -179,7 +190,7 @@ struct ri {
     struct stel        *ri_stel;               /* pointer to Stel for this replica */
     unsigned long
                ri_seq;                 /* seq number of last repl */
-    pthread_t  ri_tid;                 /* ID of thread for this replica */
+    ldap_pvt_thread_t  ri_tid;                 /* ID of thread for this replica */
 
     /* Member functions */
     int (*ri_process) LDAP_P(( Ri * ));        /* process the next repl entry */
@@ -213,7 +224,7 @@ typedef struct re Re;
 struct re {
 
     /* Private data */
-    pthread_mutex_t
+    ldap_pvt_thread_mutex_t
                re_mutex;               /* mutex for this Re */
     int                re_refcnt;              /* ref count, 0 = done */
     char       *re_timestamp;          /* timestamp of this re */
@@ -258,9 +269,9 @@ struct rq {
     time_t     rq_lasttrim;            /* Last time we trimmed file */
     
     /* Public data */
-    pthread_mutex_t
+    ldap_pvt_thread_mutex_t
                rq_mutex;               /* mutex for whole queue */
-    pthread_cond_t
+    ldap_pvt_thread_cond_t
                rq_more;                /* condition var - more work added */
 
     /* Member functions */
@@ -304,7 +315,7 @@ typedef struct stel {
 typedef struct st St;
 struct st {
     /* Private data */
-    pthread_mutex_t
+    ldap_pvt_thread_mutex_t
                st_mutex;               /* mutex to serialize access */
     Stel       **st_data;              /* array of pointers to Stel structs */
     int                st_nreplicas;           /* number of repl hosts */