metababel 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1d7b3860274d4b24281ea23457f20ec61b0908faa6c876456188f54ca45c4ab
-  data.tar.gz: bcc0e1388f58fca090fac605d6c005df948692a7a8cdd98f9f29b8fb6f52f30a
+  metadata.gz: 6fef536b3f7091c580764b9e74b5a33cdfa268231fba8678a6097f71038b83ec
+  data.tar.gz: f715e0f2921b5542f0069e7b1a43624699d6381418a5052bface9c657d601f2d
 SHA512:
-  metadata.gz: d2d84b4f7f26d135da71393c9119b2d324d5e38224e5ed5f6015e8dab27c7097a5539edd5e29e8b7e2ccf8d0f0b8b0bfb1bf7044e5346e01e0e0481cf619099e
-  data.tar.gz: f935dc50f8163fe849d0dd27734e0cfaa8364ae2add5a61ec833e9c7ac211dabc87b9bcaef4d7f98c558d1a54756f0341af224167fd5f4f3eb9f0b65cf2d7658
+  metadata.gz: 1a802b99efa22f8e34def1c7ec1610fc0a3e25897f14f48faa80156a3af32e5696e297a2d95b6053f05e6b0015814aa067332d01af1623bbb5461d9e608e609e
+  data.tar.gz: 85206279e0e3b4971721c04b40bf484a23d103bb062f2e4ae3983b8a498673ab0ad34f304a6defe0943b7b8996fe40b9cc160840ffc139e44209185512230284

data/bin/metababel

@@ -125,18 +125,17 @@ class Dispatcher < BaseDispatch
     end
   end
 
-  # We preprent an empty new line from the body as a hack, to correct the indentation
-  # Indeeed the <%= body %> will be indented, but we don't don't want it,
-  # in the body string is already indented
-  # But we clean the white space empty line afterward \o/
+  # Prepend a newline to align the rendered body correctly.
+  # Without this, ERB adds unwanted indentation to <%= body %>.
+  # Since body_args[1] is already indented, we avoid double-indentation.
+  # The extra leading blank line is removed later.
   def body
     "\n" + body_args[1]
   end
 
   def args
-    evt_args = []
-    evt_args += [GeneratedArg.new('int64_t', '_timestamp')] if @default_clock_class
-    evt_args += body_args[0].fetch('outputs', [])
+    timestamp = @default_clock_class ? [GeneratedArg.new('int64_t', '_timestamp')] : []
+    timestamp + body_args[0].fetch('outputs', [])
   end
 
   def args_to_free
@@ -191,16 +190,15 @@ def parse_argv
   parser.on('-o', '--output FOLDER', '[Optional] Output folder path.')
   parser.on('-i', '--usr-data-header NAME', '[Optional] User datatypes definitions.')
   parser.on('--enable-callbacks NAME', Array, '[Optional] Enable some callbacks type')
-  parser.on('--display-shared-callback PLUGIN') { |plugin|
+  parser.on('--display-shared-callback PLUGIN') do |plugin|
     path = Dir["#{__dir__}/../shared/*#{plugin}*"].first
     puts File.readlines(path)
     exit
-  }
-  parser.on('--drop','[Optional] Drop unknow messages')
+  end
+  parser.on('--drop', '[Optional] Drop unknow messages')
 
   options = { 'disable-callbaks': ['on_downstream'].to_set,
-              'component-name': 'btx',
-            }
+              'component-name': 'btx' }
   parser.parse!(into: options)
   raise OptionParser::MissingArgument if options[:'component-type'].nil?
 

data/lib/metababel/bt2_trace_class_generator.rb

@@ -249,7 +249,6 @@ module Babeltrace2Gen
 
     def initialize(parent:, name: nil, specific_context_field_class: nil, payload_field_class: nil, id: nil,
                    set_id: nil, domain: nil, register: true)
-
       @set_id = set_id
       @domain = domain
       @register = register
@@ -365,6 +364,7 @@ module Babeltrace2Gen
     include BTLocator
     include BTPrinter
     include BTMatch
+
     using HashRefinements
 
     BT_MATCH_ATTRS = %i[type cast_type cast_type_is_struct]
@@ -470,6 +470,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::BitArray < BTFieldClass
     extend BTFromH
+
     attr_reader :length
 
     @bt_type = 'uint64_t'
@@ -597,6 +598,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Enumeration::Unsigned < BTFieldClass::Integer::Unsigned
     include BTFieldClass::Enumeration
+
     class BTFieldClass::Enumeration::Unsigned::Mapping < BTFieldClass::Enumeration::Mapping
       @bt_type_internal = 'unsigned'
     end
