hwloc 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '081b8121d7a652135e9b3737780c298fa7344cb6'
-  data.tar.gz: 17d522c1332cda3854e27599c77427c04f2d84e7
+  metadata.gz: 9ba61e1a01e14b5b51f99082550eff817cfdf3cf
+  data.tar.gz: 27e11114673db41f5f885cec565e8b5e75721b75
 SHA512:
-  metadata.gz: 425b74b3084abe8c680cdcd8b2179e892a87c3c2b27fa8350107be21e489c68664d87c21838399aeef66297d0e2dce1ce491a156893e3258c8ad92c5a6269ee6
-  data.tar.gz: 48d341cb5425bc74dc089183e476d37335e90255e699d5bbf734a18e261e2b78188dcb545756693d34e7fe7a3e67fd18cf4ec5ef57e4284824f578dbb3f0055b
+  metadata.gz: 7aef73e3c365c766f4bb2218eb240ae8ab61d19cae1680a68b47763545bb9303ad59352264ab6c4ccc27db153427db04d657b096ab120f0a3473fa49f23eaf23
+  data.tar.gz: a9afb5b77ee7af7f150a38aa2d281ec8b0b8c1958e4624837805089b895e22385038992994e3fb0a300bcdd8ed65ba559bd8c02804d87aef5bd8466132653bb3

data/hwloc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'hwloc'
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/hwloc-ruby"
@@ -11,4 +11,5 @@ Gem::Specification.new do |s|
   s.license = 'BSD-2-Clause'
   s.required_ruby_version = '>= 1.9.3'
   s.add_dependency 'ffi', '~> 1.9', '>=1.9.3'
+  s.add_dependency 'ffi-bitmask', '~> 0.1.0', '>=0.1.0'
 end

data/lib/hwloc/Bind.rb

@@ -1,9 +1,9 @@
 module Hwloc
-  CpubindFlags = enum( :cpubin_flags, [
-    :CPUBIND_PROCESS,   1<<0,
-    :CPUBIND_THREAD,    1<<1,
-    :CPUBIND_STRICT,    1<<2,
-    :CPUBIND_NOMEMBIND, 1<<3
+  CpubindFlags = bitmask( :cpubind_flags, [
+    :CPUBIND_PROCESS,
+    :CPUBIND_THREAD,
+    :CPUBIND_STRICT,
+    :CPUBIND_NOMEMBIND
   ] )
 
   if API_VERSION < API_VERSION_2_0 then
@@ -27,23 +27,23 @@ module Hwloc
     ] )
   end
 
