Fix typo in write select. Fix errors in WINSOCK handling.

Add test listener no-thread_create experiment (behind ifdef).

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index a24310d6e8e56d8cc927821de35bc3df6dfda42d..63c5923a91dd76dda97b00c99b2aea02ba94a684 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -485,18 +485,22 @@ slapd_daemon_task(
                /* loop through the writers */
 #ifdef HAVE_WINSOCK
                for ( i = 0; i < writefds.fd_count; i++ ) {
-                       if ( writefds.fd_array[i] == tcps ) {
+                       int wd = writefds.fd_array[i];
+
+                       if ( wd == tcps ) {
                                continue;
                        }
+
                        Debug( LDAP_DEBUG_CONNS,
                                "daemon: signalling write waiter on %d\n",
-                               writefds.fd_array[i], 0, 0 );
-                       assert( FD_ISSET( 0, &slap_daemon.sd_actives) );
+                               wd, 0, 0 );
 
-                       slapd_clr_write( writefds.fd_array[i], 0 );
-                       if ( connection_write( writefds.fd_array[i] ) < 0 ) {
-                               FD_CLR( writefds.fd_array[i], &readfds );
-                               slapd_close( writefds.fd_array[i] );
+                       assert( FD_ISSET( wd, &slap_daemon.sd_actives) );
+
+                       slapd_clr_write( wd, 0 );
+                       if ( connection_write( wd ) < 0 ) {
+                               FD_CLR( wd, &readfds );
+                               slapd_close( wd );
                        }
                }
 #else
@@ -508,7 +512,7 @@ slapd_daemon_task(
                                Debug( LDAP_DEBUG_CONNS,
                                    "daemon: signaling write waiter on %d\n", i, 0, 0 );
 
-                               assert( FD_ISSET( 0, &slap_daemon.sd_actives) );
+                               assert( FD_ISSET( i, &slap_daemon.sd_actives) );
 
                                /* clear the write flag */
                                slapd_clr_write( i, 0 );
@@ -523,15 +527,16 @@ slapd_daemon_task(
 
 #ifdef HAVE_WINSOCK
                for ( i = 0; i < readfds.fd_count; i++ ) {
-                       if ( readfds.fd_array[i] == tcps ) {
+                       int rd = readfds.fd_array[i];
+                       if ( rd == tcps ) {
                                continue;
                        }
                        Debug ( LDAP_DEBUG_CONNS,
-                               "daemon: read activity on %d\n", readfds.fd_array[i], 0, 0 );
-                       assert( FD_ISSET( readfds.fd_array[i], &slap_daemon.sd_actives) );
+                               "daemon: read activity on %d\n", rd, 0, 0 );
+                       assert( FD_ISSET( rd, &slap_daemon.sd_actives) );
 
-                       if ( connection_read( readfds.fd_array[i] ) < 0 ) {
-                               slapd_close( i );
+                       if ( connection_read( rd ) < 0 ) {
+                               slapd_close( rd );
                        }
                }
 #else
@@ -593,18 +598,26 @@ int slapd_daemon( int inetd, int tcps )
        args[0] = inetd;
        args[1] = tcps;
 
-       status = ldap_pvt_thread_create( &listener_tid, 0,
-                                        slapd_daemon_task, args );
+#define SLAPD_LISTENER_THREAD 1
+#if SLAPD_LISTENER_THREAD
+       /* listener as a separate THREAD */
+       status = ldap_pvt_thread_create( &listener_tid,
+               0, slapd_daemon_task, args );
 
        if ( status != 0 ) {
                Debug( LDAP_DEBUG_ANY,
                    "listener ldap_pvt_thread_create failed (%d)\n", status, 0, 0 );
                return -1;
-       } else {
-               /* wait for the listener thread to complete */
-               ldap_pvt_thread_join( listener_tid, (void *) NULL );
        }
 
+       /* wait for the listener thread to complete */
+       ldap_pvt_thread_join( listener_tid, (void *) NULL );
+#else
+       /* expermimental code */
+       listener_tid = pthread_self();
+       slapd_daemon_task( args );
+#endif
+
        return 0;
 }
 

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index b47099ab1f2e3b2313ef0a650948548e828ba93b..014cdc42e905765c5f16c5697602b2325970a0e5 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -34,8 +34,9 @@ send_ldap_result2(
        if ( err == LDAP_PARTIAL_RESULTS && (text == NULL || *text == '\0') )
                err = LDAP_NO_SUCH_OBJECT;
 
-       Debug( LDAP_DEBUG_TRACE, "send_ldap_result %d:%s:%s\n", err, matched ?
-           matched : "", text ? text : "" );
+       Debug( LDAP_DEBUG_TRACE, "send_ldap_result %d:%s:%s\n", err,
+               matched ?  matched : "",
+               text ? text : "" );
 
        switch ( op->o_tag ) {
        case LBER_DEFAULT: