babeltrace2 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b661027d46180b1a162ce91aad9ad783e5700abc1182199408d19c61410f2df6
-  data.tar.gz: 9f207749e36ecf12c8e0aae0b54749f967e1aa9830b4bf38b72eac47d1443017
+  metadata.gz: '0239b5e18b776cf7b8d6907e35c6a71aa22f9c6164a38269a629c4a2a1867687'
+  data.tar.gz: 0fa88f1bf9c68147a24c401cb447a21e16d6c6c89262125cb7796aa41087f51b
 SHA512:
-  metadata.gz: b5b73639f60a15169307c2c52708478211e445298a294d98bc745ee364c2a009e4a320008c58fac46b3408483ef487869b8a77d88f45e91f8d77d3cd140c960e
-  data.tar.gz: feb554583fb6ad8e3ac8c80f148a44fe497295167891f0bac620933848b4f8b36c5d57d5751dca613fcabc427c012913c7699f856d3f46c0467a9eaac2ad4bde
+  metadata.gz: b9d1a6d4f31fb45027d3f1cca7ffc3f1e994178c9781f1dfa9cedc0687e2186cce4b882629e1d635394e07f371c7d4e89d354e762b3e3185f1380d2ab2104155
+  data.tar.gz: 8a12153ae9b69012021889f462d7d233728b43c9aca6bc586f2cfe0d9625770fed24ab967af1591cb396d5dc64f3704d5f1f9cd6b56c5af3dec0cc1ea1db3215

data/babeltrace2.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'babeltrace2'
-  s.version = "0.1.0"
+  s.version = "0.1.3"
   s.author = "Brice Videau"
   s.email = "bvideau@anl.gov"
   s.homepage = "https://github.com/alcf-perfengr/babeltrace2-ruby"

data/lib/babeltrace2/error-reporting.rb

@@ -6,6 +6,16 @@ module Babeltrace2
       :BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS, 1 << 2,
       :BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR, 1 << 3]
 
+  def self.verbose?
+    !!@verbose
+  end
+
+  def self.verbose=(val)
+    @verbose = !!val
+  end
+
+  @verbose = ENV["VERBOSE"]
+
   class BTError < BTObject
   end
 
@@ -347,14 +357,14 @@ module Babeltrace2
       item = ""
       item << c.file_name << ":"
       item << c.line_number.to_s
-      item << (mess.match(/:in /) ? mess : ".")
+      item << (mess.match(/:in /) ? mess : Babeltrace2.verbose? ? " :: " << mess : ".")
       backtrace.push(item)
       cs[1..-1].each { |c|
         item = ""
         item << c.file_name << ":"
         item << c.line_number.to_s
         mess = c.message
-        item << (mess.match(/:in /) ? mess : ".")
+        item << (mess.match(/:in /) ? mess : Babeltrace2.verbose? ? " :: " << mess : ".")
         backtrace.push(item)
       }
       [klass, message, backtrace]
@@ -424,7 +434,7 @@ module Babeltrace2
       e = klass.new(message)
     else
       message = "#{code}" unless message
-      e = Error.new
+      e = Error.new(message)
     end
     e.set_backtrace(backtrace+caller_locations.collect(&:to_s))
     e

data/lib/babeltrace2/graph/graph.rb

@@ -347,13 +347,14 @@ module Babeltrace2
                              logging_level: BTLogging.default_level,
                              initialize_method_data: nil)
       ptr = FFI::MemoryPointer.new(:pointer)
+      bt_params = BTValue.from_value(params)
       res = if initialize_method_data
           Babeltrace2.bt_graph_add_source_component_with_initialize_method_data(
-            @handle, component_class, name, BTValue.from_value(params),
+            @handle, component_class, name, bt_params,
             initialize_method_data, logging_level, ptr)
         else
           Babeltrace2.bt_graph_add_source_component(
-            @handle, component_class, name, BTValue.from_value(params),
+            @handle, component_class, name, bt_params,
             logging_level, ptr)
         end
       raise Babeltrace2.process_error(res) if res != :BT_GRAPH_ADD_COMPONENT_STATUS_OK
@@ -365,13 +366,14 @@ module Babeltrace2
                              logging_level: BTLogging.default_level,
                              initialize_method_data: nil)
       ptr = FFI::MemoryPointer.new(:pointer)
+      bt_params = BTValue.from_value(params)
       res = if initialize_method_data
           Babeltrace2.bt_graph_add_filter_component_with_initialize_method_data(
-            @handle, component_class, name, BTValue.from_value(params),
+            @handle, component_class, name, bt_params,
             initialize_method_data, logging_level, ptr)
         else
           Babeltrace2.bt_graph_add_filter_component(
-            @handle, component_class, name, BTValue.from_value(params),
+            @handle, component_class, name, bt_params,
             logging_level, ptr)
         end
       raise Babeltrace2.process_error(res) if res != :BT_GRAPH_ADD_COMPONENT_STATUS_OK
