babeltrace 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a11c8de93fc93dc21253113b61b0897b09a4030080b5f9dbf5083785f4e0536
-  data.tar.gz: 4fda4626f48176e76cafa3a74ed050e71ceed8243345c8b85fbbda1ee33e99bd
+  metadata.gz: a9a7ce6aedb3ba33fb52eda3fa2b6801a61aa473760b0e6544796e7fc8df4ebf
+  data.tar.gz: 122c685bd2c4c6c53e3c82f6252b76b14b35add6cbb21323a2b05694e4da69ba
 SHA512:
-  metadata.gz: 7e4e16041d38f56ba939de1391ded0f50e4293d788da8b2dc6e1a70a3147030f390bd6dd5bec962941254de265bd0b00a43f2cd49d3cc5eeb148399bff1e5de0
-  data.tar.gz: 345f080fcc55a404bd6d79018d6c624fd3502fa9d55803ad9f499e1e6176478f9e4fcba22cd67878b6cc12a2518ad8e38d7d0313db04ab32e8facde3c0c2c240
+  metadata.gz: 35aefb30265483879e836c0bf60aef7651b02d1d4bba2d2292aba1721ad2834f41eab4c2c8f69ffcf82a440fc5047d73d0f978c0fc8bd297074c5b6c05d19185
+  data.tar.gz: 569f92c75a651ee470c7d144635261e024a5618dc6460bb3fa675bce6dd09539ca4d1bc8e73d4a5a637e53603bc38d579fa4fe4af469b5b354c4986ba7d3f123

data/babeltrace.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'babeltrace'
-  s.version = "0.1.1"
+  s.version = "0.1.2"
   s.author = "Brice Videau"
   s.email = "bvideau@anl.gov"
   s.homepage = "https://github.com/alcf-perfengr/babeltrace-ruby"
@@ -12,4 +12,5 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
   s.required_ruby_version = '>= 2.3.0'
   s.add_dependency 'ffi', '~> 1.9', '>=1.9.3'
+  s.add_dependency 'walk', '~> 0.1', '>=0.1.0'
 end

data/ext/babeltrace_c/babeltrace.c

@@ -7,6 +7,8 @@
 static VALUE m_babeltrace;
 static VALUE m_ctf;
 static VALUE m_internal;
+static VALUE c_definition;
+static VALUE c_declaration;
 static VALUE c_internal_declaration;
 static VALUE c_internal_definition;
 static VALUE c_ctf_declaration;
