rbgo 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9125e71cafdd2fc084f39bd7ad9f3f5ffd96c8e9a93d7fe4c35e1db9f76341d
-  data.tar.gz: 618ab2ee058c1c1538140f4a98e6ff938b34c9c521cb89af2d105a4f7cb84100
+  metadata.gz: ec171658e61d3d64d313126f3b3ee709565a4676624a513982c73d531c4c2ce8
+  data.tar.gz: 7266385dc226a8643dae466209ec674e59390fee1faabfbba39e85d578d875a6
 SHA512:
-  metadata.gz: a0c92fe1b129173ccceacc0315285f41ab6f4ef24c0881919ac8c33f6fe66e63fdb5c4797f061537dcbf5faa31e96135e528e026cf53c6f73631d8f018086df0
-  data.tar.gz: 314321f3953cdb3c23802f7c0d99af866101c48163c90fe314ffff7513032b4e79c249125c9be1b5610907b836604078cf0d86942d4ccf347cf96e5a20b30c9e
+  metadata.gz: 42f49f6cade30b7f4ebc6ac57c2ff9386d09256032cec1d87d11ca9f2b5b7f0c4b92e56c1db593066ddebfbb7f6ea208a2de9f64c721332268c0e0b10fddeba2
+  data.tar.gz: 637bdfec998a93e8aadbef3d84d0ffc6faf1744b41f877e8faed3de349b3a77ecc80662822dbc6816302e8b5cbe7109b1a2c0fe58b52938095eb6b90e9de260e

data/README.md

@@ -231,12 +231,13 @@ require 'rbgo'
 using Rbgo::CoRunExtensions
 
 #localhost, port 3000
-tcp_service = Rbgo::NetworkServiceFactory.open_tcp_service(3000) do|sock, clientAddrInfo|
-  p [sock, clientAddrInfo] 
-  p sock.yield_read
-  sock.yield_write("hello")
-  sock.close  #SHOULD CLOSE SOCK MANUALLY since version 0.2.0
-end                  
+tcp_service = Rbgo::NetworkServiceFactory.open_tcp_service(3000) do|sock, _|
+  sock.yield_read_line("\r\n\r\n") # read http request
+  sock.close_read
+  sock.yield_write("HTTP/1.1 200 OK \r\n\r\nHello World!")
+  sock.close_write
+  sock.close
+end                 
 
                                         
 

data/lib/rbgo/actor.rb

@@ -35,9 +35,10 @@ module Rbgo
     private
 
     def start_msg_loop
-      CoRun::Routine.new(new_thread: true) do
+      CoRun::Routine.new(new_thread: false) do
         while msg = mail_box.deq
           handler.call(msg, self) rescue nil
+          Fiber.yield
         end
       end
     end

data/lib/rbgo/corun.rb

@@ -3,6 +3,7 @@ require 'fiber'
 require 'system'
 require 'singleton'
 require_relative 'io_machine'
+require_relative 'once'
 
 module Rbgo
   module CoRun
@@ -23,6 +24,16 @@ module Rbgo
       end
     end
 
+    def self.read_line_from(io, sep: $/, limit: nil)
+      if is_in_corun_fiber?
+        return "" if limit == 0
+        receipt = Scheduler.instance.io_machine.do_read_line(io, sep: sep, limit: limit)
+        Fiber.yield [YIELD_IO_OPERATION, receipt]
+      else
+        io.readline(sep, limit)
+      end
+    end
+
     def self.write_to(io, str:)
       if is_in_corun_fiber?
         receipt = Scheduler.instance.io_machine.do_write(io, str: str)
@@ -49,7 +60,8 @@ module Rbgo
         self.blk  = blk
         if new_thread
           Thread.new do
-            self.fiber = Fiber.new do |args|
+            Thread.current.report_on_exception = false
+            self.fiber                         = Fiber.new do |args|
               blk.call(*args)
             end
 
@@ -102,12 +114,24 @@ module Rbgo
       include Singleton
       attr_accessor :num_thread, :check_interval, :io_machine
 
+      def io_machine
+        io_machine_init_once.do do
+          @io_machine = IOMachine.new
+        end
+        @io_machine
+      end
+
+      def io_machine=(machine)
+        @io_machine = machine
+      end
+
       private
 
       attr_accessor :thread_pool
       attr_accessor :task_queue
       attr_accessor :msg_queue
       attr_accessor :supervisor_thread
+      attr_accessor :io_machine_init_once
 
       def initialize
         self.num_thread = System::CPU.count rescue 8
@@ -118,7 +142,7 @@ module Rbgo
 
         self.check_interval = 0.1
 
-        self.io_machine = IOMachine.new
+        self.io_machine_init_once = Once.new
 
         msg_queue << :init
         create_supervisor_thread
@@ -288,9 +312,14 @@ module Rbgo
         CoRun.read_from(self, length: len)
       end
 
+      def yield_read_line(sep = $/, limit = nil)
+        CoRun.read_line_from(self, sep: sep, limit: limit)
+      end
+
       def yield_write(str)
         CoRun.write_to(self, str: str)
       end
+
     end
   end
 end

data/lib/rbgo/io_machine.rb

@@ -52,6 +52,14 @@ module Rbgo
       receipt
     end
 
+    def do_read_line(io, sep: $/, limit: nil)
+      op      = [:register_read_line, io, sep, limit]
+      receipt = IOReceipt.new(op)
+      actor.send_msg(receipt)
+      receipt
+    end
+
+
     def close
       actor.close
       selector.close
@@ -78,12 +86,12 @@ module Rbgo
         receipt = msg
         op      = receipt.registered_op
 
-        case
-        when param_pattern_match([:register_read, IO, Integer], op)
-          handle_read_msg(receipt, actor)
-        when param_pattern_match([:register_read, IO, nil], op)
+        case op[0]
+        when :register_read
           handle_read_msg(receipt, actor)
-        when param_pattern_match([:register_write, IO, String], op)
+        when :register_read_line
+          handle_read_line_msg(receipt, actor)
+        when :register_write
           handle_write_msg(receipt, actor)
         end
       end #end of actor
@@ -111,35 +119,34 @@ module Rbgo
     end
 
 
-    def handle_read_msg(receipt, actor)
-      op                 = receipt.registered_op
-      io                 = op[1]
-      len                = op[2]
-      res                = StringIO.new
-      buf_size           = 1024 * 512
-      registered_monitor = monitors[io]
-      if registered_monitor && (registered_monitor.interests == :r || registered_monitor.interests == :rw)
-        actor.send_msg receipt
-        return
-      end
+    def handle_read_line_msg(receipt, actor)
+      op       = receipt.registered_op
+      io       = op[1]
+      sep      = op[2]
+      limit    = op[3]
+      buf_size = 512 * 1024
+      res      = ""
 
-      if registered_monitor
-        registered_monitor.add_interest(:r)
-        monitor = registered_monitor
-      else
-        monitor      = selector.register(io, :r)
-        monitors[io] = monitor
-      end
+      monitor = register(receipt, interest: :r)
+      return if monitor.nil?
 
       monitor.value    ||= []
       monitor.value[0] = proc do
-        if len.nil?
-          notify_blk = proc do
-            monitors.delete(monitor.io)
-            monitor.close
-            receipt.res = res.string
-            receipt.notify
+        notify_blk = proc do
+          monitors.delete(monitor.io)
+          monitor.close
+          if limit && limit > 0 && res.length == 0
+            receipt.res = nil
+          else
+            receipt.res = res
           end
+          receipt.notify
+        end
+
+        sep        = "\n\n" if (sep && sep.length == 0)
+
+        if limit.nil?
+          buf_size = 1 unless sep.nil?
           loop do
             begin
               buf = io.read_nonblock(buf_size, exception: false)
@@ -155,25 +162,98 @@ module Rbgo
               break
             end
             res << buf
+            unless sep.nil?
+              if res.end_with?(sep)
+                notify_blk.call
+                break
+              end
+            end
           end
