Remove out-of-fd-handling.

include/lighttpd/chunk.h

@@ -59,7 +59,7 @@ struct chunkiter {
  ******************/
 
 /* open the file cf->name if it is not already opened for reading
- * may return HANDLER_GO_ON, HANDLER_ERROR, HANDLER_WAIT_FOR_FD
+ * may return HANDLER_GO_ON, HANDLER_ERROR
  */
 LI_API handler_t chunkfile_open(struct vrequest *vr, chunkfile *cf);
 
@@ -75,7 +75,7 @@ INLINE goffset chunkiter_length(chunkiter iter);
  * but needs to do io in case of FILE_CHUNK; it tries mmap and
  * falls back to read(...)
  * the data is _not_ marked as "done"
- * may return HANDLER_GO_ON, HANDLER_ERROR, HANDLER_WAIT_FOR_FD
+ * may return HANDLER_GO_ON, HANDLER_ERROR
  */
 LI_API handler_t chunkiter_read(struct vrequest *vr, chunkiter iter, off_t start, off_t length, char **data_start, off_t *data_len);
 

include/lighttpd/network.h

@@ -15,8 +15,7 @@ typedef enum {
 	NETWORK_STATUS_CONNECTION_CLOSE,
 	NETWORK_STATUS_WAIT_FOR_EVENT,      /**< read/write returned -1 with errno=EAGAIN/EWOULDBLOCK; no real IO was done
 	                                         internal: some io may be done */
-	NETWORK_STATUS_WAIT_FOR_AIO_EVENT,  /**< nothing done yet, read/write will be done somewhere else */
-	NETWORK_STATUS_WAIT_FOR_FD,         /**< need a fd to open a file */
+	NETWORK_STATUS_WAIT_FOR_AIO_EVENT   /**< nothing done yet, read/write will be done somewhere else */
 } network_status_t;
 
 /** repeats write after EINTR */

include/lighttpd/server.h

@@ -90,6 +90,8 @@ LI_API void server_stop(server *srv);
 /* exit asap with cleanup */
 LI_API void server_exit(server *srv);
 
-GString *server_current_timestamp();
+LI_API GString *server_current_timestamp();
+
+LI_API void server_out_of_fds(server *srv);
 
 #endif

include/lighttpd/typedefs.h

@@ -10,8 +10,7 @@ typedef enum {
 	HANDLER_GO_ON,
 	HANDLER_COMEBACK,
 	HANDLER_WAIT_FOR_EVENT,
-	HANDLER_ERROR,
-	HANDLER_WAIT_FOR_FD
+	HANDLER_ERROR
 } handler_t;
 
 /* structs from headers, in alphabetic order */

src/actions.c

@@ -219,7 +219,6 @@ handler_t action_execute(vrequest *vr) {
 				action_stack_reset(vr, as);
 			case HANDLER_COMEBACK:
 			case HANDLER_WAIT_FOR_EVENT:
-			case HANDLER_WAIT_FOR_FD:
 				return res;
 			}
 			continue;
@@ -254,7 +253,6 @@ handler_t action_execute(vrequest *vr) {
 				action_stack_reset(vr, as);
 			case HANDLER_COMEBACK:
 			case HANDLER_WAIT_FOR_EVENT:
-			case HANDLER_WAIT_FOR_FD:
 				return res;
 			}
 			break;
@@ -275,7 +273,6 @@ handler_t action_execute(vrequest *vr) {
 				action_stack_reset(vr, as);
 			case HANDLER_COMEBACK:
 			case HANDLER_WAIT_FOR_EVENT:
-			case HANDLER_WAIT_FOR_FD:
 				return res;
 			}
 			break;
@@ -297,7 +294,6 @@ handler_t action_execute(vrequest *vr) {
 				action_stack_reset(vr, as);
 			case HANDLER_COMEBACK:
 			case HANDLER_WAIT_FOR_EVENT:
-			case HANDLER_WAIT_FOR_FD:
 				return res;
 			}
 			break;

src/chunk.c

@@ -41,7 +41,7 @@ static void chunkfile_release(chunkfile *cf) {
 }
 
 /* open the file cf->name if it is not already opened for reading
- * may return HANDLER_GO_ON, HANDLER_ERROR, HANDLER_WAIT_FOR_FD
+ * may return HANDLER_GO_ON, HANDLER_ERROR
  */
 handler_t chunkfile_open(vrequest *vr, chunkfile *cf) {
 	if (!cf) return HANDLER_ERROR;
@@ -51,7 +51,9 @@ handler_t chunkfile_open(vrequest *vr, chunkfile *cf) {
 		return HANDLER_ERROR;
 	}
 	if (-1 == (cf->fd = open(cf->name->str, O_RDONLY))) {
-		if (EMFILE == errno) return HANDLER_WAIT_FOR_FD;
+		if (EMFILE == errno) {
+			server_out_of_fds(vr->con->srv);
+		}
 		VR_ERROR(vr, "Couldn't open file '%s': %s", GSTR_SAFE_STR(cf->name), g_strerror(errno));
 		return HANDLER_ERROR;
 	}
@@ -81,7 +83,7 @@ handler_t chunkfile_open(vrequest *vr, chunkfile *cf) {
  * but needs to do io in case of FILE_CHUNK; it tries mmap and
  * falls back to read(...)
  * the data is _not_ marked as "done"
- * may return HANDLER_GO_ON, HANDLER_ERROR, HANDLER_WAIT_FOR_FD
+ * may return HANDLER_GO_ON, HANDLER_ERROR
  */
 handler_t chunkiter_read(vrequest *vr, chunkiter iter, off_t start, off_t length, char **data_start, off_t *data_len) {
 	chunk *c = chunkiter_chunk(iter);

src/connection.c

@@ -156,7 +156,6 @@ static gboolean connection_handle_read(connection *con) {
 			return TRUE;
 		case HANDLER_ERROR:
 		case HANDLER_COMEBACK: /* unexpected */
-		case HANDLER_WAIT_FOR_FD: /* unexpected */
 			/* unparsable header */
 			connection_error(con);
 			return FALSE;
@@ -211,10 +210,6 @@ static void connection_cb(struct ev_loop *loop, ev_io *w, int revents) {
 				/* TODO: aio */
 				ev_io_rem_events(loop, w, EV_READ);
 				break;
-			case NETWORK_STATUS_WAIT_FOR_FD:
-				/* TODO: wait for fd */
-				ev_io_rem_events(loop, w, EV_READ);
-				break;
 			}
 		}
 	}
@@ -239,11 +234,6 @@ static void connection_cb(struct ev_loop *loop, ev_io *w, int revents) {
 				_ERROR(con->srv, con->mainvr, "%s", "TODO: wait for aio");
 				/* TODO: aio */
 				break;
-			case NETWORK_STATUS_WAIT_FOR_FD:
-				ev_io_rem_events(loop, w, EV_WRITE);
-				_ERROR(con->srv, con->mainvr, "%s", "TODO: wait for fd");
-				/* TODO: wait for fd */
-				break;
 			}
 		} else {
 			_DEBUG(con->srv, con->mainvr, "%s", "write event for empty queue");

src/modules/mod_fastcgi.c

@@ -461,10 +461,6 @@ static void fastcgi_fd_cb(struct ev_loop *loop, ev_io *w, int revents) {
 				/* TODO: aio */
 				ev_io_rem_events(loop, w, EV_READ);
 				break;
-			case NETWORK_STATUS_WAIT_FOR_FD:
-				/* TODO: wait for fd */
-				ev_io_rem_events(loop, w, EV_READ);
-				break;
 			}
 		}
 	}
@@ -490,10 +486,6 @@ static void fastcgi_fd_cb(struct ev_loop *loop, ev_io *w, int revents) {
 				ev_io_rem_events(loop, w, EV_WRITE);
 				/* TODO: aio */
 				break;
-			case NETWORK_STATUS_WAIT_FOR_FD:
-				ev_io_rem_events(loop, w, EV_WRITE);
-				/* TODO: wait for fd */
-				break;
 			}
 		}
 		if (fcon->fcgi_out->length == 0) {
@@ -533,10 +525,12 @@ static handler_t fastcgi_statemachine(vrequest *vr, fastcgi_connection *fcon) {
 
 		/* fall through */
 	case FS_CONNECT:
-		fcon->fd = socket(fcon->ctx->socket.addr->plain.sa_family, SOCK_STREAM, 0);
+		do {
+			fcon->fd = socket(fcon->ctx->socket.addr->plain.sa_family, SOCK_STREAM, 0);
+		} while (-1 == fcon->fd && errno == EINTR);
 		if (-1 == fcon->fd) {
-			if (errno == EMFILE || errno == EINTR) {
-				return HANDLER_WAIT_FOR_FD;
+			if (errno == EMFILE) {
+				server_out_of_fds(vr->con->srv);
 			}
 			VR_ERROR(vr, "Couldn't open socket: %s", g_strerror(errno));
 			return HANDLER_ERROR;

src/network_sendfile.c

@@ -170,8 +170,6 @@ static network_status_t network_backend_sendfile(vrequest *vr, int fd, chunkqueu
 		switch (chunkfile_open(vr, c->file.file)) {
 		case HANDLER_GO_ON:
 			break;
-		case HANDLER_WAIT_FOR_FD:
-			return NETWORK_STATUS_WAIT_FOR_FD;
 		default:
 			return NETWORK_STATUS_FATAL_ERROR;
 		}

src/network_write.c

@@ -17,8 +17,6 @@ network_status_t network_backend_write(vrequest *vr, int fd, chunkqueue *cq, gof
 		switch (chunkiter_read(vr, ci, 0, blocksize, &block_data, &block_len)) {
 		case HANDLER_GO_ON:
 			break;
-		case HANDLER_WAIT_FOR_FD:
-			return did_write_something ? NETWORK_STATUS_SUCCESS : NETWORK_STATUS_WAIT_FOR_FD;
 		case HANDLER_ERROR:
 		default:
 			return NETWORK_STATUS_FATAL_ERROR;

src/server.c

@@ -230,7 +230,8 @@ static void server_listen_cb(struct ev_loop *loop, ev_io *w, int revents) {
 		break;
 
 	case EMFILE: /* we are out of FDs */
-		/* TODO: server_out_of_fds(srv, NULL); */
+		server_out_of_fds(srv);
+		/* TODO: disable accept callbacks? */
 		break;
 	default:
 		ERROR(srv, "accept failed on fd=%d with error: %s", w->fd, g_strerror(errno));
@@ -355,3 +356,7 @@ GString *server_current_timestamp() {
 
 	return ts_str;
 }
+
+void server_out_of_fds(server *srv) {
+	ERROR(srv, "%s", "Too many open files. Either raise your fd limit or use a lower connection limit.");
+}

src/virtualrequest.c

@@ -212,7 +212,6 @@ static gboolean vrequest_do_handle_actions(vrequest *vr) {
 	case HANDLER_COMEBACK:
 		vrequest_joblist_append(vr); /* come back later */
 		return FALSE;
-	case HANDLER_WAIT_FOR_FD: /* TODO: wait for fd */
 	case HANDLER_WAIT_FOR_EVENT:
 		return FALSE;
 	case HANDLER_ERROR:
@@ -235,7 +234,6 @@ static gboolean vrequest_do_handle_read(vrequest *vr) {
 		case HANDLER_COMEBACK:
 			vrequest_joblist_append(vr); /* come back later */
 			return FALSE;
-		case HANDLER_WAIT_FOR_FD: /* TODO: wait for fd */
 		case HANDLER_WAIT_FOR_EVENT:
 			return FALSE;
 		case HANDLER_ERROR:
@@ -260,7 +258,6 @@ static gboolean vrequest_do_handle_write(vrequest *vr) {
 	case HANDLER_COMEBACK:
 		vrequest_joblist_append(vr); /* come back later */
 		return FALSE;
-	case HANDLER_WAIT_FOR_FD: /* TODO: wait for fd */
 	case HANDLER_WAIT_FOR_EVENT:
 		return FALSE;
 	case HANDLER_ERROR:
@@ -297,7 +294,6 @@ void vrequest_state_machine(vrequest *vr) {
 				vrequest_joblist_append(vr); /* come back later */
 				done = TRUE;
 				break;
-			case HANDLER_WAIT_FOR_FD: /* TODO: wait for fd */
 			case HANDLER_WAIT_FOR_EVENT:
 				done = (vr->state == VRS_HANDLE_REQUEST_HEADERS);
 				break;
@@ -323,7 +319,6 @@ void vrequest_state_machine(vrequest *vr) {
 				vrequest_joblist_append(vr); /* come back later */
 				done = TRUE;
 				break;
-			case HANDLER_WAIT_FOR_FD: /* TODO: wait for fd */
 			case HANDLER_WAIT_FOR_EVENT:
 				done = (vr->state == VRS_HANDLE_REQUEST_HEADERS);
 				break;