riser 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb038d800b97433c3499cb880acc77e0513d6dab1d18eace369137a98870cd8b
-  data.tar.gz: e4b2a6ab5cc93fa3e84c0dcdd53038e879d54e51ee2007f702a1afeb10c45409
+  metadata.gz: 4ac8260579321a152af6b38fe4305936934ede2893c1b9ede48a1c85563aad8d
+  data.tar.gz: 93a8e6145c9d53e94ed3443d46dc64c55460638a60eab2097bc563eff9f2b724
 SHA512:
-  metadata.gz: 4b5fdb35eb7ea3c7f9b535e5d857acb7bb85b671db989ed90123ead48d1079606afbe35a9f0c970a4ddfe62c21c32246468406c33739fad5a037b5e61b92d525
-  data.tar.gz: 71a67816a2048bd849eb12801a40c8114b446bafbbde210e253c172af915026d524c976f6068472ebf747af2b9a0ad6b79d9e3344b74b58bf96c874337db3368
+  metadata.gz: 59148c981335471f2c57d0caca09b1b8272008180fbe045e2f5f13988996c020741930419c4df73570811d148bd66df89f2c5aa260767852df6fd8627f711bb3
+  data.tar.gz: f0ba2792523825f164376e19a841274c685aca4dab7c8f32a5b88a496c97dcbb5eb5a077a36b417029ad3cf1db885df300c096164b840b3c06b3387c91a5ad8a

data/lib/riser/daemon.rb

@@ -270,6 +270,65 @@ module Riser
     end
     private :server_stop_forced
 
+    def server_socket_option(server_socket, server_address)
+      if (server_address.backlog) then
+        if (@sysop.listen(server_socket, server_address.backlog)) then
+          @logger.info("server socket backlog: #{server_address.backlog}")
+        else
+          @logger.warn('server socket backlog is not changed.')
+        end
+      else
+        @logger.info('server socket backlog is default.')
+      end
+
+      if (server_address.type == :unix) then
+        if (server_address.mode) then
+          if (@sysop.chmod(server_address.mode, server_address.path)) then
+            @logger.info("unix domain server socket mode: #{'%04o' % server_address.mode}")
+          else
+            @logger.warn('unix domain server socket mode is not changed.')
+          end
+        else
+          @logger.info('unix domain server socket mode is default.')
+        end
+
+        if (server_address.owner || server_address.group) then
+          if (@sysop.chown(server_address.owner, server_address.group, server_address.path)) then
+            @logger.info("unix domain server socket ownership: <#{server_address.owner}> <#{server_address.group}>")
+          else
+            @logger.warn('unix domain server socket ownership is not changed.')
+          end
+        else
+          @logger.info('unix domain server socket ownership is default.')
+        end
+      end
+
+      nil
+    end
+    private :server_socket_option
+
+    def server_socket_close(server_socket, server_address)
+      # get local_address before close(2)
+      server_socket_local_address = server_socket.local_address
+
+      if (@sysop.close(server_socket)) then
+        @logger.info("close server socket: #{server_socket_local_address.inspect_sockaddr}") 
+      else
+        @logger.warn("failed to close server socket: #{server_socket_local_address.inspect_sockaddr}")
+      end
+
+      if (server_address.type == :unix) then
+        if (@sysop.unlink(server_address.path)) then
+          @logger.info("delete unix server socket: #{server_address}")
+        else
+          @logger.warn("failed to delete unix server socket: #{server_address}")
+        end
+      end
+
+      nil
+    end
+    private :server_socket_close
+
     def run_server(server_socket)
       read_write = @sysop.pipe
       unless (read_write) then
@@ -357,37 +416,7 @@ module Riser
       @logger.info("open server socket: #{server_socket.local_address.inspect_sockaddr}")
 
       begin