-        elsif len == 0
-          monitors.delete(monitor.io)
-          monitor.close
-          receipt.res = ""
-          receipt.notify
-          break
-        else
-          notify_blk = proc do
-            monitors.delete(monitor.io)
-            monitor.close
-            if res.string.length == 0
-              receipt.res = nil
+        elsif limit > 0
+          bytes_read_n = 0
+          loop do
+            need_read_bytes_n = limit - bytes_read_n
+            if need_read_bytes_n <= 0
+              notify_blk.call
+              break
+            end
+            if sep.nil?
+              buf_size = need_read_bytes_n
             else
-              receipt.res = res.string
+              buf_size = 1
+            end
+            begin
+              buf = io.read_nonblock(buf_size, exception: false)
+            rescue Exception => ex
+              notify_blk.call
+              STDERR.puts ex
+              break
+            end
+            if buf == :wait_readable
+              break
+            elsif buf.nil?
+              notify_blk.call
+              break
+            end
+            res << buf
+            bytes_read_n += buf.bytesize
+            unless sep.nil?
+              if res.end_with?(sep)
+                notify_blk.call
+                break
+              end
             end
-            receipt.notify
           end
+        else
+          notify_blk.call
+        end
+      end
+      actor.send_msg :do_select
+    end
+
 
+    def handle_read_msg(receipt, actor)
+      op       = receipt.registered_op
+      io       = op[1]
+      len      = op[2]
+      res      = ""
+      buf_size = 1024 * 512
+
+      monitor = register(receipt, interest: :r)
+      return if monitor.nil?
+      notify_blk       = proc do
+        monitors.delete(monitor.io)
+        monitor.close
+        if len && len > 0 && res.length == 0
+          receipt.res = nil
+        else
+          receipt.res = res
+        end
+        receipt.notify
+      end
+      monitor.value    ||= []
+      monitor.value[0] = proc do
+        if len.nil?
+          loop do
+            begin
+              buf = io.read_nonblock(buf_size, exception: false)
+            rescue Exception => ex
+              notify_blk.call
+              STDERR.puts ex
+              break
+            end
+            if buf == :wait_readable
+              break
+            elsif buf.nil?
+              notify_blk.call
+              break
+            end
+            res << buf
+          end
+        elsif len == 0
+          notify_blk.call
+          break
+        else
           bytes_read_n = 0
           loop do
             need_read_bytes_n = len - bytes_read_n
@@ -208,19 +288,8 @@ module Rbgo
       io  = op[1]
       str = op[2].to_s
 
-      registered_monitor = monitors[io]
-      if registered_monitor && (registered_monitor.interests == :w || registered_monitor.interests == :rw)
-        actor.send_msg receipt
-        return
-      end
-
-      if registered_monitor
-        registered_monitor.add_interest(:w)
-        monitor = registered_monitor
-      else
-        monitor      = selector.register(io, :w)
-        monitors[io] = monitor
-      end
+      monitor = register(receipt, interest: :w)
+      return if monitor.nil?
 
       buf = NIO::ByteBuffer.new(str.bytesize)
       buf << str
@@ -250,17 +319,23 @@ module Rbgo
     end
 
 
-    def param_pattern_match(pattern, params)
-      return false unless pattern.is_a?(Array) && params.is_a?(Array)
-      return false if pattern.size != params.size
-      match = true
-      pattern.zip(params) do |type, param|
-        unless type === param
-          match = false
-          break
-        end
+    def register(receipt, interest:)
+      io                 = receipt.registered_op[1]
+      registered_monitor = monitors[io]
+      if registered_monitor && (registered_monitor.interests == interest || registered_monitor.interests == :rw)
+        actor.send_msg receipt
+        return nil
       end
-      match
+
+      if registered_monitor
+        registered_monitor.add_interest(interest)
+        monitor = registered_monitor
+      else
+        monitor      = selector.register(io, interest)
+        monitors[io] = monitor
+      end
+      monitor
     end
+
   end
 end

data/lib/rbgo/version.rb

@@ -1,3 +1,3 @@
 module Rbgo
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

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