PAPI 0.101 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de3a90256e611c4afea6f7878025745c7eb0a315
-  data.tar.gz: 92f6fc2183070716de8e5ea002d3a788bfbb897a
+  metadata.gz: 0b38abf3baa30222434638a5b1af0cba8f664c47
+  data.tar.gz: '079eda46c077084117750f9815221c32c5dcf9b4'
 SHA512:
-  metadata.gz: a2713b51238af8b029ce032053fadc9f32d57fdbbdd4b9e746bfb915165de527376e449b5f43088f6fcc3da946669299f56c459af991c3f5769f3402c15acccf
-  data.tar.gz: 665638d1acd6f0c4f337841335532e446d6ecaa66f9783bdc6a610d737969a7359985d60d15b0c7475a06908443ab7d1a4a143503d4bf4a00ca4adaed5258d7a
+  metadata.gz: 953f9b8ec70eff81cea4ccf5b7acb1d79ce79371d9c7f7af41fc7a4507dcefa6b3590fe8dda3589a4cee6b7aeb6e1b0dec1dc49d134c4f89363ace64f277562c
+  data.tar.gz: 31499b71710ba897b09c45fe8f6a852bebc80ede2b1b9ccfd8a65903eec7482568e90af9a1679a39e1d068cb613e00933c6f9118ef2522457567adf7edce0dff

data/PAPI.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'PAPI'
-  s.version = "0.101"
+  s.version = "1.0.0"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/papi-ruby"
   s.summary = "Ruby PAPI bindings"
   s.description = "Ruby PAPI bindings."
-  s.files = %w( PAPI.gemspec LICENSE lib/PAPI.rb lib/PAPI/ lib/PAPI/Version.rb lib/PAPI/Error.rb lib/PAPI/Event.rb lib/PAPI/Component.rb lib/PAPI/EventSet.rb )
+  s.files = %w( PAPI.gemspec LICENSE lib/PAPI.rb lib/PAPI/ lib/PAPI/Version.rb lib/PAPI/Error.rb lib/PAPI/Thread.rb lib/PAPI/Event.rb lib/PAPI/Component.rb lib/PAPI/EventSet.rb )
   s.has_rdoc = true
-  s.license = 'BSD'
+  s.license = 'BSD-2-Clause'
   s.required_ruby_version = '>= 1.9.3'
-  s.add_dependency 'ffi', '>=1.9.3'
+  s.add_dependency 'ffi', '~> 1.9', '>=1.9.3'
 end

data/lib/PAPI.rb

@@ -1,5 +1,6 @@
 require 'PAPI/Version.rb'
 require 'PAPI/Error.rb'
+require 'PAPI/Thread.rb'
 require 'PAPI/Event.rb'
 require 'PAPI/Component.rb'
 require 'PAPI/EventSet.rb'

data/lib/PAPI/EventSet.rb

@@ -39,7 +39,6 @@ module PAPI
       number = FFI::MemoryPointer::new(:int)
       number.write_int(@number)
       error = PAPI::PAPI_destroy_eventset( number )
-      @number = number.read_int
       PAPI::error_check(error)
       return self
     end
@@ -108,6 +107,7 @@ module PAPI
         cid = 0
       end
       list = []
+      return nil unless COMPONENTS[cid]
       if preset and COMPONENTS[cid].preset then
         events = COMPONENTS[cid].preset
       else

data/lib/PAPI/Thread.rb

@@ -0,0 +1,38 @@
+module PAPI
+  attach_function :PAPI_thread_init, [:pointer], :int
+  attach_function :PAPI_register_thread, [], :int
+  attach_function :PAPI_unregister_thread, [], :int
+  attach_function :PAPI_list_threads, [:pointer, :pointer], :int
+
+  def self.thread_init(pointer = nil)
+    pointer = PAPI.ffi_libraries.first.find_function("pthread_self") unless pointer
+    err = PAPI.PAPI_thread_init(pointer)
+    error_check(err)
+    return self
+  end
+
+  def self.register_thread
+    err = PAPI.PAPI_register_thread
+    error_check(err)
+    return self
+  end
+
+  def self.unregister_thread
+    err = PAPI.PAPI_unregister_thread
+    error_check(err)
+    return self
+  end
+
+  def self.list_threads
+    count_p = FFI::MemoryPointer::new(:int)
+    err = PAPI.PAPI_list_threads(nil, count_p)
+    error_check(err)
+    count = count_p.read_int
+    return [] if count == 0
+    id_p = FFI::MemoryPointer::new(:ulong, count)
+    err = PAPI.PAPI_list_threads(id_p, count_p)
+    error_check(err)
+    return id_p.read_array_of_ulong(count)
+  end
+
+end

data/lib/PAPI/Version.rb

@@ -4,7 +4,7 @@ module PAPI
 
   extend FFI::Library
 
-  ffi_lib "libpapi.so"
+  ffi_lib "papi"
   attach_function :PAPI_library_init, [ :int ], :int
   attach_function :PAPI_shutdown, [ ], :void
 
@@ -71,21 +71,9 @@ module PAPI
     return nil
   end
 
-  def self.init
-    5.downto(3) { |major|
-      9.downto(0) { |minor|
-        9.downto(0) { |revision|
-          9.downto(0) { |increment|
-            v = Version::new(major, minor, revision, increment)
-            res = PAPI_library_init(v)
-            if res == v.to_int then
-              return Version::new(res)
-            end
-          }
-        }
-      }
-    }
-    return nil
+  def self.shutdown
+    PAPI_shutdown()
+    return self
   end
 
   VERSION = self.init()

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: PAPI
 version: !ruby/object:Gem::Version
-  version: '0.101'
+  version: 1.0.0
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
@@ -37,10 +43,11 @@ files:
 - lib/PAPI/Error.rb
 - lib/PAPI/Event.rb
 - lib/PAPI/EventSet.rb
+- lib/PAPI/Thread.rb
 - lib/PAPI/Version.rb
 homepage: https://github.com/Nanosim-LIG/papi-ruby
 licenses:
-- BSD
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -58,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby PAPI bindings