rhebok 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a836851c9ccb94d821b8987477c7d40fdb1f15b0
-  data.tar.gz: 74aaeb694d767ccf0636110e75eaaf43dbf91d07
+  metadata.gz: 62de5b0358298e1e28e289b07234b31d1f7ecd45
+  data.tar.gz: 9e1abac8fe69c3876717ef143c3c4f2e5ba8a065
 SHA512:
-  metadata.gz: 4cc4fcfc51987e96d998e3e5314c00b8b59c9661169f814e2ed31e7b10f91d4b8b03c45ad04a91946dd919ba2f4a06c0ced3b806a13bd2dbe3338412ab0d4d7e
-  data.tar.gz: e80fb4df159602fe5988983d26661b712ed694388a91b5b6d6c3932abf519ed33800c95a8e1e0c2f5d027ccd0904b5d36bd59d2a383341790fb6811bfe954a11
+  metadata.gz: 67a54bf9fb0820178c01a5a9c60678ce40883f3c47d02ceb4ab8e3bf75c9bd3edf9e77b3e03e86032f0b296fefc42807eecd94beb56e2a5a6fb883bc6a2e9dfa
+  data.tar.gz: 04b4648772b4e6fb723786337c10cdab5170d5357002eef7aa9b1ce6555354f15b33680fd3f88f0748c9612ab691e2b50741efbe4aa063af470d1587c2808833

data/Changes

@@ -1,3 +1,7 @@
+0.0.6 2014-12-24T13:19:50Z
+
+    - support OobGC
+
 0.0.5 2014-12-19T11:06:28Z
 
     - support MaxRequestPerChild=0. worker never exit.

data/README.md

@@ -12,6 +12,7 @@ Rhebok supports following features.
 - prefork and graceful shutdown using prefork_engine
 - hot deploy and unix domain socket using start_server
 - only supports HTTP/1.0. But does not support Keepalive.
+- supports OobGC
 
 This server is suitable for running HTTP application servers behind a reverse proxy like nginx.
 
@@ -33,7 +34,7 @@ Or install it yourself as:
 
 ## Usage
 
-    $ rackup -s Rhebok -O Port=8080 -O MaxWorkers=10 -O MaxRequestPerChild=1000 -E production config.ru
+    $ rackup -s Rhebok -O Port=8080 -O MaxWorkers=10 -O MaxRequestPerChild=1000 -O OobGC=yes -E production config.ru
 
 ## Sample configuration with Nginx
 
@@ -74,7 +75,7 @@ number of worker processes (default: 10)
 
 ### MaxRequestPerChild
 
-max. number of requests to be handled before a worker process exits (default: 1000)
+Max number of requests to be handled before a worker process exits (default: 1000)
 If set to `0`. worker never exists. This option looks like Apache's MaxRequestPerChild
 
 ### MinRequestPerChild
@@ -85,6 +86,20 @@ if set, randomizes the number of requests handled by a single worker process bet
 
 seconds until timeout (default: 300)
 
+### OobGC
+
+Boolean like string. If true, Rhebok execute GC after close client socket. (defualt: false)
+
+### MaxGCPerRequest
+
+If [gctools](https://github.com/tmm1/gctools) is available, this option is not used. invoke GC by `GC::OOB.run` after every requests.
+
+Max number of request before invoking GC (defualt: 5)
+
+### MinGCPerRequest
+
+If set, randomizes the number of request before invoking GC between the number of MaxGCPerRequest (defualt: none)
+
 ### SpawnInterval
 
 if set, worker processes will not be spawned more than once than every given seconds. Also, when SIGHUP is being received, no more than one worker processes will be collected every given seconds. This feature is useful for doing a "slow-restart". See http://blog.kazuhooku.com/2011/04/web-serverstarter-parallelprefork.html for more information. (default: none)

data/lib/rack/handler/rhebok.rb

@@ -11,6 +11,13 @@ require 'io/nonblock'
 require 'prefork_engine'
 require 'rhebok'
 
+$RACK_HANDLER_RHEBOK_GCTOOL = true
+begin
+  require 'gctools/oobgc'
+rescue LoadError
+  $RACK_HANDLER_RHEBOK_GCTOOL = false
+end
+
 module Rack
   module Handler
     class Rhebok
@@ -23,7 +30,10 @@ module Rack
         :MaxRequestPerChild => 1000,
         :MinRequestPerChild => nil,
         :SpawnInterval => nil,
-        :ErrRespawnInterval => nil
+        :ErrRespawnInterval => nil,
+        :OobGC => false,
+        :MaxGCPerRequest => 5,
+        :MinGCPerRequest => nil,
       }
       NULLIO  = StringIO.new("").set_encoding('BINARY')
 
@@ -41,16 +51,20 @@ module Rack
       end
 
       def initialize(options={})
+        if options[:OobGC].instance_of?(String)
+          options[:OobGC] = options[:OobGC].match(/^(true|yes|1)$/i) ? true : false
+        end
         @options = DEFAULT_OPTIONS.merge(options)
+        p @options[:OobGC]
         @server = nil
         @_is_tcp = false
         @_using_defer_accept = false
       end
 
       def setup_listener()
-        if ENV["SERVER_STARTER_PORT"] then
+        if ENV["SERVER_STARTER_PORT"]
           hostport, fd = ENV["SERVER_STARTER_PORT"].split("=",2)
-          if m = hostport.match(/(.*):(\d+)/) then
+          if m = hostport.match(/(.*):(\d+)/)
             @options[:Host] = m[0]
             @options[:Port] = m[1].to_i
           else
