@@ -1,2 +1,2 @@ * BUG: hangs on file upload 1 time out of 2 -* disable timeout when calling the Rack app \ No newline at end of file +* BUG: crash in Rails multipart parsing on big file upload \ No newline at end of file TODO @@ -9,6 +9,11 @@ static void backend_accept_cb(EV_P_ struct ev_io *watcher, int revents) socklen_t sin_size = sizeof(remote_addr); int fd, flags; + if (EV_ERROR & revents) { + rb_sys_fail("Error on acceptor socket"); + return; + } + fd = accept(backend->fd, (struct sockaddr *)&remote_addr, &sin_size); if (fd == -1) { log_errno(backend); @@ -83,7 +88,7 @@ VALUE backend_listen_on_port(VALUE self, VALUE address, VALUE port) if (setsockopt(backend->fd, SOL_SOCKET, SO_REUSEADDR, &sock_flags, sizeof(sock_flags)) == -1) rb_sys_fail("setsockopt(SO_REUSEADDR)"); - if (bind(backend->fd, (struct sockaddr *)&backend->local_addr, sizeof backend->local_addr) == -1) + if (bind(backend->fd, (struct sockaddr *)&backend->local_addr, sizeof(backend->local_addr)) == -1) rb_sys_fail("bind"); if (listen(backend->fd, LISTEN_BACKLOG) == -1) @@ -91,7 +96,7 @@ VALUE backend_listen_on_port(VALUE self, VALUE address, VALUE port) /* initialise watchers */ backend->accept_watcher.data = backend; - ev_io_init(&backend->accept_watcher, backend_accept_cb, backend->fd, EV_READ); + ev_io_init(&backend->accept_watcher, backend_accept_cb, backend->fd, EV_READ | EV_ERROR); backend->prepare_watcher.data = backend; ev_prepare_init(&backend->prepare_watcher, backend_prepare_cb); ext/thin_backend/backend.c @@ -12,6 +12,11 @@ static void connection_writable_cb(EV_P_ struct ev_io *watcher, int revents) connection_t *c = get_ev_data(connection, watcher, write); int sent; + if (EV_ERROR & revents) { + connection_error(c, "Error writing on connection socket"); + return; + } + if (c->write_buffer.len == 0) return; @@ -44,6 +49,7 @@ static void connection_writable_cb(EV_P_ struct ev_io *watcher, int revents) void connection_watch_writable(connection_t *c) { ev_io_start(c->loop, &c->write_watcher); + ev_timer_start(c->loop, &c->timeout_watcher); } static void connection_readable_cb(EV_P_ struct ev_io *watcher, int revents) @@ -52,6 +58,11 @@ static void connection_readable_cb(EV_P_ struct ev_io *watcher, int revents) size_t n; char buf[BUFFER_CHUNK_SIZE]; + if (EV_ERROR & revents) { + connection_error(c, "Error reading on connection socket"); + return; + } + n = recv(c->fd, buf, BUFFER_CHUNK_SIZE, 0); ev_timer_again(c->loop, &c->timeout_watcher); @@ -115,8 +126,8 @@ void connection_start(backend_t *backend, int fd, struct sockaddr_in remote_addr c->read_watcher.data = c; c->write_watcher.data = c; c->timeout_watcher.data = c; - ev_io_init(&c->read_watcher, connection_readable_cb, c->fd, EV_READ); - ev_io_init(&c->write_watcher, connection_writable_cb, c->fd, EV_WRITE); + ev_io_init(&c->read_watcher, connection_readable_cb, c->fd, EV_READ | EV_ERROR); + ev_io_init(&c->write_watcher, connection_writable_cb, c->fd, EV_WRITE | EV_ERROR); ev_timer_init(&c->timeout_watcher, connection_timeout_cb, backend->timeout, backend->timeout); /* start event watchers */ @@ -124,17 +135,6 @@ void connection_start(backend_t *backend, int fd, struct sockaddr_in remote_addr ev_io_start(c->loop, &c->read_watcher); } -void connection_error(connection_t *c, const char *msg) -{ - log_error(c->backend, msg); - connection_close(c); -} - -void connection_errno(connection_t *c) -{ - connection_error(c, strerror(errno)); -} - void connection_close(connection_t *c) { ev_io_stop(c->loop, &c->read_watcher); ext/thin_backend/connection.c @@ -62,6 +62,7 @@ void request_parse(connection_t *c, char *buf, int len) /* request fully received */ if (http_parser_is_finished(&c->parser) && c->read_buffer.len >= c->content_length) { + ev_timer_stop(c->loop, &c->timeout_watcher); ev_io_stop(c->loop, &c->read_watcher); /* assign env[rack.input] */ ext/thin_backend/request.c @@ -123,9 +123,10 @@ void backend_define(void); /* connection */ void connection_start(backend_t *backend, int fd, struct sockaddr_in remote_addr); -void connection_error(connection_t *c, const char *msg); -void connection_errno(connection_t *c); void connection_close(connection_t *connection); +/* error handling macros (so we can get line number and stuff) */ +#define connection_error(c, msg) log_error((c)->backend, msg); connection_close(c) +#define connection_errno(c) connection_error(c, strerror(errno)) /* request & response */ void request_parse(connection_t *connection, char *buf, int len); ext/thin_backend/thin.h @@ -17,7 +17,7 @@ class App def call(env) sleep 10 if env['PATH_INFO'] == '/slow' - # puts env['rack.input'].read if env['CONTENT_LENGTH'].to_i > 0 + puts env['rack.input'].read.size if env['CONTENT_LENGTH'].to_i > 0 [ 200, { script/app.ru abdd36a52b9d48107b12ecec4f275512c2b49cfd macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin-turbo/commit/3617273054daa8b164aafc4568f1ff822ff16075 3617273054daa8b164aafc4568f1ff822ff16075 2008-06-02T18:51:41-07:00 2008-06-02T18:51:41-07:00 disable timeout when calling the Rack app handle EV_ERROR in event callbacks 4579d3642cc08d6156f8796bedf7f5bda2839a1a macournoyer macournoyer@gmail.com