spec/concurrency_spec.rb @@ -4,13 +4,18 @@ static void response_send_chunk(connection_t *c, const char *ptr, size_t len) { /* chunk too big, split it in smaller chunks and send each separately */ if (len >= BUFFER_MAX_LEN) { - size_t i, size = BUFFER_MAX_LEN - 1, slices = len / size + 1; + size_t size = BUFFER_MAX_LEN - 1; + size_t slices = len / size + 1; + size_t i, offset = 0; for (i = 0; i < slices; ++i) { + /* last slice can be smaller */ if (i == slices - 1) size = len % size; - response_send_chunk(c, (char *) ptr + i * size, size); + response_send_chunk(c, (char *) ptr + offset, size); + + offset += size; } return; @@ -25,9 +30,8 @@ static void response_send_chunk(connection_t *c, const char *ptr, size_t len) /* If we have a good sized chunk of data to send, try to send it right away. * This allows streaming by going for a shot in the even loop to drain the buffer if possisble, this way, the chunk is sent if the socket is writable.*/ - if (c->write_buffer.len - c->write_buffer.offset >= STREAM_SIZE) { + if (c->write_buffer.len - c->write_buffer.offset >= STREAM_SIZE) ev_loop(c->loop, EVLOOP_ONESHOT | EVLOOP_NONBLOCK); - } } static void response_send_status(connection_t *c, const int status) ext/thin_backend/response.c @@ -16,6 +16,12 @@ class App end end +class DummyApp < App + def process(env) + "" + end +end + class EchoApp < App def process(env) if env['REQUEST_METHOD'] == 'GET' spec/apps.rb @@ -29,9 +29,9 @@ describe Thin::Backends::Turbo, "server" do body.should == 'ohhithere!' end end - + it "should handle big body (stored in memory)" do - data = ['X' * 1024] * (80 + 31) + data = [rand_data(1024)] * (80 + 31) expected_size = data.join.size POST("/", data) do @@ -45,7 +45,7 @@ describe Thin::Backends::Turbo, "server" do end it "should handle very big body (stored to tempfile)" do - data = ['X' * 1024] * 1024 + data = [rand_data(1024)] * 1024 expected_size = data.join.size POST("/", data) do spec/server_spec.rb @@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/apps' require 'spec' require 'thread' require 'timeout' +require 'digest/sha1' module ThinTurboServer ADDRESS = '0.0.0.0' @@ -138,7 +139,15 @@ module HttpSpecDSL end end +module Helpers + def rand_data(min, max=min) + count = min + ((rand(max)+1)).to_i + (Digest::SHA1.hexdigest(rand(count * 100).to_s) * (count / 39))[0, max] + end +end + Spec::Runner.configure do |config| config.include ThinTurboServer config.include HttpSpecDSL + config.include Helpers end \ No newline at end of file spec/spec_helper.rb ba8f86c952e337db6e5f079337a1cd7c092151cf macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin-turbo/commit/dcd2777871649b18854dd6c213d3f1741307fc90 dcd2777871649b18854dd6c213d3f1741307fc90 2008-05-24T20:39:20-07:00 2008-05-24T20:39:20-07:00 Fix bug in size of last chunk when response is splitted in several slices to send. Add tests for cucurrency. 9b525718492fbeddee9284808d6557fc05284267 macournoyer macournoyer@gmail.com