@@ -139,6 +139,16 @@ VALUE backend_close(VALUE self) return Qtrue; } +VALUE backend_set_trace(VALUE self, VALUE state) +{ + backend_t *backend = NULL; + DATA_GET(self, backend_t, backend); + + backend->trace = (state == Qtrue); + + return state; +} + VALUE backend_set_maxfds(VALUE self, VALUE max) { struct rlimit rlim; @@ -176,11 +186,22 @@ static void backend_free(backend_t *backend) VALUE backend_alloc(VALUE klass) { backend_t *backend = ALLOC_N(backend_t, 1); - VALUE obj = Data_Wrap_Struct(klass, NULL, backend_free, backend); + VALUE obj = Data_Wrap_Struct(klass, NULL, backend_free, backend); + + backend->address = NULL; + backend->port = 3000; + backend->fd = -1; + backend->open = 0; + + backend->trace = 0; + + backend->obj = obj; + backend->app = Qnil; connections_init(backend); + backend->thread_count = 0; - backend->obj = obj; + backend->loop = NULL; return obj; } @@ -195,6 +216,7 @@ void backend_define(void) rb_define_protected_method(cBackend, "listen_on_port", backend_listen_on_port, 2); rb_define_protected_method(cBackend, "loop!", backend_loop, 0); rb_define_protected_method(cBackend, "close", backend_close, 0); + rb_define_protected_method(cBackend, "trace=", backend_set_trace, 1); rb_define_protected_method(cBackend, "maxfds=", backend_set_maxfds, 1); rb_define_protected_method(cBackend, "maxfds", backend_get_maxfds, 0); } ext/thin_backend/backend.c @@ -9,8 +9,7 @@ static void connection_writable_cb(EV_P_ struct ev_io *watcher, int revents) { - connection_t *c = get_ev_data(connection, watcher, write); - int sent; + connection_t *c = get_ev_data(connection, watcher, write); if (EV_ERROR & revents) { connection_error(c, "Error writing on connection socket"); @@ -20,11 +19,13 @@ static void connection_writable_cb(EV_P_ struct ev_io *watcher, int revents) if (c->write_buffer.len == 0) return; - sent = send(c->fd, - (char *) c->write_buffer.ptr + c->write_buffer.offset, - c->write_buffer.len - c->write_buffer.offset, - 0); + size_t sent; + size_t len = c->write_buffer.len - c->write_buffer.offset; + char *buf = (char *) c->write_buffer.ptr + c->write_buffer.offset; + trace(c->backend, buf, len); + + sent = send(c->fd, buf, len, 0); ev_timer_again(c->loop, &c->timeout_watcher); if (sent < 0) { @@ -39,7 +40,8 @@ static void connection_writable_cb(EV_P_ struct ev_io *watcher, int revents) /* if all the buffer is written we can clear it from memory */ buffer_reset(&c->write_buffer); - /* we can stream the request, so do do close it unless it's marked */ + /* we can stream the request, so do not close it unless it's marked + * as finished */ if (c->finished) connection_close(c); } @@ -54,7 +56,7 @@ void connection_watch_writable(connection_t *c) static void connection_readable_cb(EV_P_ struct ev_io *watcher, int revents) { connection_t *c = get_ev_data(connection, watcher, read); - size_t n; + size_t received; char buf[BUFFER_CHUNK_SIZE]; if (EV_ERROR & revents) { @@ -62,21 +64,23 @@ static void connection_readable_cb(EV_P_ struct ev_io *watcher, int revents) return; } - n = recv(c->fd, buf, BUFFER_CHUNK_SIZE, 0); + received = recv(c->fd, buf, BUFFER_CHUNK_SIZE, 0); ev_timer_again(c->loop, &c->timeout_watcher); - if (n == -1) { + if (received == -1) { /* error, closing connection */ connection_errno(c); return; } - if (n == 0) { + if (received == 0) { /* received 0 byte, read again next loop */ return; } - request_parse(c, buf, n); + trace(c->backend, buf, received); + + request_parse(c, buf, received); } static void connection_timeout_cb(EV_P_ struct ev_timer *watcher, int revents) ext/thin_backend/connection.c @@ -13,10 +13,4 @@ #define DATA_GET(from,type,name) Data_Get_Struct(from,type,name); RAISE_NOT_NULL(name); #define REQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "Wrong argument type for " # V " required " # T); -#ifdef DEBUG -#define trace(msg) fprintf(stderr, "[%s:%s:%d] %s\n", __FILE__, __FUNCTION__, __LINE__, msg) -#else -#define trace(msg) -#endif - #endif ext/thin_backend/ext_help.h @@ -81,9 +81,12 @@ struct backend_s { char *address; unsigned port; int fd; - unsigned open; + unsigned open : 1; struct sockaddr_in local_addr; + /* debugging */ + unsigned trace : 1; + /* ruby */ VALUE obj; /* Ruby Backend object */ VALUE app; /* Rack app */ @@ -113,6 +116,8 @@ struct backend_s { #define log_errno(b) log_error(b, strerror(errno)) +#define trace(b, msg, len) if (b->trace) { rb_funcall(b->obj, rb_intern("trace"), 1, rb_str_new(msg, len)); } + extern VALUE cStringIO; extern VALUE sInternedCall; extern VALUE sInternedKeys; ext/thin_backend/thin.h @@ -48,6 +48,8 @@ module Thin def config self.maxfds = @maximum_connections @maximum_connections = maxfds + + self.trace = Logging.trace? end def running? lib/thin/backends/turbo.rb 00fd626bc51f5095261114285a01311264862b4e macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin-turbo/commit/41921bb6a498b237fda43d57f4cb2baae91482f9 41921bb6a498b237fda43d57f4cb2baae91482f9 2008-06-02T19:37:59-07:00 2008-06-02T19:37:59-07:00 Add trace support a38bf0b741a9a8e75942395244417a5180002aba macournoyer macournoyer@gmail.com