@@ -383,13 +385,14 @@ module Babeltrace2
                            logging_level: BTLogging.default_level,
                            initialize_method_data: nil)
       ptr = FFI::MemoryPointer.new(:pointer)
+      bt_params = BTValue.from_value(params)
       res = if initialize_method_data
           Babeltrace2.bt_graph_add_sink_component_with_initialize_method_data(
-            @handle, component_class, name, BTValue.from_value(params),
+            @handle, component_class, name, bt_params,
             initialize_method_data, logging_level, ptr)
         else
           Babeltrace2.bt_graph_add_sink_component(
-            @handle, component_class, name, BTValue.from_value(params),
+            @handle, component_class, name, bt_params,
             logging_level, ptr)
         end
       raise Babeltrace2.process_error(res) if res != :BT_GRAPH_ADD_COMPONENT_STATUS_OK

data/lib/babeltrace2/graph/message-iterator-class.rb

@@ -159,7 +159,7 @@ module Babeltrace2
         mess = method.call(BTSelfMessageIterator.new(self_message_iterator,
                              retain: false, auto_release: false),
                            capacity)
-        if mess.size < capacity
+        if mess.size <= capacity
           mess.each { |m| bt_message_get_ref(m.handle) }
           messages.write_array_of_pointer(mess.collect(&:handle))
           count.write_uint64(mess.size)

data/lib/babeltrace2/graph/message-iterator.rb

@@ -190,7 +190,6 @@ module Babeltrace2
       ptr_messages = FFI::MemoryPointer.new(:pointer)
       ptr_count = FFI::MemoryPointer.new(:uint64)
       while ((res = Babeltrace2.bt_message_iterator_next(@handle, ptr_messages, ptr_count)) == :BT_MESSAGE_ITERATOR_NEXT_STATUS_AGAIN)
-        puts "waiting"
         sleep BT_SLEEP_TIME
       end
       case res

data/lib/babeltrace2/graph/query-executor.rb

@@ -87,8 +87,9 @@ module Babeltrace2
       if handle
         super(handle, retain: retain, auto_release: auto_release)
       else
+        bt_params = BTValue.from_value(params)
         handle = Babeltrace2.bt_query_executor_create_with_method_data(
-                   component_class, object_name, BTValue.from_value(params), method_data)
+                   component_class, object_name, bt_params, method_data)
         raise Babeltrace2.process_error if handle.null?
         super(handle)
       end

data/lib/babeltrace2/trace-ir/clock-class.rb

@@ -233,7 +233,8 @@ module Babeltrace2
     alias uuid get_uuid
 
     def set_user_attributes(user_attributes)
-      Babeltrace2.bt_clock_class_set_user_attributes(@handle, BTValue.from_value(user_attributes))
+      bt_user_attributes = BTValue.from_value(user_attributes)
+      Babeltrace2.bt_clock_class_set_user_attributes(@handle, bt_user_attributes)
       self
     end
 
@@ -254,5 +255,33 @@ module Babeltrace2
       raise Babeltrace2.process_error(res) if res != :BT_CLOCK_CLASS_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OK
       ptr.read_int64
     end
+
+    def to_h
+      res = {}
+      res[:name] = name if name
+      res[:description] = description if description
+      res[:frequency] = frequency
+      res[:precision] = precision
+      res[:offset] = offset
+      res[:origin_is_unix_epoch] = origin_is_unix_epoch?
+      res[:uuid] = uuid.to_s if uuid
+      user_attributes_value = user_attributes.value
+      res[:user_attributes] = user_attributes_value if !user_attributes_value.empty?
+      res
+    end
+
+    def self.from_h(self_component, h)
+      o = self_component.create_clock_class
+      o.name = h[:name] if h[:name]
+      o.description = h[:description] if h[:description]
+      o.frequency = h[:frequency] if h[:frequency]
+      o.precision = h[:precision] if h[:precision]
+      o.set_offset(*h[:offset]) if h[:offset]
+      o.origin_is_unix_epoch = h[:origin_is_unix_epoch]
+      o.uuid = BTUUID.from_string(h[:uuid]) if h[:uuid]
+      o.user_attributes = h[:user_attributes] if h[:user_attributes]
+      h[:bt_clock_class] = o
+      o
+    end
   end
 end

data/lib/babeltrace2/trace-ir/event-class.rb

@@ -275,7 +275,8 @@ module Babeltrace2
     alias specific_context_field_class get_specific_context_field_class
 
     def set_user_attributes(user_attributes)
-      Babeltrace2.bt_event_class_set_user_attributes(@handle, BTValue.from_value(user_attributes))
+      bt_user_attributes = BTValue.from_value(user_attributes)
+      Babeltrace2.bt_event_class_set_user_attributes(@handle, bt_user_attributes)
       self
     end
 
@@ -288,5 +289,32 @@ module Babeltrace2
       BTValueMap.new(Babeltrace2.bt_event_class_borrow_user_attributes(@handle), retain: true)
     end
     alias user_attributes get_user_attributes
