plux 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c8e6b4eae44651cb3ba6e01503710c25b1746e11ae2c339bbe37225200e5bc
-  data.tar.gz: 92c320fe5e1c92078bd87d09c78bb0e76224a5ed9e1fc18604056d8ccdb23eea
+  metadata.gz: 56011d823e56b1bd06759d5546edc8519338a99392ce980ebc6033b7f458cd0f
+  data.tar.gz: 7b3353cbbb07daa6394aceb3fefa830c438c797a455352d6283c6a71942cdb59
 SHA512:
-  metadata.gz: 8957056c62d9cc90a236e0bf2eb06d8d38cfd3cb8b1054d812c08741b672c0ebc2e3b545111ea5bf4825b3955e21cb748b1c6df727f2fc8748eb8eaa17c169d9
-  data.tar.gz: b7aed8c1662ab951728321576bd611bb5d402557e2d01d2b5943b644fec92b9eb0d312612bcdf725162f0647da4a54f7cc01ff3e3dc8e5a9b34c54fb6b1a66b5
+  metadata.gz: f2c201408eb9e5d0d2b19d1eabf0908324645ef2b95b922bda8e1ec3f2b39d988b58ebfb50c1fc17ec2e0522900122956b65fd2bdda4285785e42f4b28ff0838
+  data.tar.gz: 4ac2ab94501c97a09d3416d3dcf0837a04ecafc12050b0f8346f30a541e088059761ede6b7c674c9c1e720380a95b7bf1adc46d9c0df52c2dfa70a53132bcfb0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plux (0.1.4)
+    plux (0.1.5)
       nio4r (~> 2.0)
 
 GEM

data/README.md

@@ -25,7 +25,7 @@ Or install it yourself as:
 # no matter the code below is called how many times in whatever processes/threads
 server = Plux.worker(:abc, thread: 2) do
 
-  # prepare resources like mq/db, to handle requests
+  # prepare thread-safe resources like mq/db, to handle requests
   def initialize
     # @db = ...
   end
@@ -36,11 +36,12 @@ server = Plux.worker(:abc, thread: 2) do
   end
 end
 
-# the 2 threads will handle these 5 clients
+# clients connect, send msg, and close concurrently
 5.times do |n|
   Thread.new do
     client = server.connect
-    client.puts "hello #{n}"
+    client.puts "hello"
+    client.puts "my name is #{n}"
     client.close
   end
 end

data/lib/plux/reactor.rb

@@ -0,0 +1,76 @@
+module Plux
+  class Reactor
+    def initialize(count, worker)
+      @worker = worker
+      @msg_q = Queue.new
+      @count = count
+
+      @nio = NIO::Selector.new
+      @newly_accepted = Queue.new
+      @closed = []
+
+      receive
+      process
+    end
+
+    def register(socket)
+      @newly_accepted << socket
+      @nio.wakeup
+    end
+
+    private
+
+    def receive
+      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, @msg_q)
+          end
+
+          @nio.select do |m|
+            next if m.value.process
+            @closed << m.io
+          end
+        end
+      end
+    end
+
+    def process
+      @count.times.each do
+        Thread.new do
+          loop{ @worker.work(@msg_q.deq) }
+        end
+      end
+    end
+
+    class Worker
+      def initialize(socket, q)
+        @parser = Parser.new
+        @socket = socket
+        @q = q
+      end
+
+      def process
+        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| @q << msg }
+        if last_msg == Parser::LAST_MSG
+          @socket.close
+          return false
+        end
+        @q << last_msg
+
+        true
+      end
+    end
+
+  end
+end

data/lib/plux/server.rb

@@ -1,5 +1,5 @@
 require "nio"
-require "plux/reactors"
+require "plux/reactor"
 
 module Plux
 
@@ -44,8 +44,8 @@ module Plux
         UNIXServer.open(Plux.server_file(name)) do |serv|
           parent.close
           worker = Class.new(&block).new
-          reactors = Reactors.new(@thread, worker)
-          loop{ reactors.register(serv.accept) }
+          reactor = Reactor.new(@thread, worker)
+          loop{ reactor.register(serv.accept) }
         end
       end
 

data/lib/plux/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plux
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ files:
 - lib/plux.rb
 - lib/plux/client.rb
 - lib/plux/parser.rb
-- lib/plux/reactors.rb
+- lib/plux/reactor.rb
 - lib/plux/server.rb
 - lib/plux/version.rb
 - plux.gemspec

data/lib/plux/reactors.rb

@@ -1,91 +0,0 @@
-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