rbgo 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f583cbc3309a81e56fa7388a94b12e221be18ee671e40075dc1d2a531a1387
-  data.tar.gz: 66adc91902e07196656a01fbba5bd5c4f3e451f670b3da62ea1f2b9079b8f225
+  metadata.gz: 4811ffce7c609abea9507fc023c9383121d232d6b79cb221e1ac62980ea879a0
+  data.tar.gz: 297e658752df154a7e5202cd2d6801c5b4aef3399229710f1b37bc0e6e025868
 SHA512:
-  metadata.gz: dc11f265924a159752c9664a53668a7e8e5495693c1b71807017410699587ff1e165256dd574a3a7129924aae440c8227dc9cc0127d7596c726f312839e42577
-  data.tar.gz: 6f255f61b6c4e5ab6284a94f67df012b356fd1ccbb25f1110b61dba9954a07bde780b8778be8c9574f1c48f82074391fd559b30816d4dffe9de763fa8c28a163
+  metadata.gz: 70ba89e8bb29f007a40e51d715306da0cec8ebb9c71331e2f60d08e46005ca12d44eb5e18dace1b531f758b226abe40e1c31f7101d78c95a3864db2410d30c40
+  data.tar.gz: 8ffd9db409f9714c7d160d994a19f38d0ffbacd0fb115a77ade48574ba326f73a40b8389a105703386fa524676cfa5b318acc663c37e72d71510f421317f9060

data/.gitignore

