libvirt_ffi 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7335e98f7be6c9145bad5d2fdc6322b9dda60f31ddb92afd2ce76ebfd95d34
-  data.tar.gz: 2c8fe7a75a8778709860128b466faa04d511ed1eb6eec0913a15bee9202a1d67
+  metadata.gz: 43c4cf7b7fa510b96605a9f05e8f04680280459d48572085740a71f145ce1442
+  data.tar.gz: a3ca5f72fdeb7de0cc95b440f58c5b894970add2cb746c12e3191d12269dcc42
 SHA512:
-  metadata.gz: 756e46ad598baa4996961a191398b924059333ea248ae4df26c950a340a8a683e44a3bef80995f07b1d2968e56be3a27965c882dafc891f879114c703ab1cd4c
-  data.tar.gz: eb82fede907f3c40474a894d428da233058ef502e6f0fe891c135c1733fe3bcb02f54df0951188bd0a8c779e1800b309ecc4b985d6ca8e504adbeff13f8143f3
+  metadata.gz: f1b7448f8ebd67349c59a365d1b30072bf99d5f78ffc1b07c87f99a312365f4d42474e62886c71e797fd0deab4c6f726af6440d6c4bb350fb8a65ee751b68ed5
+  data.tar.gz: 24056f945020275a102517bd6f4fba560be15c0f4fea7725b9c4b9b6032a1e94695b1520094c4027bf4ea0e34291e00148efefbb60d114640980e6c69e9f6cae

data/lib/libvirt/connection.rb

@@ -5,8 +5,9 @@ module Libvirt
     DOMAIN_EVENT_IDS = FFI::Domain.enum_type(:event_id).symbols.dup.freeze
     POOL_EVENT_IDS = FFI::Storage.enum_type(:event_id).symbols.dup.freeze
 
-    DOMAIN_STORAGE = HostCallbackStorage.new
-    POOL_STORAGE = HostCallbackStorage.new
+    DOMAIN_STORAGE = HostCallbackStorage.new(:domain_event)
+    POOL_STORAGE = HostCallbackStorage.new(:storage_pool_event)
+    CLOSE_STORAGE = HostCallbackStorage.new(:close)
 
     DOMAIN_EVENT_CALLBACKS = DOMAIN_EVENT_IDS.map do |event_id_sym|
       func = FFI::Domain.event_callback_for(event_id_sym) do |conn_ptr, dom_ptr, *args, op_ptr|
@@ -34,6 +35,13 @@ module Libvirt
       [event_id_sym, func]
     end.to_h.freeze
 
+    CLOSE_CALLBACK = FFI::Host.callback_function(:virConnectCloseFunc) do |conn_ptr, reason, op_ptr|
+      Util.log(:debug, 'CLOSE_CALLBACK') { "inside callback conn_ptr=#{conn_ptr}, reason=#{reason}, op_ptr=#{op_ptr}" }
+      connection = Connection.load_ref(conn_ptr)
+      block, opaque = CLOSE_STORAGE.retrieve_from_pointer(op_ptr)
+      block.call(connection, reason, opaque)
+    end
+
     def self.load_ref(conn_ptr)
       ref_result = FFI::Host.virConnectRef(conn_ptr)
       raise Errors::LibError, "Couldn't retrieve connection reference" if ref_result.negative?
@@ -154,23 +162,27 @@ module Libvirt
 
     def register_close_callback(opaque = nil, &block)
       dbg { "#register_close_callback opaque=#{opaque}" }
