Merged in per cache entry reader/writer locks from OPENLDAP_DEVEL_THREAD

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 1026f45c7ea0394bbe6c418ffee77ed55d46d27c..509ed6a275947cdffbc928ea375b136afcaa1daf 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -195,6 +195,9 @@ slapd_daemon(
                FD_ZERO( &readfds );
                FD_SET( tcps, &readfds );
 
+               zero.tv_sec = 0;
+               zero.tv_usec = 0;
+
                pthread_mutex_lock( &active_threads_mutex );
                Debug( LDAP_DEBUG_CONNS,
                    "listening for connections on %d, activity on:",
@@ -215,11 +218,9 @@ slapd_daemon(
                Debug( LDAP_DEBUG_CONNS, "\n", 0, 0, 0 );
                pthread_mutex_unlock( &new_conn_mutex );
 
-               zero.tv_sec = 0;
-               zero.tv_usec = 0;
                Debug( LDAP_DEBUG_CONNS, "before select active_threads %d\n",
                    active_threads, 0, 0 );
-#ifdef PTHREAD_PREEMPTIVE
+#if    defined(PTHREAD_PREEMPTIVE) || defined(NO_THREADS)
                tvp = NULL;
 #else
                tvp = active_threads ? &zero : NULL;