@@ -608,6 +610,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Enumeration::Signed < BTFieldClass::Integer::Signed
     include BTFieldClass::Enumeration
+
     class BTFieldClass::Enumeration::Signed::Mapping < BTFieldClass::Enumeration::Mapping
       @bt_type_internal = 'signed'
     end
@@ -629,7 +632,7 @@ module Babeltrace2Gen
     end
 
     def get_getter(field:, arg_variables:)
-      return super(field: field, arg_variables: arg_variables) unless @cast_type_is_struct
+      return super unless @cast_type_is_struct
 
       bt_func_get = self.class.instance_variable_get(:@bt_func) % 'get'
       variable = bt_get_variable(arg_variables).name
@@ -639,7 +642,7 @@ module Babeltrace2Gen
     end
 
     def get_setter(field:, arg_variables:)
-      return super(field: field, arg_variables: arg_variables) unless @cast_type_is_struct
+      return super unless @cast_type_is_struct
 
       variable = bt_get_variable(arg_variables).name
 
@@ -667,6 +670,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Array::Static < BTFieldClass::Array
     extend BTFromH
+
     using HashRefinements
     attr_reader :length
 
@@ -712,6 +716,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Array::Dynamic < BTFieldClass::Array
     extend BTFromH
+
     module WithLengthField
       attr_reader :length_field_path
     end
@@ -722,6 +727,7 @@ module Babeltrace2Gen
       return unless length_field_path
 
       extend(WithLengthField)
+
       @length_field_path = length_field_path
     end
 
@@ -792,7 +798,7 @@ module Babeltrace2Gen
 
     attr_reader :parent, :name, :field_class
 
-    def initialize(parent:, field_class: nil, name: nil)
+    def initialize(parent:, field_class: nil, name: nil, metadata: nil)
       @parent = parent
       is_match_model = parent.rec_trace_class.match
       raise ArgumentError, 'missing keyword: :name' unless name || is_match_model
@@ -891,6 +897,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Option::WithSelectorField::Bool < BTFieldClass::Option::WithSelectorField
     extend BTFromH
+
     attr_reader :selector_is_reversed
 
     def initialize(parent:, field_class:, selector_field_path:, selector_is_reversed: nil)
@@ -901,6 +908,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Option::WithSelectorField::IntegerUnsigned < BTFieldClass::Option::WithSelectorField
     extend BTFromH
+
     attr_reader :selector_ranges
 
     def initialize(parent:, field_class:, selector_field_path:, selector_ranges:)
@@ -911,6 +919,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Option::WithSelectorField::IntegerSigned < BTFieldClass::Option::WithSelectorField
     extend BTFromH
+
     attr_reader :selector_ranges
 
     def initialize(parent:, field_class:, selector_field_path:, selector_ranges:)
@@ -921,6 +930,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Variant < BTFieldClass
     extend BTFromH
+
     attr_reader :options
 
     class Option
@@ -953,6 +963,7 @@ module Babeltrace2Gen
       @parent = parent
       if selector_field_class
         extend(WithSelectorField)
+
         @selector_field_class = selector_field_class
         @options = options.collect do |o|
           BTFieldClass::Variant::WithSelectorField::Option.new(name: o[:name], field_class: o[:field_class],
@@ -960,6 +971,7 @@ module Babeltrace2Gen
         end
       else
         extend(WithoutSelectorField)
+
         @options = options.collect do |o|
           BTFieldClass::Variant::Option.new(name: o[:name], field_class: o[:field_class])
         end
@@ -972,6 +984,7 @@ module Babeltrace2Gen
     include BTLocator
     include BTMatchMembers
     extend BTFromH
+
     attr_reader :parent, :entries
 
     BT_MATCH_ATTRS = [:entries]
@@ -993,6 +1006,7 @@ module Babeltrace2Gen
   class BTEntryClass
     include BTPrinter
     include BTMatch
+
     using HashRefinements
 
     BT_MATCH_ATTRS = %i[name type]
@@ -1012,6 +1026,7 @@ module Babeltrace2Gen
       raise "No type in #{model}" unless type || is_match_model
 
       h = { 'string' => BTEntryClass::String,
+            'integer_unsigned' => BTEntryClass::IntegerUnsigned,
             'integer_signed' => BTEntryClass::IntegerSigned }.freeze
 
       raise "Type #{type} not supported" unless h.include?(type) || is_match_model
@@ -1055,4 +1070,12 @@ module Babeltrace2Gen
     # Sadly it's ` bt_trace_set_environment_entry_integer() ` and not ` bt_trace_set_environment_entry_integer_signed()`
     @bt_type_set = 'integer'
   end
+
+  class BTEntryClass::IntegerUnsigned < BTEntryClass
+    extend BTFromH
+
+    @bt_type = 'uint64_t'
+    # Sadly it's ` bt_trace_set_environment_entry_integer() ` and not ` bt_trace_set_environment_entry_integer_unsigned()`
+    @bt_type_set = 'integer'
+  end
 end

data/lib/metababel/bt2_values_generator.rb

@@ -11,7 +11,8 @@ module Babeltrace2Gen
       h = { 'map' => BTValueCLass::Map,
             'string' => BTValueCLass::String,
             'bool' => BTValueCLass::Bool,
-            'integer_unsigned' => BTValueCLass::IntegerUnsigned }.freeze
+            'integer_unsigned' => BTValueCLass::IntegerUnsigned,
+            'integer_signed' => BTValueCLass::IntegerSigned }.freeze
       raise "Type #{key} not supported" unless h.include?(key)
 
       cast_type = model.delete(:cast_type)
