Multi-threaded slapindex

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index b23245fea4fc7004e50bb0490f9491d1188fb9df..b4cea81cf1121a4c00e913e39afea064f1d6513a 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -432,6 +432,9 @@ LDAP_SLAPD_F (int) overlay_op_walk LDAP_P((
  */
 LDAP_SLAPD_F (int) slap_loglevel_register LDAP_P (( slap_mask_t m, struct berval *s ));
 LDAP_SLAPD_F (int) str2loglevel LDAP_P(( const char *s, int *l ));
+LDAP_SLAPD_F (int) loglevel2bvarray LDAP_P(( int l, BerVarray *bva ));
+LDAP_SLAPD_F (const char *) loglevel2str LDAP_P(( int l ));
+LDAP_SLAPD_F (int) loglevel2bv LDAP_P(( int l, struct berval *bv ));
 
 /*
  * ch_malloc.c
@@ -651,12 +654,11 @@ LDAP_SLAPD_F (int) connection_state_closing LDAP_P(( Connection *c ));
 LDAP_SLAPD_F (const char *) connection_state2str LDAP_P(( int state ))
        LDAP_GCCATTR((const));
 
-LDAP_SLAPD_F (int) connection_write LDAP_P((ber_socket_t s));
-
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+LDAP_SLAPD_F (int) connection_write_activate LDAP_P((ber_socket_t s));
 LDAP_SLAPD_F (int) connection_read_activate LDAP_P((ber_socket_t s));
-LDAP_SLAPD_F (int) connection_read LDAP_P((ber_socket_t, Operation **));
 #else
+LDAP_SLAPD_F (int) connection_write LDAP_P((ber_socket_t s));
 LDAP_SLAPD_F (int) connection_read LDAP_P((ber_socket_t s));
 #endif
 
@@ -722,11 +724,6 @@ LDAP_SLAPD_F (RETSIGTYPE) slap_sig_shutdown LDAP_P((int sig));
 LDAP_SLAPD_F (RETSIGTYPE) slap_sig_wake LDAP_P((int sig));
 LDAP_SLAPD_F (void) slap_wake_listener LDAP_P((void));
 
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
-LDAP_SLAPD_F (int) slapd_suspend LDAP_P((ber_socket_t s));
-LDAP_SLAPD_F (void) slapd_resume LDAP_P((ber_socket_t s, int wake ));
-#endif
-
 LDAP_SLAPD_F (void) slapd_set_write LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (void) slapd_clr_write LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (void) slapd_set_read LDAP_P((ber_socket_t s, int wake));
@@ -1737,6 +1734,7 @@ LDAP_SLAPD_V (time_t)             starttime;
 
 LDAP_SLAPD_V (ldap_pvt_thread_pool_t)  connection_pool;
 LDAP_SLAPD_V (int)                     connection_pool_max;
+LDAP_SLAPD_V (int)                     slap_tool_thread_max;
 
 LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) entry2str_mutex;
 LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) replog_mutex;