riser 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 975698c3877ded2e7599a5aaf11ffa3c8781356f7d84c4260573ee39d62343e5
-  data.tar.gz: 7c28ab28e041f75cda185407754c930cb6f09e4aeac675aa5e742f85c67e0325
+  metadata.gz: cde718ab160b32665cc369a9802ede8b4001443dd53ca1c41cce55b09895a048
+  data.tar.gz: 11f103a7d7260481c059098c2859e267c8b870aed23e599ad1a5045a5a038530
 SHA512:
-  metadata.gz: 3018b4967b5e4d722d1f969613a741e1bf40073e48af87bfa63c9898183a99699516a55e35cbb554fe0a0b5cefc2bdb5f99c0f74d0a177b684d801a592e3f182
-  data.tar.gz: 3e811b04172f0855f82e0f86c2b049781dff8f13ceaa4437c4f6e43d1bea7f4d99dc8a9a1d6ebe620a81d23bd154c2af3e40577735a1a49f4163315d11db8026
+  metadata.gz: c36db5ee689500348d5e53815917e9ee841b80abe4d50432699446ea21c7b928bbb3cf8a6e74705dc299cd0424c63dfd5c574b41053d1b8cc140fcd83b9ffea2
+  data.tar.gz: 4e46ece94c0dc1c8fe64ba0538803f8a504fd6d69348e68f2324dedc743c30e4842420596fb7fcdb711e0ec343efbda99766b8805039432628f931e41a8bfe23

data/lib/riser/resource.rb

@@ -23,7 +23,7 @@ module Riser
       end
 
       def proxy_count
-        @mutex.synchronize{ @ref_proxy.length }
+        @mutex.synchronize{ @ref_proxy.size }
       end
 
       def ref_object?
@@ -227,7 +227,7 @@ module Riser
       end
 
       def proxy_count
-        @mutex.synchronize{ @ref_proxy.length }
+        @mutex.synchronize{ @ref_proxy.size }
       end
 
       def ref_object?(access_key)

data/lib/riser/server.rb

@@ -6,8 +6,8 @@ require 'tempfile'
 
 module Riser
   class TimeoutSizedQueue
-    def initialize(size, name: nil)
-      @size = size
+    def initialize(max_size, name: nil)
+      @max_size = max_size
       @queue = []
       @closed = false
       @mutex = Thread::Mutex.new
@@ -50,15 +50,15 @@ module Riser
           @stat_push_count += 1
           @stat_push_average_queue_size = (@stat_push_average_queue_size * (@stat_push_count - 1) + @queue.size) / @stat_push_count
         end
-        unless (@queue.size < @size) then
+        unless (@queue.size < @max_size) then
           @stat_push_wait_count += 1 if @stat_enable
           @push_cond.wait(@mutex, timeout_seconds)
-          unless (@queue.size < @size) then
+          unless (@queue.size < @max_size) then
             @stat_push_timeout_count += 1 if @stat_enable
             return
           end
         end
-        @pop_cond.signal
+        @pop_cond.signal if @queue.empty?
         @queue.push(value)
         self
       }
@@ -75,7 +75,7 @@ module Riser
           @stat_pop_wait_count += 1 if @stat_enable
           @pop_cond.wait(@mutex)
         end
-        @push_cond.signal
+        @push_cond.signal if (@queue.size == @max_size)
         @queue.shift
       }
     end
@@ -115,7 +115,7 @@ module Riser
         @mutex.synchronize{
           info = {
             queue_name:              @name,
-            queue_size:              @size,
+            max_size:                @max_size,
             closed:                  @closed,
             start_time:              @stat_start_time,
             push_average_queue_size: @stat_push_average_queue_size,
@@ -140,7 +140,7 @@ module Riser
 
         # sort
         [ :queue_name,
-          :queue_size,
+          :max_size,
           :closed,
           :start_time,
           :get_time,
@@ -503,10 +503,10 @@ 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:
+    SEND_CMD = "SEND\n".freeze   # :nodoc:
+    SEND_LEN = SEND_CMD.bytesize # :nodoc:
+    RADY_CMD = "RADY\n".freeze   # :nodoc:
+    RADY_LEN = RADY_CMD.bytesize # :nodoc:
 
     def start(server_socket)
       case (server_socket)
@@ -525,8 +525,8 @@ module Riser
       @process_num.times do |pos|
         child_io, parent_io = UNIXSocket.socketpair
         pid = Process.fork{
+          server_socket.close
           parent_latch_file.close
-
           parent_io.close
           pos.times do |i|
             process_list[i].io.close
@@ -748,10 +748,7 @@ module Riser
         @dispatcher.thread_queue_size = @thread_queue_size
         @dispatcher.thread_queue_polling_timeout_seconds = @thread_queue_polling_timeout_seconds
 
-        @dispatcher.at_fork{
-          server_socket.close
-          @at_fork.call
-        }
+        @dispatcher.at_fork(&@at_fork)
         @dispatcher.at_stop(&@at_stop)
         @dispatcher.at_stat(&@at_stat)
         @dispatcher.preprocess(&@preprocess)

data/lib/riser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riser
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler