]> git.sur5r.net Git - openldap/commitdiff
fix -USLAP_LIGHTWEIGHT_DISPACTHER sl_busy issue
authorKurt Zeilenga <kurt@openldap.org>
Thu, 3 Nov 2005 18:50:04 +0000 (18:50 +0000)
committerKurt Zeilenga <kurt@openldap.org>
Thu, 3 Nov 2005 18:50:04 +0000 (18:50 +0000)
servers/slapd/daemon.c
servers/slapd/slap.h

index 857a6bb1ca0c3453ee1b0bbf73e74c639fe4d4cb..49007b612dd6b32dcd935aa46509cc751fa0f206 100644 (file)
@@ -1756,7 +1756,12 @@ slapd_daemon_task(
 
                        if ( lr->sl_sd == AC_SOCKET_INVALID ) continue;
 
-                       if ( lr->sl_mute || lr->sl_busy ) {
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+                       if ( lr->sl_mute || lr->sl_busy )
+#else
+                       if ( lr->sl_mute )
+#endif
+                       {
                            SLAP_SOCK_CLR_READ( lr->sl_sd );
                        } else {
                                SLAP_SOCK_SET_READ( lr->sl_sd );
@@ -1823,12 +1828,14 @@ slapd_daemon_task(
                                continue;
                        }
 
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
                        if ( lr->sl_busy ) {
                                Debug( LDAP_DEBUG_CONNS,
                                        "daemon: select: listen=%d busy\n",
                                        lr->sl_sd, 0, 0 );
                                continue;
                        }
+#endif
 
                        Debug( LDAP_DEBUG_CONNS,
                                "daemon: select: listen=%d active_threads=%d tvp=%s\n",
index c4b35ad52564bf24aa7348b380096af0d8227c04..4514a45d181760b53179f041674dfc2915dc5cdd 100644 (file)
@@ -2744,7 +2744,7 @@ struct slap_listener {
 #endif
        int     sl_mute;        /* Listener is temporarily disabled due to emfile */
 #ifdef SLAP_LIGHTWEIGHT_DISPATCHER
-       int     sl_busy;        /* Listener is busy (accept thread activated */
+       int     sl_busy;        /* Listener is busy (accept thread activated) */
 #endif
        ber_socket_t sl_sd;
        Sockaddr sl_sa;