-      raise ArgumentError, 'close function already registered' if @close_data
-
-      @close_data = { opaque: opaque, block: block }
-      @close_cb = FFI::Host.callback_function(:virConnectCloseFunc) do |_conn, reason, _op|
-        dbg { "CONNECTION CLOSED @conn_ptr=#{@conn_ptr} reason=#{reason}" }
-        block = @close_data[:block]
-        opaque = @close_data[:opaque]
-        # we clear @closed_data here, because connection can be opened again and
-        # add new close callback inside `block`.
-        @close_data = nil
-        block.call(self, reason, opaque)
-      end
-      @close_free_func = FFI::Common.free_function do
-        dbg { "CONNECTION CLOSED FREE FUNC @conn_ptr=#{@conn_ptr}" }
-        @close_cb = @close_free_func = @close_data = nil
+
+      cb_data, cb_data_free_func = CLOSE_STORAGE.allocate_struct
+      result = FFI::Host.virConnectRegisterCloseCallback(
+          @conn_ptr,
+          CLOSE_CALLBACK,
+          cb_data.pointer,
+          cb_data_free_func
+      )
+      if result.negative?
+        cb_data.pointer.free
+        raise Errors::LibError, "Couldn't register connection close callback"
       end
-      FFI::Host.virConnectRegisterCloseCallback(@conn_ptr, @close_cb, nil, @close_free_func)
+
+      CLOSE_STORAGE.store_struct(
+          cb_data,
+          connection_pointer: @conn_ptr,
+          callback_id: result,
+          cb: block,
+          opaque: opaque
+      )
+      result
     end
 
     # @yield conn, dom, *args
@@ -249,6 +261,28 @@ module Libvirt
       result
     end
 
+    def deregister_storage_pool_event_callback(callback_id)
+      dbg { "#deregister_storage_pool_event_callback callback_id=#{callback_id}" }
+
+      result = FFI::Storage.virConnectStoragePoolEventDeregisterAny(@conn_ptr, callback_id)
+      raise Errors::LibError, "Couldn't deregister storage pool event callback" if result.negative?
+
+      # virConnectStoragePoolEventDeregisterAny will call free func
+      # So we don't need to remove object from POOL_STORAGE here.
+      true
+    end
+
+    def deregister_close_callback
+      dbg { '#deregister_close_callback' }
+
+      result = FFI::Host.virConnectUnregisterCloseCallback(@conn_ptr, CLOSE_CALLBACK)
+      raise Errors::LibError, "Couldn't deregister close callback" if result.negative?
+
+      # virConnectUnregisterCloseCallback will call free func
+      # So we don't need to remove object from CLOSE_STORAGE here.
+      true
+    end
+
     def lib_version
       version_ptr = ::FFI::MemoryPointer.new(:ulong)
       result = FFI::Host.virConnectGetLibVersion(@conn_ptr, version_ptr)

data/lib/libvirt/host_callback_storage.rb

@@ -7,7 +7,10 @@ module Libvirt
              :callback_id, :int
     end
 
-    def initialize
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
       @inner_storage = Hash.new { |h, key| h[key] = {} }
     end
 
@@ -20,7 +23,7 @@ module Libvirt
       cb_data_ptr = ::FFI::MemoryPointer.new(:char, CallbackDataStruct.size, false)
       cb_data = CallbackDataStruct.new(cb_data_ptr)
       cb_data_free_func = FFI::Common.free_function do |pointer|
-        dbg { 'Libvirt::HostCallbackStorage cb_data_free_func triggered' }
+        dbg { "cb_data_free_func triggered pointer=#{pointer}" }
         remove_struct(pointer)
       end
       [cb_data, cb_data_free_func]
@@ -35,7 +38,7 @@ module Libvirt
     end
 
     def remove_struct(pointer)
-      dbg { "#remove_struct pointer=#{pointer}" }
+      dbg { "#remove_struct pointer=#{pointer}," }
 
       cb_data_struct = CallbackDataStruct.new(pointer)
       connection_pointer = cb_data_struct[:connection_pointer]
@@ -63,7 +66,7 @@ module Libvirt
     private
 
     def dbg(&block)
-      Util.log(:debug, 'Libvirt::HostCallbackStorage', &block)
+      Util.log(:debug, "Libvirt::HostCallbackStorage(#{name})", &block)
     end
   end
 end

data/lib/libvirt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Libvirt
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libvirt_ffi
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Denis Talakevich