libvirt_ffi 0.4.0 → 0.5.3

data/lib/libvirt/xml/graphics.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Libvirt
+  module Xml
+    class Graphics < Generic
+      # https://libvirt.org/formatdomain.html#elementsGraphics
+
+      attribute :type, type: :attr
+      attribute :listen, type: :attr
+      attribute :port, type: :attr
+      attribute :auto_port, type: :attr, name: :autoport, cast: :bool
+    end
+  end
+end

data/lib/libvirt/xml/max_vcpu.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Libvirt
+  module Xml
+    class MaxVcpu < Generic
+      attribute :value, path: :root, cast: :int
+      attribute :cpu_set, type: :attr, name: :cpuset
+      attribute :current, type: :attr, cast: :int
+      attribute :placement, type: :attr
+    end
+  end
+end

data/lib/libvirt/xml/memory.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Libvirt
+  module Xml
+    class Memory < Generic
+      attribute :dump_core, type: :attr, name: :dumpCore
+      attribute :slots, type: :attr
+
+      attribute :bytes, apply: ->(node, _opts) do
+        Util.parse_memory node.text, node['unit']
+      end
+    end
+  end
+end

data/lib/libvirt/xml/storage_pool.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Libvirt
+  module Xml
+    class StoragePool < Generic
+      # https://libvirt.org/formatstorage.html
+
+      root_path './pool'
+
+      attribute :type, type: :attr
+      attribute :name
+      attribute :uuid
+      attribute :capacity, type: :memory
+      attribute :allocation, type: :memory
+      attribute :available, type: :memory
+      attribute :target_path, path: './target/path'
+      attribute :target_perm_mode, path: './target/permissions/mode'
+      attribute :target_perm_owner, path: './target/permissions/owner'
+      attribute :target_perm_group, path: './target/permissions/group'
+      attribute :target_perm_label, path: './target/permissions/label'
+      # TODO: source
+    end
+  end
+end

data/lib/libvirt/xml/storage_volume.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Libvirt
+  module Xml
+    class StorageVolume < Generic
+      # https://libvirt.org/formatstorage.html
+
+      root_path './volume'
+
+      attribute :type, type: :attr
+      attribute :name
+      attribute :key
+      attribute :allocation, type: :memory
+      attribute :capacity, type: :memory
+      attribute :physical, type: :memory
+      attribute :target_path, path: './target/path'
+      attribute :target_format, type: :attr, name: :type, path: './target/format'
+      attribute :target_perm_mode, path: './target/permissions/mode'
+      attribute :target_perm_owner, path: './target/permissions/owner'
+      attribute :target_perm_group, path: './target/permissions/group'
+      attribute :target_perm_label, path: './target/permissions/label'
+      attribute :timestamp_atime, path: './timestamp/atime'
+      attribute :timestamp_btime, path: './timestamp/btime'
+      attribute :timestamp_ctime, path: './timestamp/ctime'
+      attribute :timestamp_mtime, path: './timestamp/mtime'
+      attribute :compat
+      # TODO: target/encryption target/nocow target/features
+      # todo source
+      # todo backingStore
+    end
+  end
+end

data/lib/libvirt/xml/vcpu.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Libvirt
+  module Xml
+    class Vcpu < Generic
+      attribute :id, type: :attr, cast: :int
+      attribute :enabled, type: :attr, cast: :bool
+      attribute :hot_pluggable, type: :attr, cast: :bool, name: :hotpluggable
+      attribute :order, type: :attr, cast: :int
+    end
+  end
+end

data/lib/libvirt_ffi.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'libvirt'

data/libvirt.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/libvirt/version'
 
 Gem::Specification.new do |spec|
@@ -17,7 +19,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
@@ -25,4 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'ffi', '>= 1.0'
+
+  spec.add_development_dependency 'rubocop', '~> 0.80.1'
 end

data/test_usage/support/libvirt_async.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 module LibvirtAsync
   class << self
-    def logger=(logger)
-      @logger = logger
-    end
+    attr_writer :logger
 
-    def logger
-      @logger
-    end
+    attr_reader :logger
   end
 
   module WithDbg