@@ -6,4 +6,5 @@ pkg/*
 tmp/*
 .rbx
 Gemfile.lock
+.bash_history
 

data/lib/rbgo/actor.rb

@@ -4,7 +4,6 @@ require 'thread'
 module Rbgo
   class Actor
     private
-
     attr_accessor :mail_box
 
     public
@@ -35,9 +34,12 @@ module Rbgo
     private
 
     def start_msg_loop
-      CoRun::Routine.new(new_thread: true) do
-        while msg = mail_box.deq
+      CoRun::Routine.new(new_thread: true, queue_tag: :default) do
+        loop do
+          break if mail_box.closed?
+          msg = mail_box.deq
           handler.call(msg, self) rescue nil
+          Fiber.yield
         end
       end
     end

data/lib/rbgo/corun.rb

@@ -44,6 +44,24 @@ module Rbgo
       end
     end
 
+    def self.accept_from(sock)
+      if is_in_corun_fiber?
+        receipt = Scheduler.instance.io_machine.do_socket_accept(sock)
+        Fiber.yield [YIELD_IO_OPERATION, receipt]
+      else
+        sock.accept
+      end
+    end
+
+    def self.connect_to(sock, remote_sockaddr:)
+      if is_in_corun_fiber?
+        receipt = Scheduler.instance.io_machine.do_socket_connect(sock, remote_sockaddr: remote_sockaddr)
+        Fiber.yield [YIELD_IO_OPERATION, receipt]
+      else
+        sock.connect(remote_sockaddr)
+      end
+    end
+
     def self.write_to(io, str:)
       if is_in_corun_fiber?
         receipt = Scheduler.instance.io_machine.do_write(io, str: str)
@@ -65,29 +83,10 @@ module Rbgo
 
       attr_accessor :args, :blk, :fiber, :io_receipt
 
-      def initialize(*args, new_thread: false, &blk)
+      def initialize(*args, new_thread: false, queue_tag: :default, &blk) # :default :none :actor
         self.args = args
         self.blk  = blk
-        if new_thread
-          Thread.new do
-            Thread.current.report_on_exception = false
-            self.fiber                         = Fiber.new do |args|
-              blk.call(*args)
-            end
-
-            begin
-              while fiber.alive?
-                fiber.resume(*args)
-              end
-            rescue Exception => ex
-              self.error = ex
-              STDERR.puts ex
-            end
-          end
-
-        else
-          Scheduler.instance.schedule(self)
-        end
+        Scheduler.instance.schedule(self, new_thread: new_thread, queue_tag: queue_tag)
       end
 
       def perform
@@ -138,7 +137,7 @@ module Rbgo
       private
 
       attr_accessor :thread_pool
-      attr_accessor :task_queue
+      attr_accessor :task_queues, :task_queues_mutex
       attr_accessor :msg_queue
       attr_accessor :supervisor_thread
       attr_accessor :io_machine_init_once
@@ -147,20 +146,21 @@ module Rbgo
         self.num_thread = System::CPU.count rescue 8
         self.thread_pool = []
 
-        self.msg_queue  = Queue.new
-        self.task_queue = Queue.new
+        self.msg_queue         = Queue.new
+        self.task_queues       = Hash.new { |hash, key| hash[key] = Queue.new }
+        self.task_queues_mutex = Mutex.new
 
         self.check_interval = 0.1
 
         self.io_machine_init_once = Once.new
 
-        msg_queue << :init
+        msg_queue << [:init]
         create_supervisor_thread
         generate_check_msg
       end
 
       # only called by supervisor thread
-      def create_thread
+      def create_thread(run_for_once: false, queue_tag: :default, init_task: nil)
         begin
           thread_pool << Thread.new do
             Thread.current.report_on_exception = false
@@ -169,6 +169,8 @@ module Rbgo
               yield_task_queue      = Queue.new
               pending_io_task_queue = Queue.new
               local_task_queue      = Queue.new
+              task_queue            = get_queue(queue_tag)
+              local_task_queue << init_task if init_task
               loop do
                 task = nil
                 if local_task_queue.empty?
@@ -218,14 +220,20 @@ module Rbgo
                   yield_task_queue << task
                 end
 
-                should_exit = Thread.current.thread_variable_get(:should_exit) &&
-                  yield_task_queue.empty? &&
-                  pending_io_task_queue.empty? &&
-                  local_task_queue.empty?
+                if run_for_once
+                  should_exit = yield_task_queue.empty? &&
+                    pending_io_task_queue.empty? &&
+                    local_task_queue.empty?
+                else
+                  should_exit = Thread.current.thread_variable_get(:should_exit) &&
+                    yield_task_queue.empty? &&
+                    pending_io_task_queue.empty? &&
+                    local_task_queue.empty?
+                end
                 break if should_exit
               end
             ensure
-              msg_queue << :thread_exit unless should_exit
+              msg_queue << [:thread_exit] unless should_exit
             end
           end
         rescue Exception => ex
@@ -239,9 +247,13 @@ module Rbgo
           begin
             loop do
               msg = msg_queue.deq
-              case msg
+              case msg[0]
               when :thread_exit, :init, :check
                 check_thread_pool
+              when :new_thread
+                task = msg[1]
+                tag  = msg[2]
+                create_thread(run_for_once: true, queue_tag: tag, init_task: task)
               end
             end
           ensure
@@ -255,7 +267,7 @@ module Rbgo
         Thread.new do
           begin
             loop do
-              msg_queue << :check
+              msg_queue << [:check]
               sleep check_interval
             end
           ensure
@@ -295,10 +307,21 @@ module Rbgo
         nil
       end
 
+      def get_queue(tag)
+        task_queues_mutex.synchronize do
+          task_queues[tag]
+        end
+      end
+
       public
 
-      def schedule(routine)
-        task_queue << routine
+      def schedule(routine, new_thread: false, queue_tag: :default)
+        if new_thread
+          msg_queue << [:new_thread, routine, queue_tag]
+        else
+          queue = get_queue(queue_tag)
+          queue << routine
+        end
         nil
       end
     end
@@ -309,11 +332,11 @@ module Rbgo
   module CoRunExtensions
     refine Object do
       def go(*args, &blk)
-        CoRun::Routine.new(*args, new_thread: false, &blk)
+        CoRun::Routine.new(*args, new_thread: false, queue_tag: :default, &blk)
       end
 
       def go!(*args, &blk)
-        CoRun::Routine.new(*args, new_thread: true, &blk)
+        CoRun::Routine.new(*args, new_thread: true, queue_tag: :none, &blk)
       end
     end
 
@@ -333,7 +356,16 @@ module Rbgo
       def yield_write(str)
         CoRun.write_to(self, str: str)
       end
+    end
+
+    refine Socket do
+      def yield_accept
+        CoRun.accept_from(self)
+      end
 
+      def yield_connect(remote_sockaddr)
+        CoRun.connect_to(self, remote_sockaddr: remote_sockaddr)
+      end
     end
   end
 end

data/lib/rbgo/io_machine.rb

@@ -66,6 +66,19 @@ module Rbgo
       receipt
     end
 
+    def do_socket_accept(sock)
+      op      = [:register_socket_accept, sock]
+      receipt = IOReceipt.new(op)
+      actor.send_msg(receipt)
+      receipt
+    end
+
+    def do_socket_connect(sock, remote_sockaddr:)
+      op      = [:register_socket_connect, sock, remote_sockaddr]
+      receipt = IOReceipt.new(op)
+      actor.send_msg(receipt)
+      receipt
+    end
 
     def close
       actor.close
@@ -102,6 +115,10 @@ module Rbgo
           handle_read_partial_msg(receipt, actor)
         when :register_write
           handle_write_msg(receipt, actor)
+        when :register_socket_accept
+          handle_socket_accept_msg(receipt, actor)
+        when :register_socket_connect
+          handle_socket_connect_msg(receipt, actor)
         end
       end #end of actor
 
@@ -127,6 +144,74 @@ module Rbgo
       nil
     end
 
+    def handle_socket_connect_msg(receipt, actor)
+
+      op              = receipt.registered_op
+      sock            = op[1]
+      remote_sockaddr = op[2]
+      res             = nil
+
+      monitor = register(receipt, interest: :w)
+      return if monitor.nil?
+
+      monitor.value    ||= []
+      monitor.value[1] = proc do
+        notify_blk = proc do
+          monitors.delete(monitor.io)
+          monitor.close
+          receipt.res = res
+          receipt.notify
+        end
+        catch :exit do
+          begin
+            res = sock.connect_nonblock(remote_sockaddr, exception: false)
+          rescue Exception => ex
+            notify_blk.call
+            STDERR.puts ex
+            throw :exit
+          end
+          if res == :wait_writable
+            throw :exit
+          end
+          notify_blk.call
+        end
+      end
+      monitor.value[1].call
+      actor.send_msg :do_select
+    end
+
+    def handle_socket_accept_msg(receipt, actor)
+      op   = receipt.registered_op
+      sock = op[1]
+      res  = nil
+
+      monitor = register(receipt, interest: :r)
+      return if monitor.nil?
+
+      monitor.value    ||= []
+      monitor.value[0] = proc do
+        notify_blk = proc do
+          monitors.delete(monitor.io)
+          monitor.close
+          receipt.res = res
+          receipt.notify
+        end
+        catch :exit do
+          begin
+            res = sock.accept_nonblock(exception: false)
+          rescue Exception => ex
+            notify_blk.call
+            STDERR.puts ex
+            throw :exit
+          end
+          if res == :wait_readable
+            throw :exit
+          end
+          notify_blk.call
+        end
+      end
+      actor.send_msg :do_select
+    end
 
     def handle_read_partial_msg(receipt, actor)
       op     = receipt.registered_op
@@ -362,6 +447,7 @@ module Rbgo
           STDERR.puts ex
         end
       end
+      monitor.value[1].call
       actor.send_msg :do_select
     end
 

data/lib/rbgo/version.rb

@@ -1,3 +1,3 @@
 module Rbgo
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbgo
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Wang Yin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system