Changeset 650

Timestamp:

08/30/2005 10:42:06 AM (3 years ago)

Author:

jan

Message:

let kqueue startup after daemonize is done

Location:

branches/lighttpd-merge-1.4.x/src

Files:

• connections.c (modified) (3 diffs)
• fdevent_freebsd_kqueue.c (modified) (2 diffs)
• network.c (modified) (1 diff)
• server.c (modified) (1 diff)

branches/lighttpd-merge-1.4.x/src/connections.c

@@ -1065 +1065 @@
 
 connection *connection_accept(server *srv, server_socket *srv_socket) {
-        int accepted_requests = 0;
         /* accept everything */
 
@@ -1079 +1078 @@
                 if ((errno != EAGAIN) &&
                     (errno != EINTR)) {
-                        log_error_write(srv, __FILE__, __LINE__, "ss", "accept failed: ", strerror(errno));
+                        log_error_write(srv, __FILE__, __LINE__, "ssd", "accept failed:", strerror(errno), errno);
                 }
                 return NULL;
@@ -1087 +1086 @@
                 srv->cur_fds++;
                 
-                accepted_requests++;
                 /* ok, we have the connection, register it */
 #if 0

branches/lighttpd-merge-1.4.x/src/fdevent_freebsd_kqueue.c

@@ -150 +150 @@
 
 static int fdevent_freebsd_kqueue_reset(fdevents *ev) {
-        close(ev->kq_fd);
-        
         if (-1 == (ev->kq_fd = kqueue())) {
                 fprintf(stderr, "%s.%d: kqueue failed (%s), try to set server.event-handler = \"poll\" or \"select\"\n",
@@ -179 +177 @@
         SET(event_get_revent);
 
-        if (-1 == (ev->kq_fd = kqueue())) {
-                fprintf(stderr, "%s.%d: kqueue failed (%s), try to set server.event-handler = \"poll\" or \"select\"\n",
-                        __FILE__, __LINE__, strerror(errno));
-                
-                return -1;
-        }
+        ev->kq_fd = -1;
+
         ev->kq_results = calloc(ev->maxfds, sizeof(*ev->kq_results));
         ev->kq_bevents = bitset_init(ev->maxfds);

branches/lighttpd-merge-1.4.x/src/network.c

@@ -407 +407 @@
         size_t i;
         
-        fdevent_reset(srv->ev);
+        if (-1 == fdevent_reset(srv->ev)) {
+                return -1;
+        }
         
         /* register fdevents after reset */

branches/lighttpd-merge-1.4.x/src/server.c

@@ -671 +671 @@
         }
         
-        /* kqueue needs a reset AFTER daemonize() */
+        /* 
+         * kqueue() is called here, select resets its internals, 
+         * all server sockets get their handlers
+         *
+         * */
         if (0 != network_register_fdevents(srv)) {
                 plugins_free(srv);