]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
Revert last change
authorKurt Zeilenga <kurt@openldap.org>
Fri, 26 Oct 2001 06:49:03 +0000 (06:49 +0000)
committerKurt Zeilenga <kurt@openldap.org>
Fri, 26 Oct 2001 06:49:03 +0000 (06:49 +0000)
servers/slapd/daemon.c

index 8c836f3881c232c9035dd156f3151d48f8d2b61e..efdef869f5a464a93b887e957f57c5735a913c47 100644 (file)
@@ -717,7 +717,6 @@ slapd_daemon_task(
                ber_socket_t nfds;
 #define SLAPD_EBADF_LIMIT 16
                int ebadf = 0;
-               int emfile = 0;
 
 #define SLAPD_IDLE_CHECK_LIMIT 4
                time_t  now = slap_get_time();
@@ -728,14 +727,14 @@ slapd_daemon_task(
                Sockaddr                from;
 
 #if defined(SLAPD_RLOOKUPS)
-               struct hostent          *hp;
+       struct hostent          *hp;
 #endif
                struct timeval          zero;
                struct timeval          *tvp;
 
-               if( emfile || ( global_idletimeout > 0 && difftime(
+               if( global_idletimeout > 0 && difftime(
                        last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT,
-                       now ) < 0 ))
+                       now ) < 0 )
                {
                        connections_timeout_idle(now);
                }
@@ -882,39 +881,13 @@ slapd_daemon_task(
                                (struct sockaddr *) &from, &len );
                        if ( s == AC_SOCKET_INVALID ) {
                                int err = sock_errno();
-
-#ifdef EMFILE
-                               if( err == EMFILE ) {
-                                       emfile++;
-                               } else
-#endif
-#ifdef ENFILE
-                               if( err == ENFILE ) {
-                                       emfile++;
-                               } else 
-#endif
-                               {
-                                       emfile=0;
-                               }
-
-                               if( emfile < 3 ) {
-                                       Debug( LDAP_DEBUG_ANY,
-                                           "daemon: accept(%ld) failed errno=%d (%s)\n",
-                                           (long) slap_listeners[l]->sl_sd, err,
-                                           sock_errstr(err) );
-                               } else {
-                                       /* prevent busy loop */
-#  ifdef HAVE_USLEEP
-                                       if( emfile % 4 == 3 ) usleep( 250 );
-#  else
-                                       if( emfile % 8 == 7 ) sleep( 1 );
-#  endif
-                               }
-
+                               Debug( LDAP_DEBUG_ANY,
+                                   "daemon: accept(%ld) failed errno=%d (%s)\n",
+                                   (long) slap_listeners[l]->sl_sd, err,
+                                   sock_errstr(err) );
                                ldap_pvt_thread_yield();
                                continue;
                        }
-                       emfile = 0;
 
 #ifndef HAVE_WINSOCK
                        /* make sure descriptor number isn't too great */
@@ -922,7 +895,6 @@ slapd_daemon_task(
                                Debug( LDAP_DEBUG_ANY,
                                        "daemon: %ld beyond descriptor table size %ld\n",
                                        (long) s, (long) dtblsize, 0 );
-
                                slapd_close(s);
                                ldap_pvt_thread_yield();
                                continue;