plux 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472f8a38bccdb6c63b10b4291c4cd109598e8819222c4061dd673f3491d58344
-  data.tar.gz: 489ce27db397a3df71058642b8f3dab80ac255cf1ace82f66c12d80980de4efc
+  metadata.gz: 06c8e6b4eae44651cb3ba6e01503710c25b1746e11ae2c339bbe37225200e5bc
+  data.tar.gz: 92c320fe5e1c92078bd87d09c78bb0e76224a5ed9e1fc18604056d8ccdb23eea
 SHA512:
-  metadata.gz: 565721905d9e193557d56c78a323f35bd41e1650bb7592607534a6da3cf9f961d66801b2a169477f9b3b2019f06d45e1e08bcda6b146d855d5018b11ba5a6231
-  data.tar.gz: 32d1c59b0a5b169e9ed33302d576dc3d87e42ba376d9f927f61a34d1f5b8bcdf44582fe11a547de0d62c1827158248dfb6293df8fd06cdaa5716f23bcb313741
+  metadata.gz: 8957056c62d9cc90a236e0bf2eb06d8d38cfd3cb8b1054d812c08741b672c0ebc2e3b545111ea5bf4825b3955e21cb748b1c6df727f2fc8748eb8eaa17c169d9
+  data.tar.gz: b7aed8c1662ab951728321576bd611bb5d402557e2d01d2b5943b644fec92b9eb0d312612bcdf725162f0647da4a54f7cc01ff3e3dc8e5a9b34c54fb6b1a66b5

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    plux (0.1.3)
+    plux (0.1.4)
+      nio4r (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -9,6 +10,7 @@ GEM
     coderay (1.1.2)
     method_source (0.9.2)
     minitest (5.14.1)
+    nio4r (2.5.3)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/README.md

@@ -21,9 +21,9 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-# start one and only process named 'abc',
+# start one and only process named 'abc', with 2 threads in it (1 thread if not specified),
 # no matter the code below is called how many times in whatever processes/threads
-server = Plux.worker(:abc) do
+server = Plux.worker(:abc, thread: 2) do
 
   # prepare resources like mq/db, to handle requests
   def initialize
@@ -36,8 +36,7 @@ server = Plux.worker(:abc) do
   end
 end
 
-# five threads will be started to handle these clients,
-# and finished once their counterparts call close
+# the 2 threads will handle these 5 clients
 5.times do |n|
   Thread.new do
     client = server.connect

data/lib/plux.rb

@@ -32,8 +32,8 @@ module Plux
       File.join(dir, "#{server_name}.so")
     end
 
-    def worker(name, &block)
-      Server.new(name).boot(block)
+    def worker(name, thread: 1, &block)
+      Server.new(name, thread: thread).boot(block)
     end
   end
 

data/lib/plux/reactors.rb

@@ -0,0 +1,91 @@
+module Plux
+  class Reactors
+    def initialize(count, worker)
+      @lock = Mutex.new
+      @reactor_loops = count.times.each_with_object({}) do |r, hash|
+        hash[Reactor.new(worker, self)] = 0
+      end
+    end
+
+    def register(socket)
+      @lock.synchronize do
+        reactor = @reactor_loops.sort_by{ |_, v| v }.first.first
+        reactor.register(socket)
+      end
+    end
+
+    def timer(reactor, duration)
+      @lock.synchronize{ @reactor_loops[reactor] += duration }
+    end
+
+    class Reactor
+      def initialize(worker, reactors)
+        @worker = worker
+        @reactors = reactors
+
+        @nio = NIO::Selector.new
+        @newly_accepted = Queue.new
+        @closed = []
+
+        run
+      end
+
+      def register(socket)
+        @newly_accepted << socket
+        @nio.wakeup
+      end
+
+      private
+
+      def run
+        Thread.new do
+          loop do
+            @closed.size.times{ @nio.deregister(@closed.pop) }
+
+            @newly_accepted.size.times do
+              socket = @newly_accepted.pop
+              mon = @nio.register(socket, :r)
+              mon.value = Worker.new(socket, @worker)
+            end
+
+            start = Time.now.to_i
+
+            next unless @nio.select do |m|
+              next if m.value.process
+              @closed << m.io
+            end
+
+            @reactors.timer(self, Time.now.to_i - start)
+          end
+        end
+      end
+    end
+
+    class Worker
+      def initialize(socket, worker)
+        @parser = Parser.new
+        @socket = socket
+        @worker = worker
+      end
+
+      def process
+        10.times do
+          stream = @socket.read_nonblock(Parser::STREAM_MAX_LEN, exception: false)
+          return true if stream == :wait_readable
+
+          msgs = @parser.decode(stream)
+          last_msg = msgs.pop
+
+          msgs.each{ |msg| @worker.work(msg) }
+          if last_msg == Parser::LAST_MSG
+            @socket.close
+            return false
+          end
+          @worker.work(last_msg)
+        end
+        true
+      end
+    end
+
+  end
+end

data/lib/plux/server.rb

@@ -1,3 +1,6 @@
+require "nio"
+require "plux/reactors"
+
 module Plux
 
   class Server
@@ -6,8 +9,9 @@ module Plux
     Active = {}
     at_exit{ Active.values.each(&:close) }
 
-    def initialize(name)
+    def initialize(name, thread: )
       @name = name
+      @thread = thread
     end
 
     def boot(block)
@@ -40,10 +44,8 @@ module Plux
         UNIXServer.open(Plux.server_file(name)) do |serv|
           parent.close
           worker = Class.new(&block).new
-          loop do
-            socket = serv.accept
-            Worker.new(socket, worker)
-          end
+          reactors = Reactors.new(@thread, worker)
+          loop{ reactors.register(serv.accept) }
         end
       end
 
@@ -62,31 +64,6 @@ module Plux
         File.delete(Plux.send(file, name))
       end
     end
-
-    class Worker
-      def initialize(socket, worker)
-        par = Parser.new
-        t = Thread.new do
-          loop do
-            begin
-              stream = socket.read_nonblock(Parser::STREAM_MAX_LEN)
-            rescue IO::WaitReadable
-              IO.select([socket])
-              retry
-            end
-
-            msgs = par.decode(stream)
-            last_msg = msgs.pop
-
-            msgs.each{ |msg| worker.work(msg) }
-            break if last_msg == Parser::LAST_MSG
-            worker.work(last_msg)
-          end
-          socket.close
-        end
-      end
-    end
-
   end
 
 end

data/lib/plux/version.rb

@@ -1,3 +1,3 @@
 module Plux
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/plux.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"
+
+  spec.add_dependency "nio4r", "~> 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plux
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2020-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nio4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: 
 email:
 - block24block@gmail.com
@@ -86,6 +100,7 @@ files:
 - lib/plux.rb
 - lib/plux/client.rb
 - lib/plux/parser.rb
+- lib/plux/reactors.rb
 - lib/plux/server.rb
 - lib/plux/version.rb
 - plux.gemspec