-        if (server_address.backlog) then
-          if (@sysop.listen(server_socket, server_address.backlog)) then
-            @logger.info("server socket backlog: #{server_address.backlog}")
-          else
-            @logger.warn('server socket backlog is not changed.')
-          end
-        else
-          @logger.info('server socket backlog is default.')
-        end
-
-        if (server_address.type == :unix) then
-          if (server_address.mode) then
-            if (@sysop.chmod(server_address.mode, server_address.path)) then
-              @logger.info("unix domain server socket mode: #{'%04o' % server_address.mode}")
-            else
-              @logger.warn('unix domain server socket mode is not changed.')
-            end
-          else
-            @logger.info('unix domain server socket mode is default.')
-          end
-
-          if (server_address.owner || server_address.group) then
-            if (@sysop.chown(server_address.owner, server_address.group, server_address.path)) then
-              @logger.info("unix domain server socket ownership: <#{server_address.owner}> <#{server_address.group}>")
-            else
-              @logger.warn('unix domain server socket ownership is not changed.')
-            end
-          else
-            @logger.info('unix domain server socket ownership is default.')
-          end
-        end
+        server_socket_option(server_socket, server_address)
 
         unless (server_pid = run_server(server_socket)) then
           @logger.fatal('failed to start daemon.')
@@ -426,19 +455,7 @@ module Riser
                 else
                   if (next_server_socket = @sysop.get_server_socket(next_server_address)) then
                     @logger.info("open server socket: #{next_server_socket.local_address.inspect_sockaddr}")
-                    server_socket_local_address = server_socket.local_address # get local_address before close(2)
-                    if (@sysop.close(server_socket)) then
-                      @logger.info("close server socket: #{server_socket_local_address.inspect_sockaddr}") 
-                    else
-                      @logger.warn("failed to close server socket: #{server_socket_local_address.inspect_sockaddr}")
-                    end
-                    if (server_address.type == :unix) then
-                      if (@sysop.unlink(server_address.path)) then
-                        @logger.info("delete unix server socket: #{server_address}")
-                      else
-                        @logger.warn("failed to delete unix server socket: #{server_address}")
-                      end
-                    end
+                    server_socket_close(server_socket, server_address)
                     server_socket = next_server_socket
                     server_address = next_server_address
                   else
@@ -448,38 +465,7 @@ module Riser
               else
                 @logger.warn("server socket continue: #{server_socket.local_address.inspect_sockaddr}")
               end
-
-              if (server_address.backlog) then
-                if (@sysop.listen(server_socket, server_address.backlog)) then
-                  @logger.info("server socket backlog: #{server_address.backlog}")
-                else
-                  @logger.warn('server socket backlog is not changed.')
-                end
-              else
-                @logger.info('server socket backlog is default.')
-              end
-
-              if (server_address.type == :unix) then
-                if (server_address.mode) then
-                  if (@sysop.chmod(server_address.mode, server_address.path)) then
-                    @logger.info("unix domain server socket mode: #{'%04o' % server_address.mode}")
-                  else
-                    @logger.warn('unix domain server socket mode is not changed.')
-                  end
-                else
-                  @logger.info('unix domain server socket mode is default.')
-                end
-
-                if (server_address.owner || server_address.group) then
-                  if (@sysop.chown(server_address.owner, server_address.group, server_address.path)) then
-                    @logger.info("unix domain server socket ownership: <#{server_address.owner}> <#{server_address.group}>")
-                  else
-                    @logger.warn('unix domain server socket ownership is not changed.')
-                  end
-                else
-                  @logger.info('unix domain server socket ownership is default.')
-                end
-              end
+              server_socket_option(server_socket, server_address)
 
               case (sig_ope)
               when :restart_graceful
@@ -579,19 +565,7 @@ module Riser
           @logger.warn('no server to stop.')
         end
       ensure
-        server_socket_local_address = server_socket.local_address # get local_address before close(2)
-        if (@sysop.close(server_socket)) then
-          @logger.info("close server socket: #{server_socket_local_address.inspect_sockaddr}") 
-        else
-          @logger.warn("failed to close server socket: #{server_socket_local_address.inspect_sockaddr}")
-        end
-        if (server_address.type == :unix) then
-          if (@sysop.unlink(server_address.path)) then
-            @logger.info("delete unix server socket: #{server_address}")
-          else
-            @logger.warn("failed to delete unix server socket: #{server_address}")
-          end
-        end
+        server_socket_close(server_socket, server_address)
       end
 
       @logger.info('daemon stop.')