+
+    def to_h
+      res = { id: id }
+      res[:name] = name if name
+      res[:log_level] = log_level if log_level
+      res[:emf_uri] = emf_uri if emf_uri
+      res[:specific_context_field_class] = specific_context_field_class.to_h if specific_context_field_class
+      res[:payload_field_class] = payload_field_class.to_h if payload_field_class
+      user_attributes_value = user_attributes.value
+      res[:user_attributes] = user_attributes_value if !user_attributes_value.empty?
+      res
+    end
+
+    def self.from_h(trace_class, stream_class, h, stream_class_h)
+      id = stream_class.assigns_automatic_event_class_id? ? nil : h[:id]
+      o = self.new(stream_class: stream_class, id: id)
+      o.name = h[:name] if h[:name]
+      o.log_level = h[:log_level] if h[:log_level]
+      o.emf_uri = h[:emf_uri] if h[:emf_uri]
+      o.specific_context_field_class = BTFieldClass.from_h(trace_class,
+        h[:specific_context_field_class], stream_class_h) if h[:specific_context_field_class]
+      o.payload_field_class = BTFieldClass.from_h(trace_class,
+        h[:payload_field_class], stream_class_h) if h[:payload_field_class]
+      o.user_attributes = h[:user_attributes] if h[:user_attributes]
+      h[:bt_event_class] = o
+      o
+    end
   end
 end

data/lib/babeltrace2/trace-ir/event.rb

@@ -86,6 +86,10 @@ module Babeltrace2
       BTField.from_handle(handle)
     end
     alias common_context_field get_common_context_field
+
+    def name
+      get_class.name
+    end
   end
 
 end

data/lib/babeltrace2/trace-ir/field-class.rb

@@ -159,7 +159,8 @@ module Babeltrace2
     alias type? type_is
 
     def set_user_attributes(user_attributes)
-      Babeltrace2.bt_field_class_set_user_attributes(@handle, BTValue.from_value(user_attributes))
+      bt_user_attributes = BTValue.from_value(user_attributes)
+      Babeltrace2.bt_field_class_set_user_attributes(@handle, bt_user_attributes)
       self
     end
 
@@ -172,6 +173,36 @@ module Babeltrace2
       BTValueMap.new(Babeltrace2.bt_field_class_borrow_user_attributes(@handle), retain: true)
     end
     alias user_attributes get_user_attributes
+
+    def to_h
+      res = { type: class_snake_case_name }
+      user_attributes_value = user_attributes.value
+      res[:user_attributes] = user_attributes_value if !user_attributes_value.empty?
+      res
+    end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      Babeltrace2.const_get(snake_case_to_class(h[:type])).from_h(
+        trace_class, h, stream_class_h)
+    end
+
+    def from_h(h)
+      self.user_attributes = h[:user_attributes] if h[:user_attributes]
+      self
+    end
+
+    private
+
+    def class_snake_case_name
+      str = self.class.name.gsub(/::/, '')
+      str.match(/BTFieldClass(.*)/)[1].
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
+    end
+
+    def self.snake_case_to_class(str)
+      "BTFieldClass" << str.split("_").collect(&:capitalize).join
+    end
   end
 
   attach_function :bt_field_class_bool_create,
@@ -189,6 +220,12 @@ module Babeltrace2
         super(handle, retain: false)
       end
     end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassBool = BTFieldClass::Bool
   BTFieldClass::TYPE_MAP[:BT_FIELD_CLASS_TYPE_BOOL] = [
@@ -219,6 +256,18 @@ module Babeltrace2
       Babeltrace2.bt_field_class_bit_array_get_length(@handle)
     end
     alias length get_length
+
+    def to_h
+      res = super
+      res[:length] = length
+      res
+    end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class, length: h[:length]).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassBitArray = BTFieldClass::BitArray
   BTFieldClass::TYPE_MAP[:BT_FIELD_CLASS_TYPE_BIT_ARRAY] = [
@@ -260,7 +309,7 @@ module Babeltrace2
   class BTFieldClass::Integer < BTFieldClass
 
     def set_field_value_range(n)
-      raise "invalid range" if n < 0 || n > 63
+      raise "invalid range" if n < 0 || n > 64
       Babeltrace2.bt_field_class_integer_set_field_value_range(@handle, n)
       self
     end
@@ -305,6 +354,20 @@ module Babeltrace2
         preferred_display_base
       end
     end
+
+    def to_h
+      res = super
+      res[:field_value_range] = field_value_range
+      res[:preferred_display_base] = preferred_display_base_integer
+      res
+    end
+
+    def from_h(h)
+      super
+      self.field_value_range = h[:field_value_range] if h[:field_value_range]
+      self.preferred_display_base = h[:preferred_display_base] if h[:preferred_display_base]
+      self
+    end
   end
   BTFieldClassInteger = BTFieldClass::Integer
 
@@ -323,6 +386,12 @@ module Babeltrace2
         super(handle, retain: false)
       end
     end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClass::IntegerUnsigned = BTFieldClass::Integer::Unsigned
   BTFieldClassIntegerUnsigned = BTFieldClass::Integer::Unsigned
@@ -345,6 +414,12 @@ module Babeltrace2
         super(handle, retain: false)
       end
     end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClass::IntegerSigned = BTFieldClass::Integer::Signed
   BTFieldClassIntegerSigned = BTFieldClass::Integer::Signed
@@ -371,6 +446,12 @@ module Babeltrace2
         super(handle, retain: false)
       end
     end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClass::RealSinglePrecision = BTFieldClass::Real::SinglePrecision
   BTFieldClassRealSinglePrecision = BTFieldClass::Real::SinglePrecision
@@ -393,6 +474,12 @@ module Babeltrace2
         super(handle, retain: false)
       end
     end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClass::RealDoublePrecision = BTFieldClass::Real::DoublePrecision
   BTFieldClassRealDoublePrecision = BTFieldClass::Real::DoublePrecision
@@ -448,6 +535,25 @@ module Babeltrace2
     end
     alias mapping get_mapping
 
+    def to_h
+      res = super
+      res[:mappings] = get_mapping_count.times.collect { |i|
+        mapping = get_mapping_by_index(i)
+        [mapping.label, mapping.ranges.each.collect { |r| [r.lower, r.upper] }]
+      }.to_h
+      res
+    end
+
+    def from_h(h)
+      super
+      if h[:mappings]
+        h[:mappings].each { |name, ranges|
+          add_mapping(name, ranges)
+        }
+      end
+      self
+    end
+
     class Mapping < BTObject
       def get_label
         label = Babeltrace2.bt_field_class_enumeration_mapping_get_label(@handle)
@@ -511,6 +617,12 @@ module Babeltrace2
       end
     end
 
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
+
     def add_mapping(label, ranges)
       label = label.inspect if label.kind_of?(Symbol)
       ranges = BTIntegerRangeSetUnsigned.from_value(ranges)
@@ -608,6 +720,12 @@ module Babeltrace2
       end
     end
 
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
+
     def add_mapping(label, ranges)
       label = label.inspect if label.kind_of?(Symbol)
       ranges = BTIntegerRangeSetSigned.from_value(ranges)
@@ -672,6 +790,12 @@ module Babeltrace2
         super(handle, retain: false)
       end
     end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassString = BTFieldClass::String
   BTFieldClass::TYPE_MAP[:BT_FIELD_CLASS_TYPE_STRING] = [
@@ -692,6 +816,12 @@ module Babeltrace2
         Babeltrace2.bt_field_class_array_borrow_element_field_class(@handle))
     end
     alias element_field_class get_element_field_class
+
+    def to_h
+      res = super
+      res[:element_field_class] = element_field_class.to_h
+      res
+    end
   end
   BTFieldClassArray = BTFieldClass::Array
 
@@ -721,6 +851,22 @@ module Babeltrace2
     end
     alias length get_length
     alias size get_length
+
+    def to_h
+      res = super
+      res[:length] = length
+      res
+    end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class,
+        element_field_class: BTFieldClass.from_h(trace_class,
+                                                 h[:element_field_class],
+                                                 stream_class_h),
+        length: h[:length]).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassArrayStatic = BTFieldClass::Array::Static
   BTFieldClass::TYPE_MAP[:BT_FIELD_CLASS_TYPE_STATIC_ARRAY] = [
@@ -744,6 +890,12 @@ module Babeltrace2
         BTFieldPath.new(handle, retain: true)
       end
       alias length_field_path get_length_field_path
+
+      def to_h
+        res = super
+        res[:length_field_path] = length_field_path.to_s
+        res
+      end
     end
     def initialize(handle = nil, retain: true, auto_release: true,
                    trace_class: nil, element_field_class: nil, length_field_class: nil)
@@ -759,6 +911,22 @@ module Babeltrace2
         super(handle, retain: false)
       end
     end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      if (stream_class_h && h[:length_field_path])
+        length_field_class = BTStreamClass.locate_field_class( 
+          BTFieldPath.path_from_s_to_h(h[:length_field_path]), stream_class_h)
+      else
+        length_field_class = nil
+      end
+      o = self.new(trace_class: trace_class,
+        element_field_class: BTFieldClass.from_h(trace_class,
+                                                 h[:element_field_class],
+                                                 stream_class_h),
+        length_field_class: length_field_class).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassArrayDynamic = BTFieldClass::Array::Dynamic
   BTFieldClassArrayDynamicWithLengthField = BTFieldClass::Array::Dynamic::WithLengthField
@@ -845,7 +1013,8 @@ module Babeltrace2
       alias field_class get_field_class
 
       def set_user_attributes(user_attributes)
-        Babeltrace2.bt_field_class_structure_member_set_user_attributes(@handle, BTValue.from_value(user_attributes))
+        bt_user_attributes = BTValue.from_value(user_attributes)
+        Babeltrace2.bt_field_class_structure_member_set_user_attributes(@handle, bt_user_attributes)
         self
       end
 
@@ -858,6 +1027,18 @@ module Babeltrace2
         BTValueMap.new(Babeltrace2.bt_field_class_structure_member_borrow_user_attributes(@handle), retain: true)
       end
       alias user_attributes get_user_attributes
+
+      def to_h
+        res = { name: name, field_class: field_class.to_h }
+        user_attributes_value = user_attributes.value
+        res[:user_attributes] = user_attributes_value if !user_attributes_value.empty?
+        res
+      end
+
+      def from_h(h)
+        self.user_attributes = h[:user_attributes] if h[:user_attributes]
+        self
+      end
     end
 
     def initialize(handle = nil, retain: true, auto_release: true,
@@ -911,6 +1092,23 @@ module Babeltrace2
       end
     end
     alias [] get_member
+
+    def to_h
+      res = super
+      res[:members] = member_count.times.collect { |i| get_member_by_index(i).to_h }
+      res
+    end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class).from_h(h)
+      h[:members].each_with_index { |v, i|
+        o.append_member(v[:name],
+          BTFieldClass.from_h(trace_class, v[:field_class], stream_class_h))
+        o.get_member_by_index(i).from_h(v)
+      }
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassStructure = BTFieldClass::Structure
   BTFieldClassStructureMember = BTFieldClass::Structure::Member
@@ -932,6 +1130,12 @@ module Babeltrace2
         Babeltrace2.bt_field_class_option_borrow_field_class(@handle))
     end
     alias field_class get_field_class
+
+    def to_h
+      res = super
+      res[:field_class] = field_class.to_h
+      res
+    end
   end
   BTFieldClassOption = BTFieldClass::Option
 
@@ -951,6 +1155,15 @@ module Babeltrace2
         super(handle, retain: false)
       end
     end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      o = self.new(trace_class: trace_class,
+        optional_field_class: BTFieldClass.from_h(trace_class,
+                                                  h[:field_class],
+                                                  stream_class_h)).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassOptionWithoutSelectorField = BTFieldClass::Option::WithoutSelectorField
   BTFieldClass::TYPE_MAP[:BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD] = [
@@ -968,6 +1181,12 @@ module Babeltrace2
       BTFieldPath.new(handle, retain: true)
     end
     alias selector_field_path get_selector_field_path
+
+    def to_h
+      res = super
+      res[:selector_field_path] = selector_field_path.to_s if selector_field_path
+      res
+    end
   end
   BTFieldClassOptionWithSelectorField = BTFieldClass::Option::WithSelectorField
 
@@ -1014,6 +1233,29 @@ module Babeltrace2
         @handle) != BT_FALSE
     end
     alias selector_is_reversed? selector_is_reversed
+
+    def to_h
+      res = super
+      res[:selector_is_reversed] = selector_is_reversed?
+      res
+    end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      if (stream_class_h && h[:selector_field_path])
+        selector_field_class = BTStreamClass.locate_field_class( 
+          BTFieldPath.path_from_s_to_h(h[:selector_field_path]), stream_class_h)
+      else
+        selector_field_class = nil
+      end
+      o = self.new(trace_class: trace_class,
+        optional_field_class: BTFieldClass.from_h(trace_class,
+                                                  h[:field_class],
+                                                  stream_class_h),
+        selector_field_class: selector_field_class).from_h(h)
+      o.selector_is_reversed = h[:selector_is_reversed] if h[:selector_is_reversed]
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassOptionWithSelectorFieldBool = BTFieldClass::Option::WithSelectorField::Bool
   BTFieldClass::TYPE_MAP[:BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD] = [
@@ -1051,6 +1293,29 @@ module Babeltrace2
           @handle), retain: true)
     end
     alias selector_ranges get_selector_ranges
+
+    def to_h
+      res = super
+      res[:selector_ranges] = selector_ranges.each.collect { |r| [r.lower, r.upper] }
+      res
+    end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      if (stream_class_h && h[:selector_field_path])
+        selector_field_class = BTStreamClass.locate_field_class( 
+          BTFieldPath.path_from_s_to_h(h[:selector_field_path]), stream_class_h)
+      else
+        selector_field_class = nil
+      end
+      o = self.new(trace_class: trace_class,
+        optional_field_class: BTFieldClass.from_h(trace_class,
+                                                  h[:field_class],
+                                                  stream_class_h),
+        selector_field_class: selector_field_class,
+        ranges: h[:selector_ranges]).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassOptionWithSelectorFieldIntegerUnsigned = BTFieldClass::Option::WithSelectorField::IntegerUnsigned
   BTFieldClass::TYPE_MAP[:BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD] = [
@@ -1088,6 +1353,29 @@ module Babeltrace2
           @handle), retain: true)
     end
     alias selector_ranges get_selector_ranges
