libvirt_ffi 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ea563057bb675ad519b6dfafca175b69afe8f9b0dc9b3ab76c32175372eab1
-  data.tar.gz: 86420a7e48c60ff3a4cf3bbd5377d8070facd1e453494b16225a78c7c3e4c898
+  metadata.gz: 3644f17ca84d47cdb1137cc70206ba1f21e6ff9134cfce63a3e285699da7f209
+  data.tar.gz: 0ed561ac6371b32ec98b1ff0f4ff8baee4896781eeee7e21ac0af83aeb71e5f0
 SHA512:
-  metadata.gz: e5c81de1008c0a2c55bcacbbd0a50611d492eba8ee7232fb007f861e011f71053e75434563374c60037a89330b10da5f2873b5fd7359a8ba7bd9a88c011da01d
-  data.tar.gz: b803fae7ff7a85fa744784c89e6566acd43bad33f3229af2f97404e852021005084ca7513afea67f28c9e6e0bc9d2309731f25899bb5b9b5fcb2d8568c46c7d3
+  metadata.gz: 230412ae8c751eda2e21459f86c5fd82588c9e4288061fa5137166f92cc82b41045f66a5d643917a6cca0015b61820084e179318ba2730f3f5fefdee985f1923
+  data.tar.gz: d47c4efedea90cf797e212603da0304250f3a09360e7cde73c7509dd044d91ee36be52ec5f2a86622701e744d85416d8c231c325b0435078c22d2524f9d57688

data/lib/libvirt/connection.rb

@@ -96,7 +96,7 @@ module Libvirt
 
     # @yield conn, dom, *args
     def register_domain_event_callback(event_id, domain = nil, opaque = nil, &block)
-      Util.logger.debug { "Libvirt::Connection#register_domain_event_callback event_id=#{event_id}" }
+      dbg { "#register_domain_event_callback event_id=#{event_id}" }
 
       enum = FFI::Domain.enum_type(:event_id)
       event_id, event_id_sym = Util.parse_enum(enum, event_id)
@@ -128,7 +128,7 @@ module Libvirt
     end
 
     def deregister_domain_event_callback(callback_id)
-      Util.logger.debug { "Libvirt::Connection#deregister_domain_event_callback callback_id=#{callback_id}" }
+      dbg { "#deregister_domain_event_callback callback_id=#{callback_id}" }
 
       result = FFI::Domain.virConnectDomainEventDeregisterAny(@conn_ptr, callback_id)
       raise Error, "Couldn't deregister domain event callback" if result < 0
@@ -179,5 +179,9 @@ module Libvirt
     def check_open!
       raise Error, "Connection to #{@uri.inspect} is not open" if @conn_ptr.null?
     end
+
+    def dbg(&block)
+      Util.log(:debug, 'Libvirt::Connection', &block)
+    end
   end
 end

data/lib/libvirt/domain.rb

@@ -68,6 +68,8 @@ module Libvirt
     end
 
     def screenshot(stream, display = 0)
+      dbg { "#screenshot stream=#{stream}, display=#{display}," }
+
       mime_type, pointer = FFI::Domain.virDomainScreenshot(@dom_ptr, stream.to_ptr, display, 0)
       raise Error, "Couldn't attach domain screenshot" if pointer.null?
       # free pointer required
@@ -79,5 +81,11 @@ module Libvirt
       raise Error, "Couldn't free domain" if result < 0
       @dom_ptr = nil
     end
+
+    private
+
+    def dbg(&block)
+      Util.log(:debug, 'Libvirt::Domain', &block)
+    end
   end
 end

data/lib/libvirt/domain_callback_storage.rb

@@ -14,19 +14,19 @@ module Libvirt
     #   cb_data [Libvirt::DomainCallbackStorage::CallbackDataStruct],
     #   cb_data_free_func [FFI::Function]
     def allocate_struct
-      Util.logger.debug { "Libvirt::DomainCallbackStorage#allocate_struct" }
+      dbg { "#allocate_struct" }
 
       cb_data_ptr = ::FFI::MemoryPointer.new(:char, CallbackDataStruct.size, false)
       cb_data = CallbackDataStruct.new(cb_data_ptr)
       cb_data_free_func = ::FFI::Function.new(:void, [:pointer]) do |pointer|
-        Util.logger.debug { "Libvirt::DomainCallbackStorage cb_data_free_func triggered" }
+        dbg { "Libvirt::DomainCallbackStorage cb_data_free_func triggered" }
         remove_struct(pointer: pointer)
       end
       [cb_data, cb_data_free_func]
     end
 
     def store_struct(cb_data, connection_pointer:, callback_id:, cb:, opaque:)
-      Util.logger.debug { "Libvirt::DomainCallbackStorage#store_struct" }
+      dbg { "#store_struct" }
 
       cb_data[:connection_pointer] = connection_pointer
       cb_data[:callback_id] = callback_id
@@ -34,7 +34,7 @@ module Libvirt
     end
 
     def remove_struct(pointer: nil, connection_pointer: nil, callback_id: nil)
-      Util.logger.debug { "Libvirt::DomainCallbackStorage#remove_struct pointer=#{pointer}, connection_pointer=#{connection_pointer}, callback_id=#{callback_id}," }
+      dbg { "#remove_struct pointer=#{pointer}, connection_pointer=#{connection_pointer}, callback_id=#{callback_id}," }
 
       if pointer
         cb_data_struct = CallbackDataStruct.new(pointer)
@@ -53,7 +53,7 @@ module Libvirt
     # @param [::FFI::Pointer]
     # @return [Array<2>] cb [Proc], opaque [Object]
     def retrieve_from_pointer(pointer)
