@@ -9,6 +9,8 @@ ext/*/vc60.pdb ext/*/*.so lib/*.bundle lib/*.so +test/*.o +test/*_test log spec/rails_app/log doc/rdoc/* .gitignore @@ -11,4 +11,8 @@ Dir['tasks/**/*.rake'].each { |rake| load rake } task :default => :spec ext_task :thin_parser -ext_task :thin_backend \ No newline at end of file +ext_task :thin_backend + +task :test do + cd 'test' { sh 'make test' } +end \ No newline at end of file Rakefile @@ -39,23 +39,22 @@ int thin_print_headers(thin_connection_t *connection, char *str) void thin_connection_writable_cb(EV_P_ struct ev_io *watcher, int revents) { thin_connection_t *connection = get_ev_data(connection, watcher, write); - char *msg; - int n; + char *resp; + int n, sent; /* TODO write in chunk */ - /* TODO get rid of that malloc or do something less stupid! */ - msg = (char *) malloc(connection->body.len + 1024); + resp = (char *) palloc(connection->buffer_pool, + connection->body.len / connection->buffer_pool->size + 1); - n = sprintf(msg, "HTTP/1.1 %d OK\r\n", connection->status); - n += thin_print_headers(connection, (char *) msg + n); - n += sprintf((char *) msg + n, "\r\n%s", connection->body.ptr); + n = sprintf(resp, "HTTP/1.1 %d OK\r\n", connection->status); + n += thin_print_headers(connection, (char *) resp + n); + n += sprintf((char *) resp + n, "\r\n%s", connection->body.ptr); - if (send(connection->fd, msg, n, 0) < 0) - rb_sys_fail("send"); - - free(msg); /* see, doesn't make sense... */ + sent = send(connection->fd, resp, n, 0); + /* TODO do something w/ sent, maybe buffer, not all sent? */ + pfree(connection->buffer_pool, resp); watcher->cb = thin_connection_closable_cb; } @@ -67,21 +66,22 @@ void thin_connection_readable_cb(EV_P_ struct ev_io *watcher, int revents) char *new, *old; /* alloc more mem when buffer full */ - if (connection->read_buffer.len == connection->read_buffer.nalloc) { - /* TODO refactor this into a buffer.c file? */ + if (connection->read_buffer.len >= connection->read_buffer.salloc) { old = connection->read_buffer.ptr; - new = (char *) malloc(connection->read_buffer.nalloc * 2); + new = (char *) palloc(connection->buffer_pool, + connection->read_buffer.nalloc * 2); if (new == NULL) - rb_sys_fail("malloc"); + rb_sys_fail("palloc"); connection->read_buffer.ptr = new; connection->read_buffer.nalloc *= 2; - free(old); + connection->read_buffer.salloc *= 2; + pfree(connection->buffer_pool, old); } len = recv(connection->fd, connection->read_buffer.ptr + connection->read_buffer.len, - THIN_BUFFER_SIZE - connection->read_buffer.len, + connection->read_buffer.salloc - connection->read_buffer.len, 0); connection->read_buffer.len += len; @@ -160,6 +160,7 @@ void thin_connection_start(thin_backend_t *backend, int fd, struct sockaddr_in r if (connection->read_buffer.ptr == NULL) rb_sys_fail("palloc"); connection->read_buffer.nalloc = 1; + connection->read_buffer.salloc = connection->buffer_pool->size; connection->read_buffer.len = 0; /* reinit parser */ @@ -191,6 +192,8 @@ void thin_connection_close(thin_connection_t *connection) if (connection->read_buffer.ptr != NULL) pfree(connection->buffer_pool, connection->read_buffer.ptr); + connection->read_buffer.salloc = 0; + connection->read_buffer.nalloc = 0; connection->open = 0; } \ No newline at end of file ext/thin_backend/connection.c @@ -38,8 +38,9 @@ typedef struct thin_buffer_s thin_buffer_t; typedef struct thin_connection_s thin_connection_t; struct thin_buffer_s { + size_t nalloc; /* num slices alloced */ + size_t salloc; /* total size alloced */ size_t len; - size_t nalloc; char *ptr; }; ext/thin_backend/thin.h ade03b50f8adf4d388a1471611246084d314e4f0 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin-turbo/commit/0a03eb0848d17fea7afe276670c5ecd94489fec6 0a03eb0848d17fea7afe276670c5ecd94489fec6 2008-03-26T19:00:01-07:00 2008-03-26T19:00:01-07:00 Use pool to allocate read buffers bd2ff88b38300db1bc00c774f5937cf2da4b2190 macournoyer macournoyer@gmail.com