+
+    def to_h
+      res = super
+      res[:selector_ranges] = selector_ranges.each.collect { |r| [r.lower, r.upper] }
+      res
+    end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      if (stream_class_h && h[:selector_field_path])
+        selector_field_class = BTStreamClass.locate_field_class( 
+          BTFieldPath.path_from_s_to_h(h[:selector_field_path]), stream_class_h)
+      else
+        selector_field_class = nil
+      end
+      o = self.new(trace_class: trace_class,
+        optional_field_class: BTFieldClass.from_h(trace_class,
+                                                  h[:field_class],
+                                                  stream_class_h),
+        selector_field_class: selector_field_class,
+        ranges: h[:selector_ranges]).from_h(h)
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassOptionWithSelectorFieldIntegerSigned = BTFieldClass::Option::WithSelectorField::IntegerSigned
   BTFieldClass::TYPE_MAP[:BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD] = [
@@ -1158,8 +1446,8 @@ module Babeltrace2
       alias field_class get_field_class
 
       def set_user_attributes(user_attributes)
-        Babeltrace2.bt_field_class_variant_option_set_user_attributes(@handle,
-          BTValue.from_value(user_attributes))
+        bt_user_attributes = BTValue.from_value(user_attributes)
+        Babeltrace2.bt_field_class_variant_option_set_user_attributes(@handle, bt_user_attributes)
         self
       end
 
@@ -1174,6 +1462,13 @@ module Babeltrace2
             @handle), retain: true)
       end
       alias user_attributes get_user_attributes
+
+      def to_h
+        res = { name: name, field_class: field_class.to_h }
+        user_attributes_value = user_attributes.value
+        res[:user_attributes] = user_attributes_value if !user_attributes_value.empty?
+        res
+      end
     end
   end
   BTFieldClassVariantOption = BTFieldClass::Variant::Option
@@ -1259,6 +1554,13 @@ module Babeltrace2
         BTFieldPath.new(handle, retain: true)
       end
       alias selector_field_path get_selector_field_path
+
+      def to_h
+        res = super
+        res[:selector_field_path] = selector_field_path.to_s
+        res
+      end
+
       module IntegerUnsigned
         class Option < BTFieldClassVariantOption
          def get_ranges
@@ -1267,6 +1569,12 @@ module Babeltrace2
                 @handle), retain: true)
          end
          alias ranges get_ranges
+
+         def to_h
+           res = super
+           res[:ranges] = ranges.each.collect { |r| [r.lower, r.upper] }
+           res
+         end
         end
         include WithSelectorField
         def append_option(name, option_field_class, ranges)
@@ -1303,6 +1611,12 @@ module Babeltrace2
                 @handle), retain: true)
          end
          alias ranges get_ranges
+
+         def to_h
+           res = super
+           res[:ranges] = ranges.each.collect { |r| [r.lower, r.upper] }
+           res
+         end
         end
         include WithSelectorField
         def append_option(name, option_field_class, ranges)
@@ -1395,6 +1709,36 @@ module Babeltrace2
     end
     alias [] get_option
 
+    def to_h
+      res = super
+      res[:options] = option_count.times.collect { |i|
+        get_option_by_index(i).to_h
+      }
+      res
+    end
+
+    def self.from_h(trace_class, h, stream_class_h = nil)
+      if (stream_class_h && h[:selector_field_path])
+        selector_field_class = BTStreamClass.locate_field_class( 
+          BTFieldPath.path_from_s_to_h(h[:selector_field_path]), stream_class_h)
+      else
+        selector_field_class = nil
+      end
+      o = self.new(trace_class: trace_class,
+        selector_field_class: selector_field_class).from_h(h)
+      if selector_field_class
+        h[:options].each { |v|
+          o.append_option(v[:name],
+            BTFieldClass.from_h(trace_class, v[:field_class], stream_class_h),
+            v[:ranges]) }
+      else
+        h[:options].each { |v|
+          o.append_option(v[:name],
+            BTFieldClass.from_h(trace_class, v[:field_class], stream_class_h)) }
+      end
+      h[:bt_field_class] = o
+      o
+    end
   end
   BTFieldClassVariantWithoutSelectorField =
     BTFieldClass::Variant::WithoutSelectorField

data/lib/babeltrace2/trace-ir/field-path.rb

@@ -85,6 +85,30 @@ module Babeltrace2
       }
       path
     end
+
+    def self.path_from_s_to_h(str)
+      str_orig = str
+      m = str.match(/\A(PACKET_CONTEXT|EVENT_COMMON_CONTEXT|EVENT_SPECIFIC_CONTEXT|EVENT_PAYLOAD)/)
+      raise "invalid path #{str}" if !m
+      path = [(m[1].downcase << "_field_class").to_sym]
+      str = str.sub(m[1], "")
+      while !str.empty?
+        case str
+        when /\A\[(\d+)\]/
+          path.push :members, $1.to_i, :field_class
+          str = str.sub("[#{$1}]", "")
+        when /\A->/
+          path.push :element_field_class
+          str = str.sub("->", "")
+        when /\A=>/
+          path.push :field_class
+          str = str.sub("=>", "")
+        else
+          raise "invalid path #{str_orig}"
+        end
+      end
+      path
+    end
   end
 
   BT_FIELD_PATH_ITEM_TYPE_INDEX = 1 << 0

data/lib/babeltrace2/trace-ir/field.rb

@@ -421,7 +421,7 @@ module Babeltrace2
                   :bt_field_string_append_status
 
   attach_function :bt_field_string_append_with_length,
-                  [ :bt_field_string_handle, :string, :uint64 ],
+                  [ :bt_field_string_handle, :pointer, :uint64 ],
                   :bt_field_string_append_status
 
   attach_function :bt_field_string_clear,
@@ -460,7 +460,9 @@ module Babeltrace2
 
     def append(value, length: nil)
       res = if length
-          Babeltrace2.bt_field_string_append_with_length(@handle, value, length)
+          ptr = FFI::MemoryPointer.new(length)
+          ptr.write_bytes(value, 0, length)
+          Babeltrace2.bt_field_string_append_with_length(@handle, ptr, length)
         else
           Babeltrace2.bt_field_string_append(@handle, value)
         end
@@ -521,12 +523,25 @@ module Babeltrace2
     end
 
     def value
-      each.collect { |e| e.value }
+      each.collect(&:value)
+    end
+
+    def set_value(values)
+      raise "invalid value size" if values.size != length 
+      values.each_with_index { |e, i|
+        get_element_field_by_index(i).set_value(e)
+      }
+      self
+    end
+
+    def value=(values)
+      set_value(values)
+      values
     end
 
     def to_s
       s = "["
-      s << each.collect { |e| e.to_s }.join(", ")
+      s << each.collect(&:to_s).join(", ")
       s << "]"
     end
   end
@@ -634,6 +649,11 @@ module Babeltrace2
     end
     alias [] get_member_field
 
+    def []=(member_field, value)
+      get_member_field(member_field).set_value(value)
+      value
+    end
+
     def each
       if block_given?
         get_member_count.times { |i|
@@ -653,6 +673,11 @@ module Babeltrace2
       v
     end
 
+    def field_names
+      klass = get_class
+      get_member_count.times.collect { |i| klass.get_member_by_index(i).name }
+    end
+
     def to_s
       s = "{"
       klass = get_class

data/lib/babeltrace2/trace-ir/stream-class.rb

@@ -400,7 +400,8 @@ module Babeltrace2
     alias discarded_packets_have_default_clock_snapshots? discarded_packets_have_default_clock_snapshots
 
     def set_user_attributes(user_attributes)
-      Babeltrace2.bt_stream_class_set_user_attributes(@handle, BTValue.from_value(user_attributes))
+      bt_user_attributes = BTValue.from_value(user_attributes)
+      Babeltrace2.bt_stream_class_set_user_attributes(@handle, bt_user_attributes)
       self
     end
 
@@ -414,6 +415,87 @@ module Babeltrace2
     end
     alias user_attributes get_user_attributes
 
+    def to_h
+      res = {
+        id: id,
+        supports_packets: supports_packets? }
+      if supports_packets?
+        res[:packets_have_beginning_default_clock_snapshot] =
+          packets_have_beginning_default_clock_snapshot?
+        res[:packets_have_end_default_clock_snapshot] =
+          packets_have_end_default_clock_snapshot?
+      end
+      res[:supports_discarded_events] = supports_discarded_events?
+      res[:discarded_events_have_default_clock_snapshots] =
+        discarded_events_have_default_clock_snapshots? if supports_discarded_events?
+      if supports_packets?
+        res[:supports_discarded_packets] = supports_discarded_packets?
+        if supports_discarded_packets?
+          res[:discarded_packets_have_default_clock_snapshots] = discarded_packets_have_default_clock_snapshots?
+        end
+      end
+      if default_clock_class
+        res[:default_clock_class] = default_clock_class.to_h
+      end
+      if supports_packets? && packet_context_field_class
+        res[:packet_context_field_class] = packet_context_field_class.to_h
+      end
+      if event_common_context_field_class
+        res[:event_common_context_field_class] = event_common_context_field_class.to_h
+      end
+      res[:assigns_automatic_event_class_id] = assigns_automatic_event_class_id?
+      res[:assigns_automatic_stream_id] = assigns_automatic_stream_id?
+      res[:event_classes] = event_class_count.times.collect { |i|
+        get_event_class_by_index(i).to_h
+      }
+      user_attributes_value = user_attributes.value
+      res[:user_attributes] = user_attributes_value if !user_attributes_value.empty?
+      res
+    end
+
+    def self.from_h(self_component, trace_class, h)
+      id = trace_class.assigns_automatic_stream_class_id? ? nil : h[:id]
+      o = trace_class.create_stream_class(id: id)
+      o.default_clock_class = BTClockClass.from_h(self_component,
+        h[:default_clock_class]) if h[:default_clock_class]
+      o.set_supports_packets( h[:supports_packets],
+        with_beginning_default_clock_snapshot:
+          h[:packets_have_beginning_default_clock_snapshot],
+        with_end_default_clock_snapshot:
+          h[:packets_have_end_default_clock_snapshot])
+      o.set_supports_discarded_events(h[:supports_discarded_events],
+        with_default_clock_snapshots:
+          h[:discarded_events_have_default_clock_snapshots])
+      o.set_supports_discarded_packets(h[:supports_discarded_packets],
+        with_default_clock_snapshots:
+          h[:discarded_packets_have_default_clock_snapshots]) if h[:supports_packets]
+      o.packet_context_field_class = BTFieldClass.from_h(trace_class,
+        h[:packet_context_field_class], h) if h[:packet_context_field_class]
+      o.event_common_context_field_class = BTFieldClass.from_h(trace_class,
+        h[:event_common_context_field_class], h) if h[:event_common_context_field_class]
+      o.assigns_automatic_event_class_id = h[:assigns_automatic_event_class_id] unless h[:assigns_automatic_event_class_id].nil?
+      o.assigns_automatic_stream_id = h[:assigns_automatic_stream_id] unless h[:assigns_automatic_stream_id].nil?
+      h[:event_classes].each_with_index { |v, i|
+        h[:bt_current_event] = i;
+        BTEventClass.from_h(trace_class, o, v, h)
+      }
+      h.delete(:bt_current_event)
+      o.user_attributes = h[:user_attributes] if h[:user_attributes]
+      h[:bt_stream_class] = o
+      o
+    end
+
+    def self.locate_field_class(path, h)
+      case path[0]
+      when :event_payload_field_class
+        h[:event_classes][h[:bt_current_event]][:payload_field_class].dig(*path[1..-1])[:bt_field_class]
+      when :event_specific_context_field_class
+        h[:event_classes][h[:bt_current_event]][:specific_context_field_class].dig(*path[1..-1])[:bt_field_class]
+      else
+        h.dig(*path)[:bt_field_class]
+      end
+    end
+
     def create_stream(trace, id: nil)
       BTStream.new(stream_class: @handle, trace: trace, id: nil)
     end

data/lib/babeltrace2/trace-ir/stream.rb

@@ -116,7 +116,8 @@ module Babeltrace2
     alias name get_name
 
     def set_user_attributes(user_attributes)
-      Babeltrace2.bt_stream_set_user_attributes(@handle, BTValue.from_value(user_attributes))
+      bt_user_attributes = BTValue.from_value(user_attributes)
+      Babeltrace2.bt_stream_set_user_attributes(@handle, bt_user_attributes)
       self
     end
 

data/lib/babeltrace2/trace-ir/trace-class.rb

@@ -146,7 +146,8 @@ module Babeltrace2
     alias assigns_automatic_stream_class_id? assigns_automatic_stream_class_id
 
     def set_user_attributes(user_attributes)
-      Babeltrace2.bt_trace_class_set_user_attributes(@handle, BTValue.from_value(user_attributes))
+      bt_user_attributes = BTValue.from_value(user_attributes)
+      Babeltrace2.bt_trace_class_set_user_attributes(@handle, bt_user_attributes)
       self
     end
 
@@ -339,5 +340,24 @@ module Babeltrace2
     end
     alias create_variant_class create_field_class_variant
     alias create_variant create_field_class_variant
+
+    def to_h
+      res = {
+        assigns_automatic_stream_class_id: assigns_automatic_stream_class_id?,
+        stream_classes: stream_class_count.times.collect { |i| get_stream_class_by_index(i).to_h } }
+      user_attributes_value = user_attributes.value
+      res[:user_attributes] = user_attributes_value if !user_attributes_value.empty?
+      res
+    end
+
+    def self.from_h(self_component, h)
+      o = self_component.create_trace_class
+      o.assigns_automatic_stream_class_id = h[:assigns_automatic_stream_class_id] unless h[:assigns_automatic_stream_class_id].nil?
+      h[:stream_classes].each { |v| BTStreamClass.from_h(self_component, o, v) }
+      o.user_attributes = h[:user_attributes] if h[:user_attributes]
+      h[:bt_trace_class] = o
+      o
+    end
+
   end
 end

data/lib/babeltrace2/trace-ir/trace.rb

@@ -281,7 +281,8 @@ module Babeltrace2
     end
 
     def set_user_attributes(user_attributes)
-      Babeltrace2.bt_trace_set_user_attributes(@handle, BTValue.from_value(user_attributes))
+      bt_user_attributes = BTValue.from_value(user_attributes)
+      Babeltrace2.bt_trace_set_user_attributes(@handle, bt_user_attributes)
       self
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babeltrace2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Ruby Babeltrace 2 bindings