@@ -45,10 +46,12 @@ module Babeltrace2Gen
       default_value = @usr_default_value || bt_default_value
 
       pr "if (#{val} != NULL) {"
-      pr "  if (!#{bt_type_is}(#{val})) {"
-      pr "    fprintf(stderr,\"Bad value for command line argument '%s' the value must be '%s'. \\n\",\"#{@name}\",\"#{bt_type}\");"
-      pr '    exit(1);'
-      pr '  }'
+      if bt_type_is
+        pr "  if (#{bt_type_is}(#{val}) != BT_TRUE) {"
+        pr "    fprintf(stderr,\"Bad value for command line argument '%s' the value must be '%s'. \\n\",\"#{@name}\",\"#{bt_type}\");"
+        pr '    exit(1);'
+        pr '  }'
+      end
       pr "  #{name} = #{cast_func}bt_value_#{bt_type}_get(#{val});"
       pr '} else {'
       pr "  #{name} = #{cast_func}#{default_value};"
@@ -96,7 +99,7 @@ module Babeltrace2Gen
         raise "Bad default_value for '#{name}' in params.yaml, it must be #{bt_type} (BT_TRUE or BT_FALSE) but provided '#{usr_default_value}'."
       end
 
-      super(name, usr_default_value)
+      super
     end
   end
 
@@ -119,17 +122,35 @@ module Babeltrace2Gen
 
   class BTValueCLass::IntegerUnsigned < BTValueCLass::Scalar
     @bt_type = 'integer_unsigned'
-    @bt_type_is = 'bt_value_is_signed_integer'
+    @bt_type_is = nil # 'bt_value_is_unsigned_integer'. Workarround `isIntegerUnsigned` broken
     @bt_return_type = 'uint64_t'
     @bt_default_value = '0'
 
     def initialize(name, usr_default_value)
       bt_type = self.class.instance_variable_get(:@bt_type)
-      if !usr_default_value.nil? && (!usr_default_value.is_a?(Integer) || !usr_default_value.between?(0, (2**64) - 1))
-        raise "Bad default_value for '#{name}' in params.yaml, it must be #{bt_type} and must be in [0,2^64-1], but provided '#{usr_default_value}'."
+      if !usr_default_value.nil? && (!usr_default_value.is_a?(Integer) || !usr_default_value.between?(0,
+                                                                                                      (2**64) - 1))
+        raise "Bad default_value for '#{name}' in params.yaml, it must be #{bt_type} and must be in [0, 2**64 - 1], but provided '#{usr_default_value}'."
+      end
+
+      super
+    end
+  end
+
+  class BTValueCLass::IntegerSigned < BTValueCLass::Scalar
+    @bt_type = 'integer_signed'
+    @bt_type_is = 'bt_value_is_signed_integer'
+    @bt_return_type = 'int64_t'
+    @bt_default_value = '0'
+
+    def initialize(name, usr_default_value)
+      bt_type = self.class.instance_variable_get(:@bt_type)
+      if !usr_default_value.nil? && (!usr_default_value.is_a?(Integer) || !usr_default_value.between?(-2**63,
+                                                                                                      (2**63) - 1))
+        raise "Bad default_value for '#{name}' in params.yaml, it must be #{bt_type} and must be in [-2**63, 2**63 - 1], but provided '#{usr_default_value}'."
       end
 
-      super(name, usr_default_value)
+      super
     end
   end
 end

data/lib/metababel/version.rb

@@ -1,3 +1,3 @@
 module Metababel
-  VERSION = '1.1.2'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metababel
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Thomas Applencourt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -53,7 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="