cztop 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e5938035e1b344dafa25665293cddc9017c5b9c47280bacc9fc4b9ff97fc2e
-  data.tar.gz: 16b1a7896a2f118cfd2fcfa2829acbeb5e3d021472c34aa6dfd190ed8bb1a5bf
+  metadata.gz: e3c85c43224c3d6b657fdc1178c3dc145bae175ab4febd29194717074509c3e0
+  data.tar.gz: 70b7dd7ed91196fa9c24bd911be6d30f5c5f9c3b5a55f70c8a78f4cfbbb8d74c
 SHA512:
-  metadata.gz: 5e6058194cbb28727e78f92a431c203ee45f5363a89e4fbaa3026553d3b3b8610240947b7336f5625218458acd77388038734b00a966c8f6fa3ac7c45d9616a0
-  data.tar.gz: b549f127a5031b643807702ee279a0dc4565f252c3489b10da5f6191617162f618946518175e3bb4de4c3c7b1628fb355ad5c063f31c2b05c34bf93c07d15f2c
+  metadata.gz: 34a251ab8bd12c5220dea4627f7cf3823d0aaf590da6875ba182d92107defd17a68100e638d8feca6b348608585d80f0002af77dfb8f34c68cc7d00fd5af2cb0
+  data.tar.gz: 70ee8e3f715ab38d820e48919e0c7e8608cdcd836383ed969ec712447b14db74b7706cc9b7e86d40f9c1b71ec2d2300a3287cdbc39edbb6270e1e00576e6d9b5

data/CHANGES.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+2.0.4
+-----
+
+* Prevent socket double destruction by removing finalizers before native cleanup
+  and sharing their pointer holders with explicit destruction
+* Prevent monitor double destruction with the same finalizer cleanup ordering
+  and shared pointer holder
+* Keep parent messages alive while borrowed frames remain live, and reject frame
+  access after message ownership is transferred
+
 2.0.3
 -----
 

data/lib/cztop/ffi.rb

@@ -172,8 +172,8 @@ module CZMQ
       end
 
       module ClassMethods
-        def prevent_leak(ptr, destroy_fn)
-          prevent_leak_ptr = ::FFI::MemoryPointer.new(:pointer)
+        def prevent_leak(ptr, destroy_fn, ptr_ref: nil)
+          prevent_leak_ptr = ptr_ref || ::FFI::MemoryPointer.new(:pointer)
           prevent_leak_ptr.write_pointer(ptr)
           prevent_leak_fn = destroy_fn
           ->(id) { CZMQ::FFI.__send__(prevent_leak_fn, prevent_leak_ptr) }
@@ -264,10 +264,11 @@ module CZMQ
 
       def initialize(type)
         @ptr = CZMQ::FFI.zsock_new(type)
+        @ptr_ref = ::FFI::MemoryPointer.new(:pointer)
         @moved = false
         unless @ptr.null?
           ObjectSpace.define_finalizer(self,
-            self.class.prevent_leak(@ptr, :zsock_destroy))
+            self.class.prevent_leak(@ptr, :zsock_destroy, ptr_ref: @ptr_ref))
         end
       end
 
@@ -287,11 +288,13 @@ module CZMQ
 
       def self._wrap(ptr)
         obj = allocate
+        ptr_ref = ::FFI::MemoryPointer.new(:pointer)
         obj.instance_variable_set(:@ptr, ptr)
+        obj.instance_variable_set(:@ptr_ref, ptr_ref)
         obj.instance_variable_set(:@moved, false)
         unless ptr.null?
           ObjectSpace.define_finalizer(obj,
-            prevent_leak(ptr, :zsock_destroy))
+            prevent_leak(ptr, :zsock_destroy, ptr_ref: ptr_ref))
         end
         obj
       end
@@ -320,11 +323,10 @@ module CZMQ
 
       def destroy
         return if @moved
-        ptr_ptr = ::FFI::MemoryPointer.new(:pointer)
-        ptr_ptr.write_pointer(@ptr)
-        CZMQ::FFI.zsock_destroy(ptr_ptr)
         @moved = true
         ObjectSpace.undefine_finalizer(self)
+        # Native destruction releases the GVL and nulls the finalizer's reference.
+        CZMQ::FFI.zsock_destroy(@ptr_ref)
       end
 
       def set_subscribe(prefix)
@@ -465,7 +467,7 @@ module CZMQ
 
       # Returns a Zframe that does NOT own the pointer (borrowed from zmsg).
       def _borrowed_frame(ptr)
-        Zframe._from_ptr(ptr, false)
+        Zframe._from_ptr(ptr, owner: self)
       end
     end
 
@@ -473,19 +475,22 @@ module CZMQ
     # Zframe (lightweight; only used for borrowed frames from Zmsg)
     # -----------------------------------------------------------------
     class Zframe
-      # Wraps a borrowed zframe_t pointer (not owned, no finalizer).
+      # Wraps a borrowed zframe_t pointer and retains its owning message.
       #
-      def self._from_ptr(ptr, _owned = false)
+      def self._from_ptr(ptr, owner:)
         obj = allocate
         obj.instance_variable_set(:@ptr, ptr)
+        obj.instance_variable_set(:@owner, owner)
         obj
       end
 
       def data
+        @owner.to_ptr
         CZMQ::FFI.zframe_data(@ptr)
       end
 
       def size
+        @owner.to_ptr
         CZMQ::FFI.zframe_size(@ptr)
       end
     end

data/lib/cztop/monitor.rb

@@ -46,9 +46,9 @@ module CZTop
 
       @closed = false
 
-      prevent_leak_ptr = ::FFI::MemoryPointer.new(:pointer)
-      prevent_leak_ptr.write_pointer(@actor_ptr)
-      ObjectSpace.define_finalizer(self, self.class._make_destructor(prevent_leak_ptr))
+      @actor_ref = ::FFI::MemoryPointer.new(:pointer)
+      @actor_ref.write_pointer(@actor_ptr)
+      ObjectSpace.define_finalizer(self, self.class._make_destructor(@actor_ref))
 
       CZMQ::FFI.zstr_send(@actor_ptr, 'VERBOSE') if verbose
 
@@ -103,11 +103,9 @@ module CZTop
     def close
       return if @closed
 
-      pp = ::FFI::MemoryPointer.new(:pointer)
-      pp.write_pointer(@actor_ptr)
-      CZMQ::FFI.zactor_destroy(pp)
       @closed = true
       ObjectSpace.undefine_finalizer(self)
+      CZMQ::FFI.zactor_destroy(@actor_ref)
     end
 
 

data/lib/cztop/version.rb

@@ -2,6 +2,6 @@
 
 module CZTop
 
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cztop
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Patrik Wenger