@@ -66,8 +68,10 @@ void Init_babeltrace_c() {
   m_ffi = rb_const_get(rb_cObject, rb_intern("FFI"));
   c_ffi_pointer = rb_const_get(m_ffi, rb_intern("Pointer"));
   c_ffi_struct = rb_const_get(m_ffi, rb_intern("Struct"));
-  c_internal_declaration = rb_define_class_under(m_internal, "Declaration", c_ffi_struct);
-  c_internal_definition = rb_define_class_under(m_internal, "Definition", c_ffi_struct);
+  c_definition = rb_define_class_under(m_babeltrace, "Definition", c_ffi_struct);
+  c_declaration = rb_define_class_under(m_babeltrace, "Declaration", c_ffi_struct);
+  c_internal_declaration = rb_define_class_under(m_internal, "Declaration", c_declaration);
+  c_internal_definition = rb_define_class_under(m_internal, "Definition", c_definition);
   c_ctf_declaration = rb_define_class_under(m_ctf, "Declaration", rb_cObject);
   c_ctf_array_declaration = rb_define_class_under(m_ctf, "ArrayDecl", c_ctf_declaration);
   c_ctf_sequence_declaration = rb_define_class_under(m_ctf, "SequenceDecl", c_ctf_declaration);

data/lib/babeltrace/context.rb

@@ -1,8 +1,12 @@
+require 'walk'
+
 module Babeltrace
 
   class Context # < ManagedStruct
+    attr_reader :traces
     def initialize(ptr = Babeltrace.bt_context_create)
       super(ptr)
+      @traces = []
     end
 
     def self.release(ptr)
@@ -13,15 +17,36 @@ module Babeltrace
       handle_id = Babeltrace.bt_context_add_trace(self, path, format, nil, nil, nil)
       case format
       when "ctf"
-        return CTF::Trace::new(self, handle_id)
+        trace = CTF::Trace::new(self, handle_id)
       else
-        return Trace::new(self, handle_id)
+        trace = Trace::new(self, handle_id)
+      end
+      @traces.push trace
+      trace
+    end
+
+    def add_traces(path:, format: "ctf")
+      traces = []
+      Walk.walk(path) do |path, dirs, files|
+        trace = add_trace(path: path, format: format) if files.include?("metadata")
+        traces.push trace if trace
       end
+      traces
     end
 
     def remove_trace(trace_id)
       Babeltrace.bt_context_remove_trace(self, trace_id)
     end
+
+    def get_timestamp_begin(clock_type = :REAL)
+      return nil if traces.empty?
+      traces.collect { |t| t.get_timestamp_begin(clock_type) }.min
+    end
+
+    def get_timestamp_end(clock_type = :REAL)
+      return nil if traces.empty?
+      traces.collect { |t| t.get_timestamp_end(clock_type) }.max
+    end
   end
 
   attach_function :bt_context_create, [], Context

data/lib/babeltrace/ctf/events.rb

@@ -24,7 +24,7 @@ module Babeltrace
                           :UNKNOWN
 
     module Internal
-      class Declaration # < FFI::Struct
+      class Declaration # < Babeltrace::Declaration < FFI::Struct
         layout :dummy, :pointer
 
         def field_type
@@ -60,13 +60,13 @@ module Babeltrace
         end
       end
     end
-    attach_function :bt_ctf_field_type, [Internal::Declaration], TypeID
-    attach_function :bt_ctf_get_int_signedness, [Internal::Declaration], :int
-    attach_function :bt_ctf_get_int_base, [Internal::Declaration], :int
-    attach_function :bt_ctf_get_int_byte_order, [Internal::Declaration], :int
-    attach_function :bt_ctf_get_int_len, [Internal::Declaration], :ssize_t
-    attach_function :bt_ctf_get_encoding, [Internal::Declaration], StringEncoding
-    attach_function :bt_ctf_get_array_len, [Internal::Declaration], :int
+    attach_function :bt_ctf_field_type, [Babeltrace::Declaration], TypeID
+    attach_function :bt_ctf_get_int_signedness, [Babeltrace::Declaration], :int
+    attach_function :bt_ctf_get_int_base, [Babeltrace::Declaration], :int
+    attach_function :bt_ctf_get_int_byte_order, [Babeltrace::Declaration], :int
+    attach_function :bt_ctf_get_int_len, [Babeltrace::Declaration], :ssize_t
+    attach_function :bt_ctf_get_encoding, [Babeltrace::Declaration], StringEncoding
+    attach_function :bt_ctf_get_array_len, [Babeltrace::Declaration], :int
 
     module Internal
       class FieldDecl < FFI::Struct
@@ -89,7 +89,7 @@ module Babeltrace
     attach_function :bt_ctf_get_decl_field_name, [Internal::FieldDecl], :string
 
     module Internal
-      class Definition # < FFI::Struct
+      class Definition # < Babeltrace::Definition < FFI::Struct
         layout :dummy, :pointer
 
         def field_name
@@ -149,18 +149,18 @@ module Babeltrace
       end
     end
 
-    attach_function :bt_ctf_field_name, [Internal::Definition], :string
-    attach_function :bt_ctf_get_decl_from_def, [Internal::Definition], Internal::Declaration.by_ref
-    attach_function :bt_ctf_get_struct_field_count, [Internal::Definition], :uint64
-    attach_function :bt_ctf_get_uint64, [Internal::Definition], :uint64
-    attach_function :bt_ctf_get_int64, [Internal::Definition], :int64
-    attach_function :bt_ctf_get_enum_int, [Internal::Definition], Internal::Definition.by_ref
-    attach_function :bt_ctf_get_enum_str, [Internal::Definition], :string
-    attach_function :bt_ctf_get_char_array, [Internal::Definition], :pointer
-    attach_function :bt_ctf_get_string, [Internal::Definition], :string
-    attach_function :bt_ctf_get_float, [Internal::Definition], :double
-    attach_function :bt_ctf_get_variant, [Internal::Definition], Internal::Definition.by_ref
-    attach_function :bt_ctf_get_struct_field_index, [Internal::Definition, :uint64], Internal::Definition.by_ref
+    attach_function :bt_ctf_field_name, [Babeltrace::Definition], :string
+    attach_function :bt_ctf_get_decl_from_def, [Babeltrace::Definition], Internal::Declaration.by_ref
+    attach_function :bt_ctf_get_struct_field_count, [Babeltrace::Definition], :uint64
+    attach_function :bt_ctf_get_uint64, [Babeltrace::Definition], :uint64
+    attach_function :bt_ctf_get_int64, [Babeltrace::Definition], :int64
+    attach_function :bt_ctf_get_enum_int, [Babeltrace::Definition], Internal::Definition.by_ref
+    attach_function :bt_ctf_get_enum_str, [Babeltrace::Definition], :string
+    attach_function :bt_ctf_get_char_array, [Babeltrace::Definition], :pointer
+    attach_function :bt_ctf_get_string, [Babeltrace::Definition], :string
+    attach_function :bt_ctf_get_float, [Babeltrace::Definition], :double
+    attach_function :bt_ctf_get_variant, [Babeltrace::Definition], Internal::Definition.by_ref
+    attach_function :bt_ctf_get_struct_field_index, [Babeltrace::Definition, :uint64], Internal::Definition.by_ref
 
     module Internal
       class EventDecl < FFI::Struct
@@ -176,9 +176,14 @@ module Babeltrace
           list = FFI::MemoryPointer::new(:pointer)
           res = CTF.bt_ctf_get_decl_fields(self, scope, list, count)
           count = count.read(:uint)
-          list = list.read_pointer.read_array_of_pointer(count)
-          list.collect { |p| FieldDecl::new(p) }
+          if count > 0
+            list = list.read_pointer.read_array_of_pointer(count)
+            list.collect { |p| FieldDecl::new(p) }
+          else
+            []
+          end
         end
+        alias decl_fields get_decl_fields
       end
     end
 
@@ -199,6 +204,15 @@ module Babeltrace
     attach_function :bt_ctf_get_event_decl_list, [:int, Context, :pointer, :pointer], :int
 
     class Event
+
+      def get_id
+        defi = self.top_level_scope(:STREAM_EVENT_HEADER).value
+        id = defi["id"][0]
+        id = defi["v"]["id"] if id == 65535
+        id
+      end
+      alias id get_id
+
       def get_context
         c = CTF.bt_ctf_event_get_context(self)
         Babeltrace.bt_context_get(c)
@@ -276,13 +290,9 @@ module Babeltrace
     attach_function :bt_ctf_event_name, [Event], :string
     attach_function :bt_ctf_get_cycles, [Event], :uint64
     attach_function :bt_ctf_get_timestamp, [Event], :uint64
-    attach_function :bt_ctf_get_field_list, [Event, Internal::Definition, :pointer, :pointer], :int
-    attach_function :bt_ctf_get_field, [Event, Internal::Definition, :string], Internal::Definition.by_ref
-    attach_function :bt_ctf_get_index, [Event, Internal::Definition, :uint], Internal::Definition.by_ref
-    # Hack
-    attach_function :bt_array_index, [Internal::Definition, :uint64], Internal::Definition.by_ref
-    attach_function :bt_sequence_len, [Internal::Definition], :uint64
-    attach_function :bt_sequence_index, [Internal::Definition, :uint64], Internal::Definition.by_ref
+    attach_function :bt_ctf_get_field_list, [Event, Babeltrace::Definition, :pointer, :pointer], :int
+    attach_function :bt_ctf_get_field, [Event, Babeltrace::Definition, :string], Internal::Definition.by_ref
+    attach_function :bt_ctf_get_index, [Event, Babeltrace::Definition, :uint], Internal::Definition.by_ref
 
     class Definition
       attr_reader :definition
@@ -346,7 +356,7 @@ module Babeltrace
       end
 
       def value
-        { int.value => string }
+        [ int.value, string ]
       end
     end
 
@@ -383,8 +393,7 @@ module Babeltrace
       end
 
       def index(i)
-        d = CTF.bt_array_index(@definition, i)
-        return Definition.create(d)
+        return Definition.create(@definition.array_index(i))
       end
 
       def value
@@ -404,12 +413,11 @@ module Babeltrace
 
     class SequenceDef < Definition
       def len
-        CTF.bt_sequence_len(@definition)
+        @definition.sequence_len
       end
 
       def index(i)
-        d = CTF.bt_sequence_index(@definition, i)
-        return Definition.create(d)
+        return Definition.create(@definition.sequence_index(i))
       end
 
       def value
@@ -419,11 +427,11 @@ module Babeltrace
 
     class SequenceTextDef < Definition
       def len
-        CTF.bt_sequence_len(@definition)
+        @definition.sequence_len
       end
 
       def value
-        return [] if len == 0
+        return "" if len == 0
         @definition.get_char_sequence.read_bytes(len)
       end
     end

data/lib/babeltrace/ctf/iterator.rb

@@ -1,20 +1,20 @@
 module Babeltrace
-  module CTF
-    class Trace
-      def iter_create(begin_pos: nil, end_pos: nil)
-        CTF.bt_ctf_iter_create(@context, begin_pos, end_pos)
-      end
+  class Context
+    def iter_create(begin_pos: nil, end_pos: nil)
+      CTF.bt_ctf_iter_create(self, begin_pos, end_pos)
+    end
 
-      def iter_create_intersect
-        begin_pos_ptr = FFI::MemoryPointer::new(:pointer)
-        end_pos_ptr = FFI::MemoryPointer::new(:pointer)
-        iter = CTF.bt_ctf_iter_create_intersect(@context, begin_pos_ptr, end_pos_ptr)
-        begin_pos = IterPosManaged::new(begin_pos_ptr.read_pointer)
-        end_pos = IterPosManaged::new(end_pos_ptr.read_pointer)
-        [iter, begin_pos, end_pos]
-      end
+    def iter_create_intersect
+      begin_pos_ptr = FFI::MemoryPointer::new(:pointer)
+      end_pos_ptr = FFI::MemoryPointer::new(:pointer)
+      iter = CTF.bt_ctf_iter_create_intersect(@context, begin_pos_ptr, end_pos_ptr)
+      begin_pos = IterPosManaged::new(begin_pos_ptr.read_pointer)
+      end_pos = IterPosManaged::new(end_pos_ptr.read_pointer)
+      [iter, begin_pos, end_pos]
     end
+  end
 
+  module CTF
     class Iter
       def self.release(ptr)
         CTF.bt_ctf_iter_destroy(ptr)

data/lib/babeltrace/types.rb

@@ -5,4 +5,25 @@ module Babeltrace
     typedef orig, add
   }
 
+  attach_function :bt_array_index, [Definition, :uint64], :pointer #Returns a definition
+  attach_function :bt_sequence_len, [Definition], :uint64
+  attach_function :bt_sequence_index, [Definition, :uint64], :pointer #Returns a definition
+  class Definition #< FFI::Struct
+    def array_index(i)
+      d = Babeltrace.bt_array_index(self, i)
+      return nil if d.null?
+      self.class.new(d)
+    end
+
+    def sequence_len
+      Babeltrace.bt_sequence_len(self)
+    end
+
+    def sequence_index(i)
+      d = Babeltrace.bt_sequence_index(self, i)
+      return nil if d.null?
+      self.class.new(d)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babeltrace
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-01-31 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: walk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !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'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Ruby libbabeltrace ffi bindings
 email: bvideau@anl.gov
 executables: []