-  MembindFlags = enum( :membind_flags, [
-    :MEMBIND_PROCESS,   1<<0,
-    :MEMBIND_THREAD,    1<<1,
-    :MEMBIND_STRICT,    1<<2,
-    :MEMBIND_MIGRATE,   1<<3,
-    :MEMBIND_NOCPUBIND, 1<<4,
-    :MEMBIND_BYNODESET, 1<<5
+  MembindFlags = bitmask( :membind_flags, [
+    :MEMBIND_PROCESS,
+    :MEMBIND_THREAD,
+    :MEMBIND_STRICT,
+    :MEMBIND_MIGRATE,
+    :MEMBIND_NOCPUBIND,
+    :MEMBIND_BYNODESET
   ] )
 
-  attach_function :hwloc_set_cpubind, [:topology, :cpuset, :int], :int
-  attach_function :hwloc_get_cpubind, [:topology, :cpuset, :int], :int
-  attach_function :hwloc_set_proc_cpubind, [:topology, :hwloc_pid_t, :cpuset, :int], :int
-  attach_function :hwloc_get_proc_cpubind, [:topology, :hwloc_pid_t, :cpuset, :int], :int
-  attach_function :hwloc_set_thread_cpubind, [:topology, :hwloc_thread_t, :cpuset, :int], :int
-  attach_function :hwloc_get_thread_cpubind, [:topology, :hwloc_thread_t, :cpuset, :int], :int
-  attach_function :hwloc_get_last_cpu_location, [:topology, :cpuset, :int], :int
-  attach_function :hwloc_get_proc_last_cpu_location, [:topology, :hwloc_pid_t, :cpuset, :int], :int
+  attach_function :hwloc_set_cpubind, [:topology, :cpuset, :cpubind_flags], :int
+  attach_function :hwloc_get_cpubind, [:topology, :cpuset, :cpubind_flags], :int
+  attach_function :hwloc_set_proc_cpubind, [:topology, :hwloc_pid_t, :cpuset, :cpubind_flags], :int
+  attach_function :hwloc_get_proc_cpubind, [:topology, :hwloc_pid_t, :cpuset, :cpubind_flags], :int
+  attach_function :hwloc_set_thread_cpubind, [:topology, :hwloc_thread_t, :cpuset, :cpubind_flags], :int
+  attach_function :hwloc_get_thread_cpubind, [:topology, :hwloc_thread_t, :cpuset, :cpubind_flags], :int
+  attach_function :hwloc_get_last_cpu_location, [:topology, :cpuset, :cpubind_flags], :int
+  attach_function :hwloc_get_proc_last_cpu_location, [:topology, :hwloc_pid_t, :cpuset, :cpubind_flags], :int
 
   class BindError < Error
   end
@@ -53,7 +53,7 @@ module Hwloc
 
   class Topology
 
-    def set_cpubind(cpuset, flags = 0)
+    def set_cpubind(cpuset, *flags)
       if block_given? then
         oldcpuset = get_cpubind(flags)
         set_cpubind(cpuset, flags)
@@ -66,47 +66,47 @@ module Hwloc
       end
     end
 
-    def get_cpubind(flags = 0)
+    def get_cpubind(*flags)
       cpuset = Cpuset::new
       err = Hwloc.hwloc_get_cpubind(@ptr, cpuset, flags)
       raise CpubindError if err == -1
       return cpuset
     end
 
-    def set_proc_cpubind(pid, cpuset, flags = 0)
+    def set_proc_cpubind(pid, cpuset, *flags)
       err = Hwloc.hwloc_set_proc_cpubind(@ptr, pid, cpuset, flags)
       raise CpubindError if err == -1
       return self
     end
 
-    def get_proc_cpubind(pid, flags)
+    def get_proc_cpubind(pid, *flags)
       cpuset = Cpuset::new
       err = Hwloc.hwloc_get_proc_cpubind(@ptr, pid, cpuset, flags)
       raise CpubindError if err == -1
       return cpuset
     end
 
-    def set_thread_cpubind(thread, cpuset, flags = 0)
+    def set_thread_cpubind(thread, cpuset, *flags)
       err = Hwloc.hwloc_set_thread_cpubind(@ptr, thread, cpuset, flags)
       raise CpubindError if err == -1
       return self
     end
 
-    def get_thread_cpubind(thread, flags = 0)
+    def get_thread_cpubind(thread, *flags)
       cpuset = Cpuset::new
       err = Hwloc.hwloc_get_thread_cpubind(@ptr, thread, cpuset, flags)
       raise CpubindError if err == -1
       return cpuset
     end
 
-    def get_last_cpu_location(flags = 0)
+    def get_last_cpu_location(*flags)
       cpuset = Cpuset::new
       err = Hwloc.hwloc_get_last_cpu_location(@ptr, cpuset, flags)
       raise CpubindError if err == -1
       return cpuset
     end
 
-    def get_proc_last_cpu_location(pid, flags = 0)
+    def get_proc_last_cpu_location(pid, *flags)
       cpuset = Cpuset::new
       err = Hwloc.hwloc_get_proc_last_cpu_location(@ptr, pid, cpuset, flags)
       raise CpubindError if err == -1
@@ -119,42 +119,41 @@ module Hwloc
   end
 
   if API_VERSION < API_VERSION_2_0 then
-    attach_function :hwloc_set_membind_nodeset, [:topology, :nodeset, :membind_policy, :int], :int
-    attach_function :hwloc_get_membind_nodeset, [:topology, :nodeset, :pointer, :int], :int
-    attach_function :hwloc_set_proc_membind_nodeset, [:topology, :hwloc_pid_t, :nodeset, :membind_policy, :int], :int
-    attach_function :hwloc_get_proc_membind_nodeset, [:topology, :hwloc_pid_t, :nodeset, :pointer, :int], :int
-    attach_function :hwloc_set_area_membind_nodeset, [:topology, :pointer, :size_t, :nodeset, :membind_policy, :int], :int
-    attach_function :hwloc_get_area_membind_nodeset, [:topology, :pointer, :size_t, :nodeset, :pointer, :int], :int
-    attach_function :hwloc_alloc_membind_nodeset, [:topology, :size_t, :nodeset, :membind_policy, :int], :pointer
+    attach_function :hwloc_set_membind_nodeset, [:topology, :nodeset, :membind_policy, :membind_flags], :int
+    attach_function :hwloc_get_membind_nodeset, [:topology, :nodeset, :pointer, :membind_flags], :int
+    attach_function :hwloc_set_proc_membind_nodeset, [:topology, :hwloc_pid_t, :nodeset, :membind_policy, :membind_flags], :int
+    attach_function :hwloc_get_proc_membind_nodeset, [:topology, :hwloc_pid_t, :nodeset, :pointer, :membind_flags], :int
+    attach_function :hwloc_set_area_membind_nodeset, [:topology, :pointer, :size_t, :nodeset, :membind_policy, :membind_flags], :int
+    attach_function :hwloc_get_area_membind_nodeset, [:topology, :pointer, :size_t, :nodeset, :pointer, :membind_flags], :int
+    attach_function :hwloc_alloc_membind_nodeset, [:topology, :size_t, :nodeset, :membind_policy, :membind_flags], :pointer
   end
-  attach_function :hwloc_set_membind, [:topology, :bitmap, :membind_policy, :int], :int
-  attach_function :hwloc_get_membind, [:topology, :bitmap, :pointer, :int], :int
-  attach_function :hwloc_set_proc_membind, [:topology, :hwloc_pid_t, :bitmap, :membind_policy, :int], :int
-  attach_function :hwloc_get_proc_membind, [:topology, :hwloc_pid_t, :bitmap, :pointer, :int], :int
-
-  attach_function :hwloc_set_area_membind, [:topology, :pointer, :size_t, :bitmap, :membind_policy, :int], :int
-  attach_function :hwloc_get_area_membind, [:topology, :pointer, :size_t, :bitmap, :pointer, :int], :int
+  attach_function :hwloc_set_membind, [:topology, :bitmap, :membind_policy, :membind_flags], :int
+  attach_function :hwloc_get_membind, [:topology, :bitmap, :pointer, :membind_flags], :int
+  attach_function :hwloc_set_proc_membind, [:topology, :hwloc_pid_t, :bitmap, :membind_policy, :membind_flags], :int
+  attach_function :hwloc_get_proc_membind, [:topology, :hwloc_pid_t, :bitmap, :pointer, :membind_flags], :int
+  attach_function :hwloc_set_area_membind, [:topology, :pointer, :size_t, :bitmap, :membind_policy, :membind_flags], :int
+  attach_function :hwloc_get_area_membind, [:topology, :pointer, :size_t, :bitmap, :pointer, :membind_flags], :int
 
   begin
-    attach_function :hwloc_get_area_memlocation, [:topology, :pointer, :size_t, :bitmap, :int], :int
+    attach_function :hwloc_get_area_memlocation, [:topology, :pointer, :size_t, :bitmap, :membind_flags], :int
   rescue FFI::NotFoundError
     warn "Missing hwloc_get_area_memlocation support!"
   end
 
   attach_function :hwloc_alloc, [:topology, :size_t], :pointer
-  attach_function :hwloc_alloc_membind, [:topology, :size_t, :bitmap, :membind_policy, :int], :pointer
+  attach_function :hwloc_alloc_membind, [:topology, :size_t, :bitmap, :membind_policy, :membind_flags], :pointer
   attach_function :hwloc_free, [:topology, :pointer, :size_t], :int
 
   class Topology
 
     if API_VERSION < API_VERSION_2_0 then
-      def set_membind_nodeset(nodeset, policy, flags=0)
+      def set_membind_nodeset(nodeset, policy, *flags)
         err = Hwloc.hwloc_set_membind_nodeset(@ptr, nodeset, policy, flags)
         raise MembindError if err == -1
         return self
       end
 
-      def get_membind_nodeset(flags=0)
+      def get_membind_nodeset(*flags)
         nodeset = Nodeset::new
         policy_p = FFI::MemoryPointer::new(MembindPolicy.native_type)
         err = Hwloc.hwloc_get_membind_nodeset(@ptr, nodeset, policy_p, flags)
@@ -163,13 +162,13 @@ module Hwloc
         return [nodeset, MembindPolicy[policy]]
       end
 
-      def set_proc_membind_nodeset(pid, nodeset, policy, flags=0)
+      def set_proc_membind_nodeset(pid, nodeset, policy, *flags)
         err = Hwloc.hwloc_set_proc_membind_nodeset(@ptr, pid, nodeset, policy, flags)
         raise MembindError if err == -1
         return self
       end
 
-      def get_proc_membind_nodeset(pid, flags=0)
+      def get_proc_membind_nodeset(pid, *flags)
         nodeset = Nodeset::new
         policy_p = FFI::MemoryPointer::new(MembindPolicy.native_type)
         err = Hwloc.hwloc_get_proc_membind_nodeset(@ptr, pid, nodeset, policy_p, flags)
@@ -178,13 +177,13 @@ module Hwloc
         return [nodeset, policy]
       end
 
-      def set_area_membind_nodeset(pointer, nodeset, policy, flags=0)
+      def set_area_membind_nodeset(pointer, nodeset, policy, *flags)
         err = Hwloc.hwloc_set_area_membind_nodeset(@ptr, pointer, pointer.size, nodeset, policy, flags)
         raise MembindError if err == -1
         return self
       end
 
-      def get_area_membind_nodeset(pointer, flags=0)
+      def get_area_membind_nodeset(pointer, *flags)
         nodeset = Nodeset::new
         policy_p = FFI::MemoryPointer::new(MembindPolicy.native_type)
         err = Hwloc.hwloc_get_area_membind_nodeset(@ptr, pointer, pointer.size, nodeset, policy_p, flags)
@@ -193,14 +192,14 @@ module Hwloc
         return [nodeset, policy]
       end
 
-      def alloc_membind_nodeset(size, nodeset, policy, flags=0)
+      def alloc_membind_nodeset(size, nodeset, policy, *flags)
         ptr = Hwloc.hwloc_alloc_membind_nodeset(@ptr, size, nodeset, policy, flags)
         raise MembindError if ptr.null?
         ptr = ptr.slice(0, size)
         return FFI::AutoPointer::new(ptr, self.method(:free))
       end
 
-      def alloc_membind_policy_nodeset(size, nodeset, policy, flags=0)
+      def alloc_membind_policy_nodeset(size, nodeset, policy, *flags)
         begin
           return alloc_membind_nodeset(size, nodeset, policy, flags)
         rescue MembindError
@@ -213,7 +212,7 @@ module Hwloc
 
     end
 
-    def set_membind(set, policy, flags=0)
+    def set_membind(set, policy, *flags)
       if block_given? then
         oldset, oldpolicy = get_membind(flags)
         set_membind(set, policy, flags)
@@ -226,7 +225,7 @@ module Hwloc
       end
     end
 
-    def get_membind(flags=0)
+    def get_membind(*flags)
       set = Bitmap::new
       policy_p = FFI::MemoryPointer::new(MembindPolicy.native_type)
       err = Hwloc.hwloc_get_membind(@ptr, set, policy_p, flags)
@@ -235,13 +234,13 @@ module Hwloc
       return [set, MembindPolicy[policy]]
     end
 
-    def set_proc_membind(pid, set, policy, flags=0)
+    def set_proc_membind(pid, set, policy, *flags)
       err = Hwloc.hwloc_set_proc_membind(@ptr, pid, set, policy, flags)
       raise MembindError if err == -1
       return self
     end
 
-    def get_proc_membind(pid, flags=0)
+    def get_proc_membind(pid, *flags)
       set = Bitmap::new
       policy_p = FFI::MemoryPointer::new(MembindPolicy.native_type)
       err = Hwloc.hwloc_get_proc_membind(@ptr, pid, set, policy_p, flags)
@@ -250,13 +249,13 @@ module Hwloc
       return [set, policy]
     end
 
-    def set_area_membind(pointer, set, policy, flags=0)
+    def set_area_membind(pointer, set, policy, *flags)
       err = Hwloc.hwloc_set_area_membind(@ptr, pointer, pointer.size, set, policy, flags)
       raise MembindError if err == -1
       return self
     end
 
-    def get_area_membind(pointer, flags=0)
+    def get_area_membind(pointer, *flags)
       set = Bitmap::new
       policy_p = FFI::MemoryPointer::new(MembindPolicy.native_type)
       err = Hwloc.hwloc_get_area_membind(@ptr, pointer, pointer.size, set, policy_p, flags)
@@ -266,7 +265,7 @@ module Hwloc
     end
 
     if Hwloc.respond_to?(:hwloc_get_area_memlocation)
-      def get_area_memlocation(pointer, flags=0)
+      def get_area_memlocation(pointer, *flags)
         set = Bitmap::new
         err = Hwloc.hwloc_get_area_memlocation(@ptr, pointer, pointer.size, set, flags)
         raise MembindError if err == -1
@@ -281,14 +280,14 @@ module Hwloc
       return FFI::AutoPointer::new(ptr, self.method(:free))
     end
 
-    def alloc_membind(size, set, policy, flags=0)
+    def alloc_membind(size, set, policy, *flags)
       ptr = Hwloc.hwloc_alloc_membind(@ptr, size, set, policy, flags)
       raise MembindError if ptr.null?
       ptr = ptr.slice(0, size)
       return FFI::AutoPointer::new(ptr, self.method(:free))
     end
 
-    def alloc_membind_policy(size, set, policy, flags=0)
+    def alloc_membind_policy(size, set, policy, *flags)
       begin
         return alloc_membind(size, set, policy, flags)
       rescue MembindError

data/lib/hwloc/Edition.rb

@@ -13,20 +13,20 @@ module Hwloc
   end
 
   if API_VERSION < API_VERSION_2_0 then
-    RestrictFlags = enum( FFI::find_type(:ulong), :restrict_flags, [
-      :RESTRICT_FLAG_ADAPT_DISTANCES, 1<<0,
-      :RESTRICT_FLAG_ADAPT_MISC, 1<<1,
-      :RESTRICT_FLAG_ADAPT_IO, 1<<2
+    RestrictFlags = bitmask( FFI::find_type(:ulong), :restrict_flags, [
+      :RESTRICT_FLAG_ADAPT_DISTANCES,
+      :RESTRICT_FLAG_ADAPT_MISC,
+      :RESTRICT_FLAG_ADAPT_IO
     ] )
   else
-    RestrictFlags = enum( FFI::find_type(:ulong), :restrict_flags, [
-      :RESTRICT_FLAG_REMOVE_CPULESS, 1<<0,
-      :RESTRICT_FLAG_ADAPT_MISC, 1<<1,
-      :RESTRICT_FLAG_ADAPT_IO, 1<<2
+    RestrictFlags = bitmask( FFI::find_type(:ulong), :restrict_flags, [
+      :RESTRICT_FLAG_REMOVE_CPULESS,
+      :RESTRICT_FLAG_ADAPT_MISC,
+      :RESTRICT_FLAG_ADAPT_IO
     ] )
   end
 
-  attach_function :hwloc_topology_restrict, [:topology, :cpuset, :ulong], :int
+  attach_function :hwloc_topology_restrict, [:topology, :cpuset, :restrict_flags], :int
 
   class EditionError < TopologyError
   end

data/lib/hwloc/Export.rb

@@ -4,11 +4,11 @@ module Hwloc
     attach_function :hwloc_topology_export_xml, [:topology, :string], :int
     attach_function :hwloc_topology_export_xmlbuffer, [:topology, :pointer, :pointer], :int
   else
-    TopologyExportXmlFlags = enum( FFI::find_type(:ulong), :topology_export_xml_flags, [
-      :TOPOLOGY_EXPORT_XML_FLAG_V1, 1<<0
+    TopologyExportXmlFlags = bitmask( FFI::find_type(:ulong), :topology_export_xml_flags, [
+      :TOPOLOGY_EXPORT_XML_FLAG_V1
     ] )
-    attach_function :hwloc_topology_export_xml, [:topology, :string, :ulong], :int
-    attach_function :hwloc_topology_export_xmlbuffer, [:topology, :pointer, :pointer, :ulong], :int
+    attach_function :hwloc_topology_export_xml, [:topology, :string, :topology_export_xml_flags], :int
+    attach_function :hwloc_topology_export_xmlbuffer, [:topology, :pointer, :pointer, :topology_export_xml_flags], :int
   end
 
   attach_function :hwloc_free_xmlbuffer, [:topology, :pointer], :void
@@ -22,12 +22,12 @@ module Hwloc
   callback :hwloc_topology_set_userdata_import_callback_callback, [:topology, Obj.ptr, :string, :pointer, :size_t], :void
   attach_function :hwloc_topology_set_userdata_import_callback, [:topology, :hwloc_topology_set_userdata_import_callback_callback], :void
 
-  TopologyExportSyntheticFlags = enum( FFI::find_type(:ulong), :topology_export_synthetic_flags, [
-    :TOPOLOGY_EXPORT_SYNTHETIC_FLAG_NO_EXTENDED_TYPES, 1<<0,
-    :TOPOLOGY_EXPORT_SYNTHETIC_FLAG_NO_ATTRS, 1<<1
+  TopologyExportSyntheticFlags = bitmask( FFI::find_type(:ulong), :topology_export_synthetic_flags, [
+    :TOPOLOGY_EXPORT_SYNTHETIC_FLAG_NO_EXTENDED_TYPES,
+    :TOPOLOGY_EXPORT_SYNTHETIC_FLAG_NO_ATTRS
   ] )
 
-  attach_function :hwloc_topology_export_synthetic, [:topology, :pointer, :size_t, :uint], :int
+  attach_function :hwloc_topology_export_synthetic, [:topology, :pointer, :size_t, :topology_export_synthetic_flags], :int
 
   class ExportError < TopologyError
   end

data/lib/hwloc/Hwloc.rb

@@ -1,4 +1,5 @@
 require 'ffi'
+require 'ffi/bitmask'
 
 module Hwloc
   extend FFI::Library

data/lib/hwloc/Obj.rb

@@ -137,22 +137,22 @@ module Hwloc
     end
   else
 
-    DistancesKind = enum(FFI::find_type(:ulong), :distances_kind, [
-      :DISTANCES_KIND_FROM_OS,         1<<0,
-      :DISTANCES_KIND_FROM_USER,       1<<1,
-      :DISTANCES_KIND_MEANS_LATENCY,   1<<2,
-      :DISTANCES_KIND_MEANS_BANDWIDTH, 1<<3
+    DistancesKind = bitmask(FFI::find_type(:ulong), :distances_kind, [
+      :DISTANCES_KIND_FROM_OS,
+      :DISTANCES_KIND_FROM_USER,
+      :DISTANCES_KIND_MEANS_LATENCY,
+      :DISTANCES_KIND_MEANS_BANDWIDTH
     ])
 
-    DistancesFlag = enum(FFI::find_type(:ulong), :distances_flag, [
-      :DISTANCES_FLAG_GROUP,            1<<0,
-      :DISTANCES_FLAG_GROUP_INACCURATE, 1<<1
+    DistancesFlag = bitmask(FFI::find_type(:ulong), :distances_flag, [
+      :DISTANCES_FLAG_GROUP,
+      :DISTANCES_FLAG_GROUP_INACCURATE
     ])
 
     class Distances < Struct
       layout :nbobjs, :uint,
              :objs,   :pointer,
-             :kind,   :ulong,
+             :kind,   :distances_kind,
              :values, :pointer
 
       def objs

data/lib/hwloc/Topology.rb

@@ -67,24 +67,24 @@ module Hwloc
   attach_function :hwloc_topology_check, [:topology], :void
 
   if API_VERSION < API_VERSION_2_0 then
-    TopologyFlags = enum( FFI::find_type(:ulong), :topology_flags, [
-      :TOPOLOGY_FLAG_WHOLE_SYSTEM, 1<<0,
-      :TOPOLOGY_FLAG_IS_THISSYSTEM, 1<<1,
-      :TOPOLOGY_FLAG_IO_DEVICES, 1<<2,
-      :TOPOLOGY_FLAG_IO_BRIDGES, 1<<3,
-      :TOPOLOGY_FLAG_WHOLE_IO, 1<<4,
-      :TOPOLOGY_FLAG_ICACHES, 1<<5
+    TopologyFlags = bitmask( FFI::find_type(:ulong), :topology_flags, [
+      :TOPOLOGY_FLAG_WHOLE_SYSTEM,
+      :TOPOLOGY_FLAG_IS_THISSYSTEM,
+      :TOPOLOGY_FLAG_IO_DEVICES,
+      :TOPOLOGY_FLAG_IO_BRIDGES,
+      :TOPOLOGY_FLAG_WHOLE_IO,
+      :TOPOLOGY_FLAG_ICACHES
     ] )
   else
-    TopologyFlags = enum( FFI::find_type(:ulong), :topology_flags, [
-      :TOPOLOGY_FLAG_WHOLE_SYSTEM, 1<<0,
-      :TOPOLOGY_FLAG_IS_THISSYSTEM, 1<<1,
-      :TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES, 1<<2
+    TopologyFlags = bitmask( FFI::find_type(:ulong), :topology_flags, [
+      :TOPOLOGY_FLAG_WHOLE_SYSTEM,
+      :TOPOLOGY_FLAG_IS_THISSYSTEM,
+      :TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES
     ] )
   end
 
-  attach_function :hwloc_topology_set_flags, [:topology, :ulong], :int
-  attach_function :hwloc_topology_get_flags, [:topology], :ulong
+  attach_function :hwloc_topology_set_flags, [:topology, :topology_flags], :int
+  attach_function :hwloc_topology_get_flags, [:topology], :topology_flags
 
   attach_function :hwloc_topology_set_pid, [:topology, :hwloc_pid_t], :int
   if API_VERSION < API_VERSION_2_0 then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hwloc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
+- !ruby/object:Gem::Dependency
+  name: ffi-bitmask
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: hwloc ruby bindings for versions 1.10 onward
 email: brice.videau@imag.fr
 executables: []