-      Util.logger.debug { "Libvirt::DomainCallbackStorage#retrieve_from_pointer pointer=#{pointer}," }
+      dbg { "#retrieve_from_pointer pointer=#{pointer}," }
 
       cb_data_struct = CallbackDataStruct.new(pointer)
       connection_pointer = cb_data_struct[:connection_pointer]
@@ -61,5 +61,11 @@ module Libvirt
       cb_data = @inner_storage[connection_pointer.address][callback_id]
       [cb_data[:cb], cb_data[:opaque]]
     end
+
+    private
+
+    def dbg(&block)
+      Util.log(:debug, 'Libvirt::DomainCallbackStorage', &block)
+    end
   end
 end

data/lib/libvirt/event.rb

@@ -26,14 +26,14 @@ module Libvirt
     def invoke_handle_callback(watch, fd, events, opaque)
       cb = opaque.cb
       op = opaque.opaque
-      dbg { "Libvirt::Event INVOKE_HANDLE_CALLBACK watch=#{watch} fd=#{fd} events=#{events} op=#{op}" }
+      dbg { "INVOKE_HANDLE_CALLBACK watch=#{watch} fd=#{fd} events=#{events} op=#{op}" }
       cb.call(watch, fd, events, op)
     end
 
     def invoke_timeout_callback(timer, opaque)
       cb = opaque.cb
       op = opaque.opaque
-      dbg { "Libvirt::Event INVOKE_TIMEOUT_CALLBACK timer=#{timer} op=#{op}" }
+      dbg { "INVOKE_TIMEOUT_CALLBACK timer=#{timer} op=#{op}" }
       cb.call(timer, op)
     end
 
@@ -88,18 +88,18 @@ module Libvirt
     private
 
     def _add_handle(fd, event, cb, opaque, ff)
-      dbg { "Libvirt::Event ADD_HANDLE fd=#{fd}, #{event}=event, cb=#{cb}, opaque=#{opaque}, ff=#{ff}" }
+      dbg { "ADD_HANDLE fd=#{fd}, #{event}=event, cb=#{cb}, opaque=#{opaque}, ff=#{ff}" }
       op = Opaque.new(cb, opaque, ff)
       @add_handle.call(fd, event, op)
     end
 
     def _update_handle(watch, event)
-      dbg { "Libvirt::Event UPDATE_HANDLE watch=#{watch}, event=#{event}" }
+      dbg { "UPDATE_HANDLE watch=#{watch}, event=#{event}" }
       @update_handle.call(watch, event)
     end
 
     def _remove_handle(watch)
-      dbg { "Libvirt::Event REMOVE_HANDLE watch=#{watch}" }
+      dbg { "REMOVE_HANDLE watch=#{watch}" }
       op = @remove_handle.call(watch)
       free_func = op.ff
       opaque = op.opaque
@@ -108,18 +108,18 @@ module Libvirt
     end
 
     def _add_timer(timeout, cb, opaque, ff)
-      dbg { "Libvirt::Event ADD_TIMER timeout=#{timeout}, cb=#{cb}, opaque=#{opaque}, ff=#{ff}" }
+      dbg { "ADD_TIMER timeout=#{timeout}, cb=#{cb}, opaque=#{opaque}, ff=#{ff}" }
       op = Opaque.new(cb, opaque, ff)
       @add_timer.call(timeout, op)
     end
 
     def _update_timer(timer, timeout)
-      dbg { "Libvirt::Event UPDATE_TIMER timer=#{timer}, timeout=#{timeout}" }
+      dbg { "UPDATE_TIMER timer=#{timer}, timeout=#{timeout}" }
       @update_timer.call(timer, timeout)
     end
 
     def _remove_timer(timer)
-      dbg { "Libvirt::Event REMOVE_TIMER timer=#{timer}" }
+      dbg { "REMOVE_TIMER timer=#{timer}" }
       op = @remove_timer.call(timer)
       free_func = op.ff
       opaque = op.opaque
@@ -128,9 +128,7 @@ module Libvirt
     end
 
     def dbg(&block)
-      return unless debug
-
-      Util.log(:debug, &block)
+      Util.log(:debug, 'Libvirt::Event', &block)
     end
 
   end

data/lib/libvirt/stream.rb

@@ -33,6 +33,8 @@ module Libvirt
     # @param opaque [Object]
     # @yield [Stream]
     def event_add_callback(events, opaque, &block)
+      dbg { "#event_add_callback events=#{events}, opaque=#{opaque}" }
+
       raise Error, 'callback already added' unless @cb.nil?
 
       @opaque = opaque
@@ -49,12 +51,16 @@ module Libvirt
 
     # @param events [Integer] bit OR of EVENT_READABLE, EVENT_READABLE
     def event_update_callback(events)
+      dbg { "#event_update_callback events=#{events}" }
+
       result = FFI::Stream.virStreamEventUpdateCallback(@stream_ptr, events)
       raise Error, "Couldn't remove stream event callback" if result < 0
       true
     end
 
     def event_remove_callback
+      dbg { '#event_remove_callback' }
+
       result = FFI::Stream.virStreamEventRemoveCallback(@stream_ptr)
       raise Error, "Couldn't remove stream event callback" if result < 0
       opaque = @opaque
@@ -101,5 +107,11 @@ module Libvirt
         raise Error, "Invalid response from virStreamRecv #{result.inspect}"
       end
     end
+
+    private
+
+    def dbg(&block)
+      Util.log(:debug, 'Libvirt::Stream', &block)
+    end
   end
 end

data/lib/libvirt/version.rb

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

metadata

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