cztop 1.2.6 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca8b5fa8bb96e24ab3c500b704891677ab4431b66f027cfd68dd15d7be79a380
-  data.tar.gz: c6360aaef9640bf4f7f75bf3f7f2229d48c93b9e5929bdb28c5012fb9a014806
+  metadata.gz: 1347b002694da386afc7249ac227de7ee7f1224bb140564334b20d646336e73a
+  data.tar.gz: faa02a6ba73af47cbff6af9664562e41d359ba4f13eb5813d6e1e5fc992b6aa8
 SHA512:
-  metadata.gz: b099c61bbfde6095eaf621b09f13501e2529f87fd91850863b4bdb30d4856584908fc06712371db6f767bf2061f9752cb26991b185e9dd8ab212d686911747fd
-  data.tar.gz: 0731e75df8e20bbfb12546ef2145811104dc117eb381b65edbe1733cf147b4785bcc96679a372f3029351da338872c915f7d801f7031f5302ad52196fec056a7
+  metadata.gz: fd22665b89635d5f5a6bbd8326a1de9c13f77a39a253a07316089d9124ec18dadebc67f86b5ec471cc3e09cb0eb6c32d027ad523573fc2b8e502c37b05119cc2
+  data.tar.gz: 1de1565a9d4656e9887958befb29ea0cad66ad90f30d84244f3f60bbcc7069a0cfc20bb1be1c8ff06db34e02546ca9ff8349c01689faa1725e6f8cb069e846db

data/CHANGES.md

@@ -1,3 +1,17 @@
+1.3.2 (1/3/2025)
+-----
+* add 'benchmark' dependency for specs
+
+1.3.1 (1/3/2025)
+-----
+* find libzmq in /usr/lib and respect LD_LIBRARY_PATH
+* relax dependency to allow czmq-ffi-gen 1.x
+
+1.2.7 (7/12/2024)
+-----
+* CZTop::Socket#wait_readable: honor small (< 0.5s) timeouts
+* CZTop::Socket#wait_writable: honor small (< 0.5s) timeouts
+
 1.2.6 (7/12/2024)
 -----
 * add missing `require 'io/wait'` to get `IO#wait_readable`

data/README.md

@@ -1,5 +1,6 @@
 ![Specs status](https://github.com/paddor/cztop/workflows/STABLE%20API/badge.svg)
-![Specs status](https://github.com/paddor/cztop/workflows/DRAFT%20API/badge.svg)
+![Specs status](https://github.com/paddor/cztop/workflows/DRAFT%20API%20on%20Ruby%203.3/badge.svg)
+![Specs status](https://github.com/paddor/cztop/workflows/DRAFT%20API%20on%20Ruby%203.4/badge.svg)
 [![codecov](https://codecov.io/gh/paddor/cztop/branch/master/graph/badge.svg?token=TnjOba97R7)](https://codecov.io/gh/paddor/cztop)
 
 # CZTop

data/cztop.gemspec

@@ -23,9 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "czmq-ffi-gen", "~> 1.1.0"
+  spec.add_runtime_dependency "czmq-ffi-gen", "~> 1.1", ">= 1.1.0"
 
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "benchmark"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "minitest"

data/lib/cztop/poller/zmq.rb

@@ -9,11 +9,21 @@ module CZTop
     POLLERR = 4
 
     extend ::FFI::Library
-    lib_name  = 'libzmq'
-    lib_dirs  = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
-    lib_dirs  = [*ENV['LIBZMQ_PATH'].split(':'), *lib_dirs] if ENV['LIBZMQ_PATH']
-    lib_paths = lib_dirs.map { |path| "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}" }
-    ffi_lib lib_paths + [lib_name]
+    lib_name      = 'libzmq'
+    major_version = '5'
+    lib_dirs      = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64', '/usr/lib']
+    lib_dirs      = [*ENV['LD_LIBRARY_PATH'].split(':'), *lib_dirs] if ENV['LD_LIBRARY_PATH']
+    lib_dirs      = [*ENV["#{lib_name.upcase}_PATH"].split(':'), *lib_dirs] if ENV["#{lib_name.upcase}_PATH"]
+    lib_paths     = lib_dirs.map do |path|
+      [
+        "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}",
+        "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}.#{major_version}"
+      ]
+    end.flatten
+
+    lib_paths.concat [lib_name, "#{lib_name}.#{::FFI::Platform::LIBSUFFIX}.#{major_version}"]
+
+    ffi_lib lib_paths
 
     # This represents a +zmq_poller_event_t+ as in:
     #

data/lib/cztop/send_receive_methods.rb

@@ -48,15 +48,29 @@ module CZTop
 
 
     # Because ZMQ sockets are edge-triggered, there's a small chance that we miss an edge (race condition). To avoid
-    # blocking forever, all waiting on the ZMQ FD is done with this timeout.
+    # blocking forever, all waiting on the ZMQ FD is done with this timeout or less.
+    #
+    # The race condition exists between the calls to {#readable?}/{#writable?} and waiting for the ZMQ FD. If the
+    # socke becomes readable/writable during that time, waiting for the FD could block forever without a timeout.
+    #
     FD_TIMEOUT = 0.5
 
 
     # @note Only available on Ruby >= 3.2
     #
-    def wait_for_fd_signal
+    def wait_for_fd_signal(timeout = nil)
       @fd_io ||= to_io
-      @fd_io.wait_readable FD_TIMEOUT # NOTE: always wait for readability on ZMQ FD
+
+      if timeout
+        if timeout > FD_TIMEOUT
+          timeout = FD_TIMEOUT
+        end
+      else
+        timeout = FD_TIMEOUT
+      end
+
+      # NOTE: always wait for readability on ZMQ FD
+      @fd_io.wait_readable timeout
     end if IO.method_defined?(:wait_readable)
 
 
@@ -80,7 +94,7 @@ module CZTop
       while true
         # p wait_readable: self, timeout: timeout
 
-        wait_for_fd_signal
+        wait_for_fd_signal timeout
         break if readable? # NOTE: ZMQ FD can't be trusted
         raise ::IO::TimeoutError if timeout_at && now >= timeout_at
 
@@ -107,7 +121,7 @@ module CZTop
       while true
         # p wait_writable: self, timeout: timeout
 
-        wait_for_fd_signal
+        wait_for_fd_signal timeout
         break if writable? # NOTE: ZMQ FD can't be trusted
         raise ::IO::TimeoutError if timeout_at && now >= timeout_at
 

data/lib/cztop/version.rb

@@ -2,6 +2,6 @@
 
 module CZTop
 
-  VERSION = '1.2.6'
+  VERSION = '1.3.1'
 
 end

metadata

@@ -1,20 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: cztop
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.1
 platform: ruby
 authors:
 - Patrik Wenger
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2025-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: czmq-ffi-gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
@@ -22,6 +24,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
@@ -38,6 +43,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +213,6 @@ metadata:
   homepage_uri: https://github.com/paddor/cztop
   source_code_uri: https://github.com/paddor/cztop
   changelog_uri: https://github.com/paddor/cztop/blob/master/CHANGES.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -209,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: CZMQ FFI binding to bring ZMQ sockets to Ruby
 test_files: []