@@ -26,12 +24,11 @@ module LibvirtAsync
   end
 
   module Util
-    def create_task(parent = nil, reactor = nil, &block)
+    def self.create_task(parent = nil, reactor = nil, &block)
       parent = Async::Task.current? if parent == :current
       reactor ||= Async::Task.current.reactor
       Async::Task.new(reactor, parent, &block)
     end
-    module_function :create_task
   end
 
   class Handle
@@ -77,12 +74,8 @@ module LibvirtAsync
     def register
       dbg { "#{self.class}#register handle_id=#{handle_id}, fd=#{fd}" }
 
-      if (events & Libvirt::EVENT_HANDLE_ERROR) != 0
-        dbg { "#{self.class}#register skip EVENT_HANDLE_ERROR handle_id=#{handle_id}, fd=#{fd}" }
-      end
-      if (events & Libvirt::EVENT_HANDLE_HANGUP) != 0
-        dbg { "#{self.class}#register skip EVENT_HANDLE_HANGUP handle_id=#{handle_id}, fd=#{fd}" }
-      end
+      dbg { "#{self.class}#register skip EVENT_HANDLE_ERROR handle_id=#{handle_id}, fd=#{fd}" } if (events & Libvirt::EVENT_HANDLE_ERROR) != 0
+      dbg { "#{self.class}#register skip EVENT_HANDLE_HANGUP handle_id=#{handle_id}, fd=#{fd}" } if (events & Libvirt::EVENT_HANDLE_HANGUP) != 0
 
       interest = events_to_interest(events)
       dbg { "#{self.class}#register parse handle_id=#{handle_id}, fd=#{fd}, events=#{events}, interest=#{interest}" }
@@ -99,7 +92,7 @@ module LibvirtAsync
         io = IO.new(fd, io_mode, autoclose: false)
         @monitor = Monitor.new(io)
 
-        while @monitor.readiness == nil
+        while @monitor.readiness.nil?
           cancelled = wait_io(interest)
 
           if cancelled
@@ -117,7 +110,6 @@ module LibvirtAsync
 
           dbg { "#{self.class}#register_handle async not ready readiness=#{@monitor.readiness}, handle_id=#{handle_id}, fd=#{fd}" }
         end
-
       end
 
       dbg { "#{self.class}#register_handle invokes fiber=0x#{task.fiber.object_id.to_s(16)} handle_id=#{handle_id}, fd=#{fd}" }
@@ -197,8 +189,6 @@ module LibvirtAsync
         :r
       elsif writable
         :w
-      else
-        nil
       end
     end
 
@@ -223,8 +213,6 @@ module LibvirtAsync
         Libvirt::EVENT_HANDLE_READABLE
       when :w
         Libvirt::EVENT_HANDLE_WRITABLE
-      else
-        nil
       end
     end
   end
@@ -277,14 +265,15 @@ module LibvirtAsync
       dbg { "#{self.class}#initialize timer_id=#{timer_id}, interval=#{interval}" }
 
       @timer_id = timer_id
-      @interval = interval.to_f / 1000.to_f
+      @interval = interval / 1000.0
       @opaque = opaque
       @last_fired = Time.now.to_f
       @monitor = nil
     end
 
     def wait_time
-      return if interval < 0
+      return if interval.negative?
+
       last_fired + interval
     end
 
@@ -358,15 +347,12 @@ module LibvirtAsync
     end
 
     def wait_timer(timeout)
-      begin
-        @monitor.wait(timeout)
-        false
-      rescue Monitor::Cancelled => e
-        dbg { "#{self.class}#wait_timer cancelled #{e.class} #{e.message}" }
-        true
-      end
+      @monitor.wait(timeout)
+      false
+    rescue Monitor::Cancelled => e
+      dbg { "#{self.class}#wait_timer cancelled #{e.class} #{e.message}" }
+      true
     end
-
   end
 
   class Implementations
@@ -396,12 +382,12 @@ module LibvirtAsync
     def print_debug_info
       str = [
           "#{self.class}:0x#{object_id.to_s(16)}",
-          "handles = [",
+          'handles = [',
           @handles.map(&:to_s).join("\n"),
-          "]",
-          "timers = [",
+          ']',
+          'timers = [',
           @timers.map(&:to_s).join("\n"),
-          "]"
+          ']'
       ].join("\n")
       Libvirt.logger&.debug { str }
     end
@@ -432,10 +418,16 @@ module LibvirtAsync
           remove_handle: method(:remove_handle).to_proc,
           add_timer: method(:add_timer).to_proc,
           update_timer: method(:update_timer).to_proc,
-          remove_timer: method(:remove_timer).to_proc
+          remove_timer: method(:remove_timer).to_proc,
+          schedule: method(:schedule).to_proc
       )
     end
 
+    def schedule(&block)
+      task = Async::Task.new(Async::Task.current.reactor, nil, &block)
+      task.reactor << task.fiber
+    end
+
     def add_handle(fd, events, opaque)
       # add a handle to be tracked by this object.  The application is
       # expected to maintain a list of internal handle IDs (integers); this

data/test_usage/support/log_formatter.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class LogFormatter
-  LOG_FORMAT = "%s, %s [%s/%s/%s] %s\n".freeze
-  DEFAULT_DATETIME_FORMAT = "%F %T.%N".freeze
+  LOG_FORMAT = "%s, %s [%s/%s/%s] %s\n"
+  DEFAULT_DATETIME_FORMAT = '%F %T.%N'
 
   attr_accessor :datetime_format
 
@@ -9,14 +11,7 @@ class LogFormatter
   end
 
   def call(severity, time, progname, message)
-    LOG_FORMAT % [
-        severity[0..0],
-        format_datetime(time),
-        "0x#{Async::Task.current?&.object_id&.to_s(16)}",
-        "0x#{Fiber.current.object_id.to_s(16)}",
-        progname,
-        format_message(message)
-    ]
+    format(LOG_FORMAT, severity[0..0], format_datetime(time), "0x#{Async::Task.current?&.object_id&.to_s(16)}", "0x#{Fiber.current.object_id.to_s(16)}", progname, format_message(message))
   end
 
   private

data/test_usage/test_domain.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'libvirt'
+require 'logger'
+require 'active_support/all'
+require 'async'
+
+require_relative 'support/libvirt_async'
+require_relative 'support/log_formatter'
+
+require 'libvirt/xml'
+
+Libvirt.logger = Logger.new(STDOUT, formatter: LogFormatter.new)
+Libvirt.logger.level = ENV['DEBUG'] ? :debug : :info
+
+IMPL = LibvirtAsync::Implementations.new
+
+Async do
+  ASYNC_REACTOR = Async::Task.current.reactor
+
+  puts "Lib version #{Libvirt.lib_version}"
+  puts "Gem version #{Libvirt::VERSION}"
+
+  IMPL.start
+
+  conn = Libvirt::Connection.new('qemu+tcp://localhost:16510/system')
+  conn.open
+
+  puts "Connection version #{conn.version.inspect}"
+  puts "Connection lib_version #{conn.lib_version.inspect}"
+  puts "Connection hostname #{conn.hostname.inspect}"
+
+  doms = conn.list_all_domains
+  puts "Connection domains qty #{doms.size}"
+
+  doms.each.with_index do |dom, i|
+    puts "Domain #{i} xml", dom.xml_desc
+    puts "Domain #{i} xml object", Libvirt::Xml::Domain.load(dom.xml_desc).to_h
+  end
+
+end

data/test_usage/test_event_loop.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'libvirt'
@@ -16,16 +17,18 @@ GC::Tracer.start_logging(
     gc_stat: false,
     gc_latest_gc_info: false,
     rusage: false,
-    events: %i[end_mark end_sweep]
+    events: [:end_mark, :end_sweep]
 )
 
 Libvirt.logger = Logger.new(STDOUT, formatter: LogFormatter.new)
 Libvirt.logger.level = ENV['DEBUG'] ? :debug : :info
 
 IMPL = LibvirtAsync::Implementations.new
-CONNS = []
-DOMS = []
-CB_IDS = []
+OBJECTS = {
+    hv: nil,
+    domains: [],
+    cb_ids: []
+}.freeze
 
 Async do
   ASYNC_REACTOR = Async::Task.current.reactor
@@ -35,18 +38,17 @@ Async do
 
   IMPL.start
 
-  c = Libvirt::Connection.new('qemu+tcp://localhost:16510/system')
-  c.open
-  res = c.set_keep_alive(2, 1)
-  Libvirt.logger.info {  "set_keep_alive #{res}" }
-  CONNS.push(c)
-
-  puts "Connection version #{c.version.inspect}"
-  puts "Connection lib_version #{c.lib_version.inspect}"
-  puts "Connection hostname #{c.hostname.inspect}"
-  puts "Connection max_vcpus #{c.max_vcpus.inspect}"
-  puts "Connection capabilities #{c.capabilities.inspect}"
-  node_info = c.node_info
+  OBJECTS[:hv] = Libvirt::Connection.new('qemu+tcp://localhost:16510/system')
+  OBJECTS[:hv].open
+  res = OBJECTS[:hv].set_keep_alive(2, 1)
+  Libvirt.logger.info { "set_keep_alive #{res}" }
+
+  puts "Connection version #{OBJECTS[:hv].version.inspect}"
+  puts "Connection lib_version #{OBJECTS[:hv].lib_version.inspect}"
+  puts "Connection hostname #{OBJECTS[:hv].hostname.inspect}"
+  puts "Connection max_vcpus #{OBJECTS[:hv].max_vcpus.inspect}"
+  puts "Connection capabilities #{OBJECTS[:hv].capabilities.inspect}"
+  node_info = OBJECTS[:hv].node_info
   puts "Connection nodeInfo #{node_info}"
   puts "NodeInfo model #{node_info.model.inspect}"
   puts "NodeInfo cpus #{node_info.cpus.inspect}"
@@ -57,27 +59,27 @@ Async do
   puts "NodeInfo threads #{node_info.threads.inspect}"
   puts "NodeInfo memory #{node_info.memory.inspect}"
 
-  cb_ids = Libvirt::Connection::DOMAIN_EVENT_IDS.map do |event_id|
+  Libvirt::Connection::DOMAIN_EVENT_IDS.map do |event_id|
     op = OpenStruct.new(a: 'b', event_id: event_id)
-    c.register_domain_event_callback(event_id, nil, op) do |conn, dom, *args, opaque|
+    callback_id = OBJECTS[:hv].register_domain_event_callback(event_id, nil, op) do |conn, dom, *args, opaque|
       Libvirt.logger.info { "DOMAIN EVENT #{event_id} conn=#{conn}, dom=#{dom}, args=#{args}, opaque=#{opaque}" }
     end
+    Libvirt.logger.info { "Registered domain event callback event_id=#{event_id} callback_id=#{callback_id}" }
+    OBJECTS[:cb_ids] << callback_id
   end
-  CB_IDS.concat(cb_ids)
 
-  puts "domains qty #{c.list_all_domains_qty}"
+  puts "domains qty #{OBJECTS[:hv].list_all_domains_qty}"
 
-  domains = c.list_all_domains
-  DOMS.concat(domains)
-  puts "Domains (#{domains.size}): #{domains}"
+  OBJECTS[:domains] = OBJECTS[:hv].list_all_domains
+  puts "Domains (#{OBJECTS[:domains].size}): #{OBJECTS[:domains]}"
 
-  d = domains.first
+  d = OBJECTS[:domains].first
   puts "Domain uuid #{d.uuid.inspect}"
   puts "Domain name #{d.name.inspect}"
   puts "Domain get_state #{d.get_state.inspect}"
   puts "Domain get_cpus #{d.max_vcpus.inspect}"
   puts "Domain max_memory #{d.max_memory.inspect}"
-  puts "Domain xml_desc #{d.xml_desc.inspect}"
+  # puts "Domain xml_desc #{d.xml_desc.inspect}"
 
   # ASYNC_REACTOR.every(10) do
   #   LibvirtAsync::Util.create_task(nil, ASYNC_REACTOR) { IMPL.print_debug_info }.run
@@ -90,20 +92,94 @@ Async do
     # Libvirt.logger.info { "MEM USAGE: #{GetProcessMem.new.mb} MB" }
   end
 
-  ASYNC_REACTOR.after(20) do
-    LibvirtAsync::Util.create_task(nil, ASYNC_REACTOR) do
+  # ASYNC_REACTOR.after(20) do
+  #   Libvirt.logger.info { 'START Cleaning up!' }
+  #
+  #   LibvirtAsync::Util.create_task(nil, ASYNC_REACTOR) do
+  #
+  #     OBJECTS[:cb_ids].each do |callback_id|
+  #       Libvirt.logger.info { "Start retrieving callback_id=#{callback_id}" }
+  #       opaque = OBJECTS[:hv].deregister_domain_event_callback(callback_id)
+  #       Libvirt.logger.info { "Retrieved opaque=#{opaque}" }
+  #     end
+  #     Libvirt.logger.info { 'Cleaning up!' }
+  #     OBJECTS[:hv] = nil
+  #     OBJECTS[:domains] = []
+  #     OBJECTS[:cb_ids] = []
+  #     Libvirt.logger.info { "GC.start 1" }
+  #     GC.start
+  #
+  #     ASYNC_REACTOR << LibvirtAsync::Util.create_task(nil, ASYNC_REACTOR) do
+  #       Libvirt.logger.info { "GC.start 2" }
+  #       GC.start
+  #     end.fiber
+  #
+  #   end.run
+  # end
 
-      c = CONNS.first
-      CB_IDS.each do |callback_id|
-        opaque = c.deregister_domain_event_callback(callback_id)
-        puts "Retrieved opaque #{opaque}"
-      end
-      Libvirt.logger.info { 'Cleaning up!' }
-      CONNS = []
-      DOMS = []
-      CB_IDS = []
-      GC.start
+  # puts 'undefine DOM'
+  # d.undefine
+  # ASYNC_REACTOR.sleep 5
 
-    end
-  end
+  # begin
+  #   puts 'DOM starting...'
+  #   d.start
+  #   puts 'DOM started'
+  # rescue Libvirt::Errors::LibError => e
+  #   STDERR.puts "error starting\n#{e.class}\n#{e.message}", e.error_data
+  # end
+  #
+  # ASYNC_REACTOR.sleep 5
+  # puts "DOMAIN state #{d.get_state} before save_memory"
+  # d.save_memory
+  # puts "DOMAIN state #{d.get_state} after save_memory"
+  #
+  # ASYNC_REACTOR.sleep 5
+  # puts "DOMAIN state #{d.get_state} before start"
+  # d.start
+  # puts "DOMAIN state #{d.get_state} after start"
+  #
+  # #ASYNC_REACTOR.sleep 5
+  # puts "DOMAIN state #{d.get_state} before resume"
+  # d.resume
+  # puts "DOMAIN state #{d.get_state} after resume"
+
+  # ASYNC_REACTOR.sleep 10
+  # puts "DOMAIN state #{d.get_state} before shutdown"
+  # d.shutdown(1)
+  # puts "DOMAIN state #{d.get_state} after shutdown"
+  #
+  # ASYNC_REACTOR.sleep 10
+  # puts "DOMAIN state #{d.get_state}"
+  # d.start
+  # puts 'DOM start'
+  #
+  # ASYNC_REACTOR.sleep 10
+  # puts "DOMAIN state #{d.get_state}"
+  # d.reboot
+  # puts 'DOM reboot'
+  #
+  # ASYNC_REACTOR.sleep 5
+  # puts "DOMAIN state #{d.get_state}"
+  # d.suspend
+  # puts 'DOM suspend'
+  #
+  # ASYNC_REACTOR.sleep 5
+  # puts "DOMAIN state #{d.get_state}"
+  # d.resume
+  # puts 'DOM resume'
+  #
+  # ASYNC_REACTOR.sleep 5
+  # puts "DOMAIN state #{d.get_state}"
+  # d.reset
+  # puts 'DOM reset'
+  #
+  # ASYNC_REACTOR.sleep 5
+  # puts "DOMAIN state #{d.get_state}"
+  # d.power_off
+  # puts 'DOM power_off'
+  #
+  # ASYNC_REACTOR.sleep 5
+  # d.start
+  # puts 'DOM start'
 end