plux 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472f8a38bccdb6c63b10b4291c4cd109598e8819222c4061dd673f3491d58344
-  data.tar.gz: 489ce27db397a3df71058642b8f3dab80ac255cf1ace82f66c12d80980de4efc
+  metadata.gz: ccf41ebecbdaa05e45295b9a3237cf72710d435459c4031b8d19c3ce1806165f
+  data.tar.gz: 61ab35e88507321b06de9c1c4e9fabcfdabfd1c7d5333bcb1cf7b1195b6a9b10
 SHA512:
-  metadata.gz: 565721905d9e193557d56c78a323f35bd41e1650bb7592607534a6da3cf9f961d66801b2a169477f9b3b2019f06d45e1e08bcda6b146d855d5018b11ba5a6231
-  data.tar.gz: 32d1c59b0a5b169e9ed33302d576dc3d87e42ba376d9f927f61a34d1f5b8bcdf44582fe11a547de0d62c1827158248dfb6293df8fd06cdaa5716f23bcb313741
+  metadata.gz: 8ddb55b3ab4d9a5544ba0ba3780d30a63decab60197cc97ea431d68d313bc6c9a0e91b17dfa9cf54f25848eee10f2ade27e5790d5f454a13bc063759811bf729
+  data.tar.gz: 4cda0ff1be89717a676b5622e221a227d426cbc08ede6bb86faf4bc8a0e12c525965a5eafcb29f90f345ec8f3627946ba5e2f2f0ca09d553926e1ebf80f6e186

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    plux (0.1.3)
+    plux (0.1.6)
+      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.4)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/README.md

@@ -21,32 +21,57 @@ 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
+  # prepare thread-safe resources like mq/db, to handle requests
+  def prepare
     # @db = ...
   end
 
   # threads call this method to deal with clients' message
-  def work(msg)
+  def process(msg)
     # @db << parse(msg)
   end
 end
 
-# five threads will be started to handle these clients,
-# and finished once their counterparts call close
+# 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
 ```
 
+Also, you can boot multiple servers(processes) with same logic:
+
+```ruby
+class AwesomeServer < Plux::Engine
+  # prepare thread-safe resources like mq/db, to handle requests
+  def prepare
+    # @db = ...
+  end
+
+  # threads call this method to deal with clients' message
+  def process(msg)
+    # @db << parse(msg)
+  end
+end
+
+a = AwesomeServer.new(:a)
+b = AwesomeServer.new(:b)
+c = AwesomeServer.new(:c, thread: 4)
+
+a_client = a.connect
+b_client = b.connect
+c_client = c.connect
+c_client_2 = c.connect
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/plux.rb

@@ -4,6 +4,7 @@ require "plux/version"
 require "plux/server"
 require "plux/client"
 require "plux/parser"
+require "plux/engine"
 
 
 module Plux
@@ -32,10 +33,12 @@ module Plux
       File.join(dir, "#{server_name}.so")
     end
 
-    def worker(name, &block)
-      Server.new(name).boot(block)
+    def worker(name, thread: 1, &block)
+      worker = Class.new(&block).new
+      Server.new(name, thread: thread).boot(worker)
     end
   end
 
   FileUtils.mkdir_p(self.dir)
+
 end

data/lib/plux/engine.rb

@@ -0,0 +1,21 @@
+module Plux
+  class Engine
+
+    attr_reader :name
+
+    def initialize(name, thread: 1)
+      @name = name
+      @server = Server.new(name, thread: thread).boot(self)
+    end
+
+    def connect
+      @server.connect
+    end
+
+    def prepare
+    end
+
+    def process(msg)
+    end
+  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.process(@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,3 +1,6 @@
+require "nio"
+require "plux/reactor"
+
 module Plux
 
   class Server
@@ -6,13 +9,14 @@ module Plux
     Active = {}
     at_exit{ Active.values.each(&:close) }
 
-    def initialize(name)
+    def initialize(name, thread: )
       @name = name
+      @thread = thread
     end
 
-    def boot(block)
+    def boot(worker)
       Plux.lock_pid_file(name) do |file|
-        start_server_if_not_pid(file, block)
+        start_server_if_not_pid(file, worker)
       end
       self
     end
@@ -27,7 +31,7 @@ module Plux
 
     private
 
-    def start_server_if_not_pid(file, block)
+    def start_server_if_not_pid(file, worker)
       @pid = file.read.to_i
       return unless pid == 0
 
@@ -39,11 +43,9 @@ module Plux
         child.close
         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
+          worker.prepare
+          reactor = Reactor.new(@thread, worker)
+          loop{ reactor.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.8"
 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.8
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2020-10-01 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
@@ -85,7 +99,9 @@ files:
 - bin/setup
 - lib/plux.rb
 - lib/plux/client.rb
+- lib/plux/engine.rb
 - lib/plux/parser.rb
+- lib/plux/reactor.rb
 - lib/plux/server.rb
 - lib/plux/version.rb
 - plux.gemspec