omq-backend-libzmq 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963a9597aa1a5a4cd0b922dd332dcd34cabbf542072f9a985cb03b087df1c2f0
-  data.tar.gz: b76aa34f22c78f6639407562269f585c542f14cd940d7fa00619e028c646f746
+  metadata.gz: fc4a301047eea432b192bdd7b6098006d6eff0e42819551985632504b4f61dfd
+  data.tar.gz: baf7e5e1b07071e4c730fff85ed5b25c5afa1d7f2401c8d4804f30f1e5a12e22
 SHA512:
-  metadata.gz: 21d10c3acef17a021ef16f641b7283d96e693ff1f816a9ffe99a05007ef2b82fe105e8f70920b636d43001b38a4fc09f05355407865b03d0729ded39da6bd5c9
-  data.tar.gz: 4cadea7bb6b143111b25c6995cdce2479d0d83bcab5ea463e08b356a7de8009d5eaa05548eab8b145185f2219a9fe1b4be4e75de9fc0843b94f870f8f6a53c3f
+  metadata.gz: 3300a3356fc4e6fe7784ab08686f245eebcc03ea3e75e47330107fba66b5ca09212d146cec82330310fe60ad692e36f82db251eb29c1ebfa72851dad1dd9ccf0
+  data.tar.gz: 745f84d72421a6b458c52ac2b2cdb79c13f8146c8494951d826a106eac44b0281785870370c62519d4e2a5261e9b4c4188a7aa3830153c7e749fa5f323fcdbc9

data/README.md

@@ -22,8 +22,6 @@ socket API, options, and Async integration remain identical. A dedicated
 I/O thread per socket handles all libzmq operations because libzmq
 sockets are not thread-safe.
 
-`require "omq/ffi"` and `backend: :ffi` remain supported for compatibility.
-
 ## Interop
 
 libzmq and native Ruby backends are wire-compatible. You can mix them

data/lib/omq/{ffi → backend/libzmq}/engine.rb

@@ -4,15 +4,16 @@ require "async"
 require "uri"
 
 module OMQ
-  module FFI
-    # FFI Engine — wraps a libzmq socket to implement the OMQ Engine contract.
-    #
-    # A dedicated I/O thread owns the zmq_socket exclusively (libzmq sockets
-    # are not thread-safe). Send and recv flow through queues, with an IO pipe
-    # to wake the Async fiber scheduler.
-    #
-    class Engine
-      L = Libzmq
+  module Backend
+    module Libzmq
+      # Engine — wraps a libzmq socket to implement the OMQ Engine contract.
+      #
+      # A dedicated I/O thread owns the zmq_socket exclusively (libzmq sockets
+      # are not thread-safe). Send and recv flow through queues, with an IO pipe
+      # to wake the Async fiber scheduler.
+      #
+      class Engine
+        L = Native
 
 
       # @return [Options] socket options
@@ -34,7 +35,7 @@ module OMQ
       alias on_io_thread? on_io_thread
       # @param value [Boolean] enables or disables automatic reconnection
       attr_writer :reconnect_enabled
-      # @note Monitor events are not yet emitted by the FFI backend; these
+      # @note Monitor events are not yet emitted by the libzmq backend; these
       #   writers exist so Socket#monitor can attach without raising. Wiring
       #   libzmq's zmq_socket_monitor is a TODO.
       attr_writer :monitor_queue, :verbose_monitor
@@ -117,7 +118,7 @@ module OMQ
         @on_io_thread   = false
         @fatal_error    = nil
 
-        @zmq_socket = L.zmq_socket(OMQ::FFI.context, L::SOCKET_TYPES.fetch(@socket_type))
+        @zmq_socket = L.zmq_socket(OMQ::Backend::Libzmq.context, L::SOCKET_TYPES.fetch(@socket_type))
         raise "zmq_socket failed: #{L.zmq_strerror(L.zmq_errno)}" if @zmq_socket.null?
 
         apply_options
@@ -150,6 +151,7 @@ module OMQ
         resolved = get_string_option(L::ZMQ_LAST_ENDPOINT)
         @connections << :libzmq
         @peer_connected.resolve(:libzmq) unless @peer_connected.resolved?
+        resolve_subscriber_joined_without_monitor
         URI.parse(resolved)
       end
 
@@ -163,6 +165,7 @@ module OMQ
         send_cmd(:connect, endpoint)
         @connections << :libzmq
         @peer_connected.resolve(:libzmq) unless @peer_connected.resolved?
+        resolve_subscriber_joined_without_monitor
         URI.parse(endpoint)
       end
 