@@ -67,7 +81,7 @@ module Rack
           @_is_tcp = true
         end
 
-        if RUBY_PLATFORM.match(/linux/) && @_is_tcp == true then
+        if RUBY_PLATFORM.match(/linux/) && @_is_tcp == true
           begin
             @server.setsockopt(Socket::IPPROTO_TCP, 9, 1)
             @_using_defer_accept = true
@@ -83,49 +97,68 @@ module Rack
             "HUP"  => 'TERM',
           },
         }
-        if @options[:SpawnInterval] then
+        if @options[:SpawnInterval]
           pm_args["trap_signals"]["USR1"] = ["TERM", @options[:SpawnInterval].to_i]
           pm_args["spawn_interval"] = @options[:SpawnInterval].to_i
         end
-        if @options[:ErrRespawnInterval] then
+        if @options[:ErrRespawnInterval]
           pm_args["err_respawn_interval"] = @options[:ErrRespawnInterval].to_i
         end
         Signal.trap('INT','SYSTEM_DEFAULT') # XXX
 
         pe = PreforkEngine.new(pm_args)
         while !pe.signal_received.match(/^(TERM|USR1)$/)
-          pe.start {
-           srand
+          pe.start do
+            srand
             self.accept_loop(app)
-          }
+          end
         end
         pe.wait_all_children
       end
 
       def _calc_reqs_per_child
+        if @options[:MinRequestPerChild] == nil
+          return @options[:MaxRequestPerChild].to_i
+        end
         max = @options[:MaxRequestPerChild].to_i
-        if min = @options[:MinRequestPerChild] then
-          return max.to_i if min.to_i >= max
-          return (max - (max - min.to_i + 1) * rand).to_i
+        min = @options[:MinRequestPerChild].to_i
+        if min < max
+          max - ((max - min + 1) * rand).to_i
+        else
+          max
         end
-        return max
       end
 
+      def _calc_gc_per_req
+        if @options[:MinGCPerRequest] == nil
+          return @options[:MaxGCPerRequest].to_i
+        end
+        max = @options[:MaxGCPerRequest].to_i
+        min = @options[:MinGCPerRequest].to_i
+        if min < max
+          max - ((max - min + 1) * rand).to_i
+        else
+          max
+        end
+      end
+
+
       def accept_loop(app)
         @can_exit = true
         @term_received = 0
         proc_req_count = 0
         Signal.trap(:TERM) do
           @term_received += 1
-          if @can_exit then
+          if @can_exit
             exit!(true)
           end
-          if @can_exit || @term_received > 1 then
+          if @can_exit || @term_received > 1
             exit!(true)
           end
         end
         Signal.trap(:PIPE, "IGNORE")
         max_reqs = self._calc_reqs_per_child()
+        gc_reqs = self._calc_gc_per_req()
         fileno = @server.fileno
 
         env_template = {
@@ -144,15 +177,15 @@ module Rack
           @can_exit = true
           env = env_template.clone
           connection, buf = ::Rhebok.accept_rack(fileno, @options[:Timeout], @_is_tcp, env)
-          if connection then
+          if connection
             # for tempfile
             buffer = nil
             begin
               proc_req_count += 1
               @can_exit = false
               # handle request
-              if env.key?("CONTENT_LENGTH") && env["CONTENT_LENGTH"].to_i > 0 then
-                cl = env["CONTENT_LENGTH"].to_i;
+              if env.key?("CONTENT_LENGTH") && env["CONTENT_LENGTH"].to_i > 0
+                cl = env["CONTENT_LENGTH"].to_i
                 if cl > MAX_MEMORY_BUFFER_SIZE
                   buffer = Tempfile.open('r')
                   buffer.binmode
@@ -162,12 +195,12 @@ module Rack
                 end
                 while cl > 0
                   chunk = ""
-                  if buf.bytesize > 0 then
+                  if buf.bytesize > 0
                     chunk = buf
                     buf = ""
                   else
                     readed = ::Rhebok.read_timeout(connection, chunk, cl, 0, @options[:Timeout])
-                    if readed == nil then
+                    if readed == nil
                       return
                     end
                   end
@@ -179,13 +212,13 @@ module Rack
               end
 
               status_code, headers, body = app.call(env)
-              if body.instance_of?(Array) then
+              if body.instance_of?(Array)
                 ::Rhebok.write_response(connection, @options[:Timeout], status_code, headers, body)
               else
                 ::Rhebok.write_response(connection, @options[:Timeout], status_code, headers, [])
                 body.each do |part|
                   ret = ::Rhebok.write_all(connection, part, 0, @options[:Timeout])
-                  if ret == nil then
+                  if ret == nil
                     break
                   end
                 end #body.each
@@ -196,9 +229,19 @@ module Rack
                 buffer.close!
               end
               ::Rhebok.close_rack(connection)
+              # out of band gc
+              if @options[:OobGC]
+                if $RACK_HANDLER_RHEBOK_GCTOOL
+                  GC::OOB.run
+                elsif proc_req_count % gc_reqs == 0
+                  disabled = GC.enable
+                  GC.start
+                  GC.disable if disabled
+                end
+              end
             end #begin
           end # accept
-          if @term_received > 0 then
+          if @term_received > 0
             exit!(true)
           end
         end #while max_reqs
@@ -207,6 +250,3 @@ module Rack
     end
   end
 end
-
-
-

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler