Changeset 343

Timestamp:

05/05/2005 08:15:05 AM (3 years ago)

Author:

jan

Message:

remove FDEVENT_OUT as soon as we hit _READ and only call joblist_append() if really needed

Files:

• branches/lighttpd-1.3.x/src/mod_fastcgi.c (modified) (10 diffs)

branches/lighttpd-1.3.x/src/mod_fastcgi.c

@@ -751 +751 @@
                 /* create socket */
                 if (-1 == bind(fcgi_fd, fcgi_addr, servlen)) {
-                        log_error_write(srv, __FILE__, __LINE__, "ss", 
-                                "bind failed:", strerror(errno));
+                        log_error_write(srv, __FILE__, __LINE__, "sbds", 
+                                "bind failed for:", 
+                                proc->socket, 
+                                proc->port, 
+                                strerror(errno));
                         return -1;
                 }
@@ -2361 +2364 @@
         /* sanity check */      
         if (!host ||
-            ((!host->host->used || !host->port) && !host->unixsocket->used)) return HANDLER_ERROR;
-        
+            ((!host->host->used || !host->port) && !host->unixsocket->used)) {
+                log_error_write(srv, __FILE__, __LINE__, "sxddd", 
+                                "write-req: error",
+                                host,
+                                host->host->used,
+                                host->port,
+                                host->unixsocket->used);
+                return HANDLER_ERROR;
+        }
+        
+
         switch(hctx->state) {
         case FCGI_STATE_INIT:
@@ -2547 +2559 @@
                 
                 if (hctx->write_offset == hctx->write_buffer->used) {
+                        /* we don't need the out event anymore */
+                        fdevent_event_del(srv->ev, &(hctx->fde_ndx), hctx->fd);
+                        fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
                         fcgi_set_state(srv, hctx, FCGI_STATE_READ);
                 }
@@ -2553 +2568 @@
         case FCGI_STATE_READ:
                 /* waiting for a response */
-                
-                fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
-                
                 break;
         default:
@@ -2657 +2669 @@
                 return HANDLER_WAIT_FOR_FD;
         default:
+                log_error_write(srv, __FILE__, __LINE__, "s", "subrequest write-req default");
                 return HANDLER_ERROR;
         }
@@ -2694 +2707 @@
         fcgi_extension_host *host= hctx->host;
 
-        joblist_append(srv, con);
-        
         if ((revents & FDEVENT_IN) &&
             hctx->state == FCGI_STATE_READ) {
@@ -2725 +2736 @@
                         }
                         
+                        joblist_append(srv, con);
                         return HANDLER_FINISHED;
                 case -1:
@@ -2806 +2818 @@
                         
                         
+                        joblist_append(srv, con);
                         return HANDLER_FINISHED;
                 }
@@ -2859 +2872 @@
                         connection_set_state(srv, con, CON_STATE_ERROR);
                         fcgi_connection_close(srv, hctx);
+                        joblist_append(srv, con);
                 }
         } else if (revents & FDEVENT_ERR) {
@@ -2868 +2882 @@
                 connection_set_state(srv, con, CON_STATE_ERROR);
                 fcgi_connection_close(srv, hctx);
+                joblist_append(srv, con);
         }