@@ -247,7 +250,7 @@ module OMQ
 
       # Captures the current Async task as the parent for I/O scheduling.
       # +parent:+ is accepted for API compatibility with the pure-Ruby
-      # engine but has no effect: the FFI backend runs its own I/O
+      # engine but has no effect: the libzmq backend runs its own I/O
       # thread and doesn't participate in the Async barrier tree.
       #
       # @return [void]
@@ -326,6 +329,16 @@ module OMQ
 
       private
 
+      def resolve_subscriber_joined_without_monitor
+        return unless %i[PUB XPUB].include?(@socket_type)
+        return if @routing.subscriber_joined.resolved?
+
+        # libzmq monitor wiring is still TODO, so this backend cannot
+        # detect SUBSCRIBE commands. Resolve on attach so callers that wait
+        # for subscriber readiness can use their normal grace period.
+        @routing.subscriber_joined.resolve(:libzmq)
+      end
+
       # Waits for a message from the I/O thread's recv queue.
       # Uses the signal pipe so Async can yield the fiber.
       #
@@ -686,18 +699,19 @@ module OMQ
       end
 
 
-    end
+      end
 
 
-    # Returns the shared ZMQ context (one per process, lazily initialized).
-    #
-    # @return [FFI::Pointer] zmq context pointer
-    def self.context
-      @context ||= Libzmq.zmq_ctx_new.tap do |ctx|
-        raise "zmq_ctx_new failed" if ctx.null?
-        at_exit do
-          Libzmq.zmq_ctx_shutdown(ctx) rescue nil
-          Libzmq.zmq_ctx_term(ctx) rescue nil
+      # Returns the shared ZMQ context (one per process, lazily initialized).
+      #
+      # @return [FFI::Pointer] zmq context pointer
+      def self.context
+        @context ||= Native.zmq_ctx_new.tap do |ctx|
+          raise "zmq_ctx_new failed" if ctx.null?
+          at_exit do
+            Native.zmq_ctx_shutdown(ctx) rescue nil
+            Native.zmq_ctx_term(ctx) rescue nil
+          end
         end
       end
     end

data/lib/omq/{ffi/libzmq.rb → backend/libzmq/native.rb}

@@ -3,12 +3,13 @@
 require "ffi"
 
 module OMQ
-  module FFI
-    # Minimal libzmq FFI bindings — only what OMQ needs.
-    #
+  module Backend
     module Libzmq
-      extend ::FFI::Library
-      ffi_lib ["libzmq.so.5", "libzmq.5.dylib", "libzmq"]
+      # Minimal libzmq FFI bindings — only what OMQ needs.
+      #
+      module Native
+        extend ::FFI::Library
+        ffi_lib ["libzmq.so.5", "libzmq.5.dylib", "libzmq"]
 
       # Context
       attach_function :zmq_ctx_new,  [], :pointer
@@ -129,6 +130,7 @@ module OMQ
         errno = zmq_errno
         raise "#{label}: #{zmq_strerror(errno)} (errno #{errno})"
       end
+      end
     end
   end
 end

data/lib/omq/backend/libzmq.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require "omq"
-require_relative "../ffi/libzmq"
-require_relative "../ffi/engine"
+require_relative "libzmq/native"
+require_relative "libzmq/engine"
 
-OMQ::Backend.register(:libzmq, OMQ::FFI::Engine)
-OMQ::Backend.register(:ffi, OMQ::FFI::Engine)
+OMQ::Backend.register(:libzmq, OMQ::Backend::Libzmq::Engine)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq-backend-libzmq
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Patrik Wenger
@@ -46,9 +46,8 @@ files:
 - LICENSE
 - README.md
 - lib/omq/backend/libzmq.rb
-- lib/omq/ffi.rb
-- lib/omq/ffi/engine.rb
-- lib/omq/ffi/libzmq.rb
+- lib/omq/backend/libzmq/engine.rb
+- lib/omq/backend/libzmq/native.rb
 homepage: https://github.com/zeromq/omq.rb/tree/main/gems/omq-backend-libzmq
 licenses:
 - ISC
@@ -69,5 +68,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.16
 specification_version: 4
-summary: libzmq backend for OMQ using FFI
+summary: libzmq backend for OMQ
 test_files: []

data/lib/omq/ffi.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-# Compatibility load path for the libzmq backend.
-#
-# Usage:
-#   require "omq/ffi"
-#   push = OMQ::PUSH.new(backend: :ffi)
-#
-# Raises LoadError if libzmq is not installed.
-
-require_relative "backend/libzmq"