rhebok 0.8.6 → 0.9.0

data/ext/rhebok/rhebok.c

@@ -2,6 +2,9 @@
 #include <time.h>
 #include <ctype.h>
 #include <poll.h>
+#ifndef __need_IOV_MAX
+#define __need_IOV_MAX
+#endif
 #include <sys/uio.h>
 #include <errno.h>
 #include <limits.h>
@@ -14,6 +17,16 @@
 #include <arpa/inet.h>
 #include "picohttpparser/picohttpparser.c"
 
+#ifndef IOV_MAX
+#if defined(__FreeBSD__) || defined(__APPLE__)
+# define IOV_MAX 128
+#endif
+#endif
+
+#ifndef IOV_MAX
+#  error "Unable to determine IOV_MAX from system headers"
+#endif
+
 #define MAX_HEADER_SIZE 16384
 #define MAX_HEADER_NAME_LEN 1024
 #define MAX_HEADERS         128
@@ -679,6 +692,7 @@ VALUE rhe_write_chunk(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE
   ssize_t written = 0;
   ssize_t vec_offset = 0;
   int count =0;
+  int remain;
   ssize_t iovcnt = 3;
   char chunked_header_buf[18];
 
@@ -700,7 +714,8 @@ VALUE rhe_write_chunk(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE
 
     vec_offset = 0;
     written = 0;
-    while ( iovcnt - vec_offset > 0 ) {
+    remain = iovcnt;
+    while ( remain > 0 ) {
       count = (iovcnt > IOV_MAX) ? IOV_MAX : iovcnt;
       rv = _writev_timeout(NUM2INT(fileno), NUM2DBL(timeout),  &v[vec_offset], count - vec_offset, (vec_offset == 0) ? 0 : 1);
       if ( rv <= 0 ) {
@@ -710,8 +725,9 @@ VALUE rhe_write_chunk(VALUE self, VALUE fileno, VALUE buf, VALUE offsetv, VALUE
       written += rv;
       while ( rv > 0 ) {
         if ( (unsigned int)rv >= v[vec_offset].iov_len ) {
-        rv -= v[vec_offset].iov_len;
+          rv -= v[vec_offset].iov_len;
           vec_offset++;
+          remain--;
         }
         else {
           v[vec_offset].iov_base = (char*)v[vec_offset].iov_base + rv;
@@ -774,6 +790,7 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
   ssize_t written;
   int count;
   int i;
+  int remain;
   char status_line[512];
   char date_line[512];
   char server_line[1032];
@@ -940,7 +957,8 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
 
     vec_offset = 0;
     written = 0;
-    while ( iovcnt - vec_offset > 0 ) {
+    remain = iovcnt;
+    while ( remain > 0 ) {
       count = (iovcnt > IOV_MAX) ? IOV_MAX : iovcnt;
       rv = _writev_timeout(fileno, timeout,  &v[vec_offset], count - vec_offset, (vec_offset == 0) ? 0 : 1);
       if ( rv <= 0 ) {
@@ -950,8 +968,9 @@ VALUE rhe_write_response(VALUE self, VALUE filenov, VALUE timeoutv, VALUE status
       written += rv;
       while ( rv > 0 ) {
         if ( (unsigned int)rv >= v[vec_offset].iov_len ) {
-        rv -= v[vec_offset].iov_len;
+          rv -= v[vec_offset].iov_len;
           vec_offset++;
+          remain--;
         }
         else {
           v[vec_offset].iov_base = (char*)v[vec_offset].iov_base + rv;

data/lib/rack/handler/rhebok.rb

@@ -169,7 +169,10 @@ module Rack
             self.accept_loop(app)
           end
         end
-        pe.wait_all_children
+
+        while pe.wait_all_children(1) > 0
+          pe.signal_all_children('TERM')
+        end
       end
 
       def _calc_reqs_per_child
@@ -200,17 +203,10 @@ module Rack
 
 
       def accept_loop(app)
-        @can_exit = true
         @term_received = 0
         proc_req_count = 0
         Signal.trap(:TERM) do
           @term_received += 1
-          if @can_exit
-            exit!(true)
-          end
-          if @can_exit || @term_received > 1
-            exit!(true)
-          end
         end
         Signal.trap(:PIPE, "IGNORE")
         max_reqs = self._calc_reqs_per_child()
@@ -230,7 +226,9 @@ module Rack
         }
 
         while @options[:MaxRequestPerChild].to_i == 0 || proc_req_count < max_reqs
-          @can_exit = true
+          if @term_received > 0
+            exit!(true)
+          end
           env = env_template.clone
           connection, buf = ::Rhebok.accept_rack(fileno, @options[:Timeout], @_is_tcp, env)
           if connection
@@ -238,7 +236,6 @@ module Rack
             buffer = nil
             begin
               proc_req_count += 1
-              @can_exit = false
               # handle request
               if env.key?("CONTENT_LENGTH") && env["CONTENT_LENGTH"].to_i > 0
                 cl = env["CONTENT_LENGTH"].to_i
@@ -336,9 +333,6 @@ module Rack
               end
             end #begin
           end # accept
-          if @term_received > 0
-            exit!(true)
-          end
         end #while max_reqs
       end #def
 

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end

data/rhebok.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "bacon"
   spec.add_dependency "rack"
-  spec.add_dependency "prefork_engine", ">= 0.0.4"
+  spec.add_dependency "prefork_engine", ">= 0.0.6"
 
   # get an array of submodule dirs by executing 'pwd' inside each submodule
   `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
 description: High Performance and Optimized Preforked Rack Handler
 email:
 - kazeburo@gmail.com
@@ -97,9 +97,11 @@ files:
 - README.md
 - Rakefile
 - ext/rhebok/extconf.rb
+- ext/rhebok/picohttpparser/.clang-format
 - ext/rhebok/picohttpparser/.gitattributes
 - ext/rhebok/picohttpparser/.gitmodules
 - ext/rhebok/picohttpparser/.travis.yml
+- ext/rhebok/picohttpparser/Jamfile
 - ext/rhebok/picohttpparser/Makefile
 - ext/rhebok/picohttpparser/README.md
 - ext/rhebok/picohttpparser/bench.c
@@ -141,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: High Performance Preforked Rack Handler