@@ -628,7 +602,7 @@ module Riser
 
     DEFAULT = {
       daemonize: true,
-      daemon_name: 'ruby',
+      daemon_name: 'ruby'.freeze,
       daemon_debug: $DEBUG,
       daemon_nochdir: true,
       status_file: nil,

data/lib/riser/server.rb

@@ -2,6 +2,7 @@
 
 require 'io/wait'
 require 'socket'
+require 'tempfile'
 
 module Riser
   class TimeoutSizedQueue
@@ -173,6 +174,35 @@ module Riser
     SIGNAL_RESTART_FORCED     = :QUIT
   end
 
+  module AcceptTimeout
+    module ServerSocketMethod
+    end
+    ::TCPServer.class_eval{ include ServerSocketMethod }
+    ::UNIXServer.class_eval{ include ServerSocketMethod }
+
+    refine ServerSocketMethod do
+      def accept_timeout(timeout_seconds)
+        begin
+          socket = accept_nonblock(exception: false)
+          if (socket != :wait_readable) then
+            socket
+          else
+            if (wait_readable(timeout_seconds) != nil) then
+              socket = accept_nonblock(exception: false)
+              # to ignore conflicting accept(2) at server restart overlap
+              if (socket != :wait_readable) then
+                socket
+              end
+            end
+          end
+        rescue Errno::EINTR   # EINTR is not captured by `exception: false'
+          nil
+        end
+      end
+    end
+  end
+  using AcceptTimeout
+
   class SocketThreadDispatcher
     def initialize(thread_queue_name)
       @thread_num = nil
@@ -307,10 +337,10 @@ module Riser
         queue = TimeoutSizedQueue.new(@thread_queue_size, name: @thread_queue_name)
         begin
           thread_list = []
-          @thread_num.times{|i|
-            thread_list << Thread.new{
+          @thread_num.times do |i|
+            thread_list << Thread.start(i) {|thread_number|
               begin
-                Thread.current[:number] = i
+                Thread.current[:number] = thread_number
                 while (socket = queue.pop)
                   begin
                     @dispatch.call(socket)
@@ -324,7 +354,7 @@ module Riser
                 }
               end
             }
-          }
+          end
 
           catch (:end_of_server) {
             while (true)
@@ -475,6 +505,11 @@ module Riser
       nil
     end
 
+    SEND_CMD = "SEND\n".freeze  # :nodoc:
+    SEND_LEN = SEND_CMD.length  # :nodoc:
+    RADY_CMD = "RADY\n".freeze  # :nodoc:
+    RADY_LEN = RADY_CMD.length  # :nodoc:
+
     def start(server_socket)
       case (server_socket)
       when TCPServer, UNIXServer
@@ -483,10 +518,17 @@ module Riser
         socket_class = IO
       end
 
+      parent_latch_file = Tempfile.open('riser_latch_')
+      child_latch_file = File.open(parent_latch_file.path, File::RDWR)
+      child_latch_file.flock(File::LOCK_EX | File::LOCK_NB) or raise "internal error: failed to lock latch file: #{parent_latch_file.path}"
+      parent_latch_file.unlink
+
       process_list = []
       @process_num.times do |pos|
         child_io, parent_io = UNIXSocket.socketpair
         pid = Process.fork{
+          parent_latch_file.close
+
           parent_io.close
           pos.times do |i|
             process_list[i].io.close
@@ -506,12 +548,12 @@ module Riser
 
           thread_dispatcher.accept{
             if (child_io.wait_readable(@process_send_io_polling_timeout_seconds) != nil) then
-              command = child_io.read(5)
-              command == "SEND\n" or raise "internal error: unknown command <#{command.inspect}>"
+              command = child_io.read(SEND_LEN)
+              command == SEND_CMD or raise "internal error: unknown command <#{command.inspect}>"
               child_io.recv_io(socket_class)
             end
           }
-          thread_dispatcher.accept_return{ child_io.write("RADY\n") }
+          thread_dispatcher.accept_return{ child_io.write(RADY_CMD) }
           thread_dispatcher.dispatch(&@dispatch)
 
           Signal.trap(SIGNAL_STOP_GRACEFUL) { thread_dispatcher.signal_stop_graceful }
@@ -520,8 +562,10 @@ module Riser
           Signal.trap(SIGNAL_STAT_GET_NO_RESET) { thread_dispatcher.signal_stat_get(reset: false) }
           Signal.trap(SIGNAL_STAT_STOP) { thread_dispatcher.signal_stat_stop }
 
+          # release flock(2)
+          child_latch_file.close
+
           begin
-            child_io.write("RADY\n")
             @at_fork.call
             thread_dispatcher.start
           ensure
@@ -533,10 +577,9 @@ module Riser
         process_list << SocketProcess.new(pid, parent_io)
       end
 
-      for process in process_list
-        response = process.io.read(5)
-        response == "RADY\n" or raise "internal error: unknown response <#{response.inspect}>"
-      end
+      child_latch_file.close
+      parent_latch_file.flock(File::LOCK_EX) # wait to release flock(2) at child processes
+      parent_latch_file.close
 
       setup unless @process_dispatcher
       @process_dispatcher.thread_num = @process_num
@@ -576,21 +619,15 @@ module Riser
       @process_dispatcher.postprocess(&NO_CALL)
 
       @process_dispatcher.accept{
-        if (server_socket.wait_readable(@accept_polling_timeout_seconds) != nil) then
-          begin
-            server_socket.accept_nonblock
-          rescue IO::WaitReadable
-            nil                 # to avoid conflicting accept(2) at server restart overlap
-          end
-        end
+        server_socket.accept_timeout(@accept_polling_timeout_seconds)
       }
       @process_dispatcher.accept_return(&NO_CALL)
       @process_dispatcher.dispatch{|socket|
         process = process_list[Thread.current[:number]]
-        process.io.write("SEND\n")
+        process.io.write(SEND_CMD)
         process.io.send_io(socket)
-        response = process.io.read(5)
-        response == "RADY\n" or raise "internal error: unknown response <#{response.inspect}>"
+        response = process.io.read(RADY_LEN)
+        response == RADY_CMD or raise "internal error: unknown response <#{response.inspect}>"
       }
       @process_dispatcher.start
 
@@ -736,13 +773,7 @@ module Riser
         @dispatcher.preprocess(&@preprocess)
         @dispatcher.postprocess(&@postprocess)
         @dispatcher.accept{
-          if (server_socket.wait_readable(@accept_polling_timeout_seconds) != nil) then
-            begin
-              server_socket.accept_nonblock
-            rescue IO::WaitReadable
-              nil               # to avoid conflicting accept(2) at server restart overlap
-            end
-          end
+          server_socket.accept_timeout(@accept_polling_timeout_seconds)
         }
         @dispatcher.accept_return(&NO_CALL)
         @dispatcher.dispatch(&@dispatch)

data/lib/riser/version.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module Riser
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'.freeze
 end
 
 # Local Variables:

data/lib/riser.rb

@@ -3,6 +3,7 @@
 require 'riser/version'
 
 module Riser
+  autoload :AcceptTimeout, 'riser/server'
   autoload :DRbServiceCall, 'riser/services'
   autoload :DRbServiceServer, 'riser/services'
   autoload :DRbServices, 'riser/services'

data/misc/run_curls.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+sleep_seconds="${1:-1}"
+num_curl="${2:-4}"
+
+job_pid_list=''
+
+run_curl() {
+  (
+    while true; do
+      curl --silent -- "$1"/ >/dev/null
+    done
+  ) &
+  job_pid_list="${job_pid_list} $!"
+  echo "run curl $!"
+}
+
+cmd() {
+  echo "$*"
+  "$@"
+}
+
+echo "GET URL: ${GET_URL:=http://localhost:8080}"
+
+for i in $(yes | head -"${num_curl}"); do
+  run_curl "${GET_URL}"
+done
+
+cmd sleep "${sleep_seconds}"
+
+for pid in $job_pid_list; do
+  cmd kill "${pid}"
+  wait "${pid}"
+done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,7 @@ files:
 - lib/riser/temppath.rb
 - lib/riser/test.rb
 - lib/riser/version.rb
+- misc/run_curls.sh
 - riser.gemspec
 homepage: https://github.com/y10k/riser
 licenses: