libvirt_ffi 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54cfaffc6e2d9a5efb229e0c47cf0222fd99521ff5fa5ec0af12fdcffe338248
-  data.tar.gz: 46b545e97737a7c189a601939d211107a77adc92c197e163f6fa3066930b71a4
+  metadata.gz: 8a956033faefb88d11d76587ed18a9ef066f15ecf12321d97611f53469fc8e55
+  data.tar.gz: f16da9c9e1311edccf72c539591a0b0892f70f36aca7fa7718ce396ab2cc5826
 SHA512:
-  metadata.gz: e0f41521b95ae1c940b4da9bd2ebc229d86b220afc508b66bb74de8cdc7404a7078559d3f4d3a9fdae9cf30c67c402557e811b353d91fc34f6e4465aeb1eb3cd
-  data.tar.gz: 45e726be8f9049df8e87bfb768b60058bbd4dd3be55b1808e0a4a60fb9014188853d4af5f123de6baeded56006e371e863e11e7fe38b9ad3ef4643b27829d0b1
+  metadata.gz: 39539a7d0868f78843d388fefc3b398406a6cbf3890dd7667e8484280098c9ba2c3af45659280b338ee1f0c93ee9c45a4ffdf6246db64e7c5571d0b43abd0c39
+  data.tar.gz: 5a8502473cde37b1538ec2ead69d872f989b66052d2cc7c93f766557591b4b5b807f7a45e31927a7b07b9b1361ecd9f8b9d827b3b7768f19f1694e46ef8a5e42

data/lib/libvirt/connection.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'objspace'
-require 'libvirt/ffi/connection'
-require 'libvirt/ffi/domain'
-require 'libvirt/util'
-
 module Libvirt
   class Connection
     def initialize(uri)
@@ -98,6 +93,44 @@ module Libvirt
       true
     end
 
+    def version
+      version_ptr = ::FFI::MemoryPointer.new(:ulong)
+      result = FFI::Connection.virConnectGetVersion(@conn_ptr, version_ptr)
+      raise Error, "Couldn't get connection version" if result < 0
+      version_number = version_ptr.get_ulong(0)
+      # version_number = FFI::Connection.virConnectGetVersion(@conn_ptr)
+      Libvirt::Util.parse_version(version_number)
+    end
+
+    def lib_version
+      version_ptr = ::FFI::MemoryPointer.new(:ulong)
+      result = FFI::Connection.virConnectGetLibVersion(@conn_ptr, version_ptr)
+      raise Error, "Couldn't get connection lib version" if result < 0
+      version_number = version_ptr.get_ulong(0)
+      # version_number = FFI::Connection.virConnectGetLibVersion(@conn_ptr)
+      Libvirt::Util.parse_version(version_number)
+    end
+
+    def hostname
+      FFI::Connection.virConnectGetHostname(@conn_ptr)
+    end
+
+    # @param type [String,NilClass]
+    def max_vcpus(type = nil)
+      FFI::Connection.virConnectGetMaxVcpus(@conn_ptr, type)
+    end
+
+    def capabilities
+      FFI::Connection.virConnectGetCapabilities(@conn_ptr)
+    end
+
+    def node_info
+      node_info_ptr = ::FFI::MemoryPointer.new(FFI::NodeInfo::Struct.by_value)
+      result = FFI::NodeInfo.virNodeGetInfo(@conn_ptr, node_info_ptr)
+      raise Error, "Couldn't get connection node info" if result < 0
+      NodeInfo.new(node_info_ptr)
+    end
+
     private
 
     def check_open!

data/lib/libvirt/domain.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'objspace'
-require 'libvirt/ffi/domain'
-require 'libvirt/util'
-
 module Libvirt
   class Domain
     def initialize(dom_ptr, conn)
@@ -25,5 +21,40 @@ module Libvirt
     def to_ptr
       @dom_ptr
     end
+
+    def uuid
+      buff = ::FFI::MemoryPointer.new(:char, FFI::Domain::UUID_STRING_BUFLEN)
+      result = FFI::Domain.virDomainGetUUIDString(@dom_ptr, buff)
+      raise Error, "Couldn't get domain uuid" if result < 0
+      buff.read_string
+    end
+
+    def name
+      FFI::Domain.virDomainGetName(@dom_ptr)
+    end
+
+    def max_vcpus
+      FFI::Domain.virDomainGetMaxVcpus(@dom_ptr)
+    end
+
+    # def vcpus
+    #   # https://github.com/libvirt/ruby-libvirt/blob/9f71ff5add1f57ffef7cf513b72638d92d9fd84f/ext/libvirt/domain.c#L787
+    #   # dominfo = virDomainGetInfo
+    #   # dominfo.nrVirtCpu
+    #   # maxcpus = ruby_libvirt_get_maxcpus(ruby_libvirt_connect_get(d));
+    #   # vcpu_infos_ptr
+    #   FFI::Domain.virDomainGetVcpus(@dom_ptr, vcpu_infos_ptr, maxinfo, cpumaps, maplen)
+    # end
+    def vcpus
+      OpenStruct.new(count: max_vcpus)
+    end
+
+    def max_memory
+      FFI::Domain.virDomainGetMaxMemory(@dom_ptr)
+    end
+
+    def xml_desc(flags = 0)
+      FFI::Domain.virDomainGetXMLDesc(@dom_ptr, flags)
+    end
   end
 end

data/lib/libvirt/event.rb

@@ -2,7 +2,6 @@
 
 require 'singleton'
 require 'forwardable'
-require 'libvirt/ffi/event'
 
 module Libvirt
   class Event

data/lib/libvirt/ffi/connection.rb

@@ -1,14 +1,44 @@
 # frozen_string_literal: true
 
-require 'ffi'
-require 'libvirt/util'
-
 module Libvirt
   module FFI
     module Connection
       extend ::FFI::Library
       ffi_lib Util.library_path
 
+      # struct virNodeInfo {
+      #
+      #   char model[32] 	model - string indicating the CPU model
+      #   unsigned long 	memory - memory size in kilobytes
+      #   unsigned int 	cpus - the number of active CPUs
+      #   unsigned int 	mhz - expected CPU frequency, 0 if not known or on unusual architectures
+      #   unsigned int 	nodes - the number of NUMA cell, 1 for unusual NUMA topologies or uniform memory access; check capabilities XML for the actual NUMA topology
+      #   unsigned int 	sockets - number of CPU sockets per node if nodes > 1, 1 in case of unusual NUMA topology
+      #   unsigned int 	cores - number of cores per socket, total number of processors in case of unusual NUMA topolog
+      #   unsigned int 	threads - number of threads per core, 1 in case of unusual numa topology
+      # }
+      class NodeInfoStruct < ::FFI::Struct
+        layout :model, [:char, 32],
+               :memory, :ulong,
+               :cpus, :ulong,
+               :mhz, :ulong,
+               :nodes, :ulong,
+               :sockets, :ulong,
+               :cores, :ulong,
+               :threads, :ulong
+      end
+
+      class NodeInfo
+        def initialize(node_info_ptr, node_info_struct)
+          @node_info_ptr = node_info_ptr
+          @node_info_struct = node_info_struct
+        end
+
+        def [](attr)
+          @node_info_struct[attr]
+        end
+      end
+
       # virConnectPtr	virConnectOpen (const char * name)
       attach_function :virConnectOpen, [:string], :pointer
 
@@ -21,6 +51,34 @@ module Libvirt
       # 	unsigned int count
       # )
       attach_function :virConnectSetKeepAlive, [:pointer, :int, :uint], :int
+
+      # int	virConnectGetVersion (
+      #   virConnectPtr conn,
+      # 	unsigned long * hvVer
+      # )
+      attach_function :virConnectGetVersion, [:pointer, :pointer], :int
+
+      # int	virConnectGetLibVersion	(
+      #   virConnectPtr conn,
+      # 	unsigned long * libVer
+      # )
+      attach_function :virConnectGetLibVersion, [:pointer, :pointer], :int
+
+      # char *	virConnectGetHostname	(
+      #   virConnectPtr conn
+      # )
+      attach_function :virConnectGetHostname, [:pointer], :string # strptr ?
+
+      # int	virConnectGetMaxVcpus	(
+      #   virConnectPtr conn,
+      #   const char * type
+      # )
+      attach_function :virConnectGetMaxVcpus, [:pointer, :string], :int
+
+      # char *	virConnectGetCapabilities	(
+      #   virConnectPtr conn
+      # )
+      attach_function :virConnectGetCapabilities, [:pointer],  :string # strptr ?
     end
   end
 end

data/lib/libvirt/ffi/domain.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require 'ffi'
-require 'libvirt/util'
-require 'libvirt/ffi/common'
-
 module Libvirt
   module FFI
     module Domain
       extend ::FFI::Library
       ffi_lib Util.library_path
 
+      UUID_STRING_BUFLEN = 0x80 # RFC4122
+
       # int	virConnectDomainEventRegisterAny(
       #   virConnectPtr conn,
       # 	virDomainPtr dom,
@@ -75,6 +73,42 @@ module Libvirt
       # )
       attach_function :virDomainGetState, [:pointer, :pointer, :pointer, :uint], :int
 
+      # const char *virDomainGetName (
+      #   virDomainPtr domain
+      # )
+      attach_function :virDomainGetName, [:pointer], :string # strptr?
+
+      # int	virDomainGetMaxVcpus (
+      #   virDomainPtr domain
+      # )
+      attach_function :virDomainGetMaxVcpus, [:pointer], :int
+
+      # int	virDomainGetVcpus	(
+      #   virDomainPtr domain,
+      # 	virVcpuInfoPtr info,
+      # 	int maxinfo,
+      # 	unsigned char * cpumaps,
+      # 	int maplen
+      # )
+      attach_function :virDomainGetVcpus, [:pointer, :pointer, :int, :pointer, :int], :int
+
+      # int	virDomainGetUUIDString (
+      #   virDomainPtr domain,
+      # 	char * buf
+      # )
+      attach_function :virDomainGetUUIDString, [:pointer, :pointer], :int
+
+      # unsigned long	virDomainGetMaxMemory	(
+      #   virDomainPtr domain
+      # )
+      attach_function :virDomainGetMaxMemory, [:pointer], :ulong
+
+      # char *virDomainGetXMLDesc	(
+      #   virDomainPtr domain,
+      # 	unsigned int flags
+      # )
+      attach_function :virDomainGetXMLDesc, [:pointer, :uint], :string # strptr?
+
       # typedef int	(*virConnectDomainEventCallback) (
       #   virConnectPtr conn,
       # 	virDomainPtr dom,

data/lib/libvirt/ffi/event.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'ffi'
-require 'libvirt/util'
-require 'libvirt/ffi/common'
-
 module Libvirt
   module FFI
     module Event

data/lib/libvirt/ffi/libvirt.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'ffi'
-require 'libvirt/util'
-
 module Libvirt
   module FFI
     module Libvirt

data/lib/libvirt/ffi/node_info.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Libvirt
+  module FFI
+    module NodeInfo
+      extend ::FFI::Library
+      ffi_lib Util.library_path
+
+      # struct virNodeInfo {
+      #
+      #   char model[32] 	model - string indicating the CPU model
+      #   unsigned long 	memory - memory size in kilobytes
+      #   unsigned int 	cpus - the number of active CPUs
+      #   unsigned int 	mhz - expected CPU frequency, 0 if not known or on unusual architectures
+      #   unsigned int 	nodes - the number of NUMA cell, 1 for unusual NUMA topologies or uniform memory access;
+      #     check capabilities XML for the actual NUMA topology
+      #   unsigned int 	sockets - number of CPU sockets per node if nodes > 1, 1 in case of unusual NUMA topology
+      #   unsigned int 	cores - number of cores per socket, total number of processors in case of unusual NUMA topolog
+      #   unsigned int 	threads - number of threads per core, 1 in case of unusual numa topology
+      # }
+      class Struct < ::FFI::Struct
+        layout :model, [:char, 32],
+               :memory, :ulong,
+               :cpus, :uint,
+               :mhz, :uint,
+               :nodes, :uint,
+               :sockets, :uint,
+               :cores, :uint,
+               :threads, :uint
+      end
+
+      # int	virNodeGetInfo			(virConnectPtr conn,
+      # 					 virNodeInfoPtr info)
+      attach_function :virNodeGetInfo, [:pointer, :pointer], :int
+    end
+  end
+end

data/lib/libvirt/node_info.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Libvirt
+  class NodeInfo
+    def initialize(node_info_ptr)
+      @node_info_ptr = node_info_ptr
+      @node_info_struct = FFI::NodeInfo::Struct.new(node_info_ptr)
+    end
+
+    def [](attr)
+      @node_info_struct[attr]
+    end
+
+    def model
+      @node_info_struct[:model].to_s
+    end
+
+    def cpus
+      @node_info_struct[:cpus]
+    end
+
+    def mhz
+      @node_info_struct[:mhz]
+    end
+
+    def nodes
+      @node_info_struct[:nodes]
+    end
+
+    def sockets
+      @node_info_struct[:sockets]
+    end
+
+    def cores
+      @node_info_struct[:cores]
+    end
+
+    def threads
+      @node_info_struct[:threads]
+    end
+
+    def memory
+      @node_info_struct[:memory]
+    end
+  end
+end

data/lib/libvirt/version.rb

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

data/lib/libvirt.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
 require 'ffi'
+require 'objspace'
 require 'libvirt/util'
 require 'libvirt/error'
 require 'libvirt/ffi/common'
+require 'libvirt/ffi/libvirt'
 require 'libvirt/ffi/connection'
 require 'libvirt/ffi/domain'
-require 'libvirt/lib_version'
+require 'libvirt/ffi/event'
+require 'libvirt/ffi/node_info'
 require 'libvirt/event'
 require 'libvirt/connection'
 require 'libvirt/domain'
+require 'libvirt/node_info'
 require 'libvirt/version'
 
 module Libvirt

data/test_usage/test_event_loop.rb

@@ -20,6 +20,9 @@ DOMS = []
 Async do
   ASYNC_REACTOR = Async::Task.current.reactor
 
+  puts "Lib version #{Libvirt.lib_version}"
+  puts "Gem version #{Libvirt::VERSION}"
+
   IMPL.start
 
   c = Libvirt::Connection.new('qemu+tcp://localhost:16510/system')
@@ -28,6 +31,22 @@ Async do
   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
+  puts "Connection nodeInfo #{node_info}"
+  puts "NodeInfo model #{node_info.model.inspect}"
+  puts "NodeInfo cpus #{node_info.cpus.inspect}"
+  puts "NodeInfo mhz #{node_info.mhz.inspect}"
+  puts "NodeInfo nodes #{node_info.nodes.inspect}"
+  puts "NodeInfo sockets #{node_info.sockets.inspect}"
+  puts "NodeInfo cores #{node_info.cores.inspect}"
+  puts "NodeInfo threads #{node_info.threads.inspect}"
+  puts "NodeInfo memory #{node_info.memory.inspect}"
+
   c.register_domain_event_callback(Libvirt::DOMAIN_EVENT_ID_LIFECYCLE, nil) do |dom, event, detail, opaque|
     Libvirt.logger.info { "DOMAIN_EVENT_ID_LIFECYCLE user dom=#{dom}, event=#{event}, detail=#{detail}, opaque=#{opaque}" }
   end
@@ -44,17 +63,22 @@ Async do
     end
   end
 
-  res = domains.first.get_state
-  Libvirt.logger.info { "Domain #{domains.first} state #{res}" }
+  d = 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}"
 
   # ASYNC_REACTOR.every(10) do
   #   LibvirtAsync::Util.create_task(nil, ASYNC_REACTOR) { IMPL.print_debug_info }.run
   # end
 
-  ASYNC_REACTOR.every(5) do
-    Libvirt.logger.info { "MEM USAGE: #{GetProcessMem.new.mb} MB" }
-    Libvirt.logger.info { "GC.start" }
-    GC.start
-    Libvirt.logger.info { "MEM USAGE: #{GetProcessMem.new.mb} MB" }
-  end
+  # ASYNC_REACTOR.every(5) do
+  #   Libvirt.logger.info { "MEM USAGE: #{GetProcessMem.new.mb} MB" }
+  #   Libvirt.logger.info { "GC.start" }
+  #   GC.start
+  #   Libvirt.logger.info { "MEM USAGE: #{GetProcessMem.new.mb} MB" }
+  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libvirt_ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -52,7 +52,8 @@ files:
 - lib/libvirt/ffi/domain.rb
 - lib/libvirt/ffi/event.rb
 - lib/libvirt/ffi/libvirt.rb
-- lib/libvirt/lib_version.rb
+- lib/libvirt/ffi/node_info.rb
+- lib/libvirt/node_info.rb
 - lib/libvirt/util.rb
 - lib/libvirt/version.rb
 - lib/libvirt_ffi.rb

data/lib/libvirt/lib_version.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'ffi'
-require 'libvirt/ffi/libvirt'
-require 'libvirt/util'
-
-module Libvirt
-  module LibVersion
-    def self.call
-
-    end
-  end
-end