xchan.rb 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8936112cb188471884a6fa66ee0db2b61d5229ac75acb8953c78e5b76587bc8
-  data.tar.gz: e76eb21f0f7f2a11e465ee3d4834b3abd48b54269949ee3623e2b2c2bdc1a17c
+  metadata.gz: 2d385aa7803c7861610c50348dec4108760bf2e0a21d36bd6a9402788ec56f62
+  data.tar.gz: 5292469bfb8a3cc8fb581d12ecde445cef46551000604b6e8d1c3b9ca96b2d93
 SHA512:
-  metadata.gz: d6ff8db4154e29a41a41b3878a93355ab3ce8092112f76f7fa4a61042a9747138f9a270217decf0e39cc5a9890f7ce5f34ebaa8a93e74aeb68d1cf5b0d470a09
-  data.tar.gz: bbe432d09de33e607b7940005a1d29ee0c1de6c14d3a2a56105c5fa26e32ea81a6327a87a6e520163f34836ffe820296674bf29a46c72cc45c603872500f090f
+  metadata.gz: 10b83c2ad3e4861715b4348f0e4aa54e9f84377fa08acf3fb59caaccbb164909326ae1d527afaac5bed6a7401a4981942f75b767a370cb276553784ab0bce2b0
+  data.tar.gz: 990ed1ae55dba125d7f95a4e2d2477353b7bddeaa275149713fc2769fd36cea564ebe179567fe93924b1a37bc18f9e4c51ea7da1310587c34c94190975154fb8

data/lib/xchan/unix_socket.rb

@@ -46,6 +46,8 @@ class Chan::UNIXSocket
     @counter = Chan::Counter.new(tmpdir)
     @lock = Chan.locks[lock]&.call(tmpdir) || lock
     @mutex = Mutex.new
+    @partial = nil
+    @partial_len = 0
   end
 
   ##
@@ -107,10 +109,12 @@ class Chan::UNIXSocket
     @mutex.synchronize do
       @lock.lock_nonblock
       raise IOError, "channel closed" if closed?
-      len = @w.write_nonblock(serialize(object))
-      @bytes.push(len)
-      @counter.increment!(bytes_written: len)
-      len.tap { @lock.release }
+      data = serialize(object)
+      head = [data.bytesize].pack("Q>")
+      n = @w.write_nonblock(head << data)
+      @bytes.push(data.bytesize)
+      @counter.increment!(bytes_written: data.bytesize)
+      data.bytesize.tap { @lock.release }
     rescue IOError, IO::WaitWritable, Errno::ENOBUFS => ex
       @lock.release
       raise Chan::WaitWritable, ex.message
@@ -157,15 +161,35 @@ class Chan::UNIXSocket
     @mutex.synchronize do
       @lock.lock_nonblock
       raise IOError, "closed channel" if closed?
-      len = @bytes.shift
-      obj = deserialize(@r.read_nonblock(len.zero? ? 1 : len))
-      @counter.increment!(bytes_read: len)
+      stream = @r.local_address.socktype == Socket::SOCK_STREAM
+      unless @partial
+        if stream
+          head = String.new
+          while head.bytesize < 8
+            head << @r.read_nonblock(8 - head.bytesize)
+          end
+          @partial_len = head.unpack1("Q>")
+          @partial = String.new(capacity: @partial_len)
+        else
+          buf = @r.read_nonblock(65536)
+          @partial_len = buf[0, 8].unpack1("Q>")
+          @partial = buf[8, @partial_len]
+        end
+        @bytes.shift
+      end
+      if stream
+        while @partial.bytesize < @partial_len
+          @partial << @r.read_nonblock(@partial_len - @partial.bytesize)
+        end
+      end
+      obj = deserialize(@partial)
+      @counter.increment!(bytes_read: @partial.bytesize)
+      @partial = nil
       obj.tap { @lock.release }
     rescue IOError => ex
       @lock.release
       raise(ex)
     rescue IO::WaitReadable => ex
-      @bytes.unshift(len)
       @lock.release
       raise Chan::WaitReadable, ex.message
     rescue Errno::EAGAIN => ex
@@ -198,6 +222,13 @@ class Chan::UNIXSocket
     lock { size.zero? }
   end
 
+  ##
+  # @return [Integer]
+  #  Returns the number of elements waiting to be read
+  def size
+    @bytes.size
+  end
+
   ##
   # @group Stat methods
 
@@ -218,14 +249,16 @@ class Chan::UNIXSocket
   alias_method :bytes_read, :bytes_received
 
   ##
-  # @return [Integer]
-  #  Returns the number of objects waiting to be read
-  def size
-    lock { @bytes.size }
-  end
+  # @endgroup
 
   ##
-  # @endgroup
+  # @return [void]
+  def flush
+    @lock.lock
+    to_a
+  ensure
+    @lock.release
+  end
 
   ##
   # @group Wait methods

data/lib/xchan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Chan
-  VERSION = "0.21.0"
+  VERSION = "0.22.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xchan.rb
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - '0x1eef'
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: An easy to use InterProcess Communication (IPC) library
 test_files: []