metababel 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8622843bd93dc9b0e2ed91f3ad7bb444ea2216ba183651d17773de232749a187
-  data.tar.gz: 762a87b56229cee6bebe99ebb5358610672a6fb2a171718c3255ad079391ba85
+  metadata.gz: 29d62dad7a8e18caa6eae836db0caf7b0e7dd5012c6d83492e51140d9c4ab110
+  data.tar.gz: 9781c211009fbb238c4a96b3faf0341607da2b202155179f58aa545d75f45809
 SHA512:
-  metadata.gz: 0fbe1685dafbc6d45e03a494607efa1010cde5973167f394150322b36d784eb23305664b8adea0ef12d90c0552a61d726cb1fce83620211f8827c1e4101f0ee0
-  data.tar.gz: cb578b9f45359fd1a93d219761f41ecdb0e0670150be69c731f4d5c1c2695e3ade918e2b5e825701cff380dcaaad6f76c09638628664f3d879f009191e9f9b58
+  metadata.gz: d0fef46f9f4461770e2b1994e087788a53dfe3b198d8a529e9e0486320a788f6eac20b4230605f612dbd7cdcbc69746b93e9605f06086353f78a70f6da5774f0
+  data.tar.gz: '0791014239ed111d63148bdb45c2a8d48f45ad0e51a2440fc9171e2220465add097e1f7a4340fef82aca2f4f2b303e1083803ab9d76a6252cfbf9795fc72dfbe'

data/bin/metababel

@@ -7,6 +7,7 @@ require 'metababel'
 require 'fileutils'
 require 'set'
 require 'ostruct'
+require 'abbrev'
 
 class Array
   def join_with_prefix(sep)
@@ -54,14 +55,18 @@ class BaseDispatch
 
   # https://ruby-doc.org/3.2.2/Hash.html#class-Hash-label-User-Defined+Hash+Keys
   def ==(other)
-    self.class === other and
+    other.is_a?(self.class) and
       instance_variables.all? { |s| instance_variable_get(s) == other.instance_variable_get(s) }
   end
 
   alias eql? ==
 
   def hash
-    instance_variables.reduce(0) { |a, b| a ^ instance_variable_get(b).hash }
+    # Remove cycle in dependency, and memos
+    blacklist = %i[@dispatch_types @matched_dispatchers @body_args]
+    instance_variables.filter_map do |i|
+      instance_variable_get(i).hash unless blacklist.include?(i)
+    end.reduce(:^)
   end
 end
 
@@ -101,8 +106,8 @@ class Dispatcher < BaseDispatch
     @index_stream_class = index_stream_class
     @index_event_class = index_event_class
     @default_clock_class = default_clock_class
-    @dispatch_types = []
     @name = event.name
+    @dispatch_types = []
   end
 
   def body_args
@@ -173,8 +178,13 @@ def parse_argv
       exit
     end
 
-    opts.on('-t', '--component TYPE', '[Mandatory] Node within a trace processing graph.') do |p|
-      options[:component_type] = p
+    opts.on('-t', '--component TYPE',
+            '[Mandatory] Node within a trace processing graph [one of: SINK, SOURCE, FILTER].') do |p|
+      l = %w[SOURCE FILTER SINK]
+      h = Abbrev.abbrev(l)
+      raise "Invalid component type, should be #{l} (case insentitive)" unless h.include?(p.upcase)
+
+      options[:component_type] = h[p.upcase]
     end
 
     opts.on('-u', '--upstreams PATH', Array, '[Mandatory] Path to the bt2 YAML files for the upstream model.') do |p|
@@ -212,7 +222,6 @@ def parse_argv
     opts.on('--enable-callbacks NAME', Array, '[Optional] Enable some callbacks type') do |p|
       options[:disable_callbaks] -= p.to_set
     end
-
   end.parse!
 
   raise OptionParser::MissingArgument if options[:component_type].nil?
@@ -224,7 +233,12 @@ def parse_argv
 end
 
 def get_dispatch_type(em, default_clock_class, context)
-  dispatchers = em.domain ? OpenStruct.new(context).instance_eval(em.domain) : context['all']
+  begin
+    dispatchers = em.domain ? OpenStruct.new(context).instance_eval(em.domain) : context['all']
+  rescue StandardError
+    raise "Please ensure the domain '#{em.domain}' uses valid ruby expressions and all set_id have been previously defined. Current defined set_ids: #{context.keys}."
+  end
+  raise 'Metababel Hash Set problem' unless (dispatchers - dispatchers).empty?
   raise "Nil or empty event set for '#{em.set_id}'." unless dispatchers.is_a?(Set)
 
   matched_dispatchers, signatures = dispatchers.filter_map do |dispatcher|
@@ -239,19 +253,20 @@ def get_dispatch_type(em, default_clock_class, context)
   # Verify the uniqueness of signatures.
   # Note that `s.type` takes into account the `cast_type`
   #   (see TestMatchingConflictingSignatures for more details)
-  unique_signatures = signatures.uniq
+  unique_signatures = signatures.map { |s| "(#{s.map(&:type).join(', ')})" }.uniq
   unless unique_signatures.size == 1
-    signatures_str = unique_signatures.map { |s| "(#{s.map(&:type).join(', ')})" }.join(', ')
+    signatures_str = unique_signatures.join(', ')
     raise "Conflicting signatures for '#{em.set_id}', found #{unique_signatures.size} signatures, only one allowed: '#{signatures_str}'"
   end
 
   # Modify the dispatcher to add the new dispatchType
-  name = em.set_id
-  dispatch_type_args = []
-  dispatch_type_args += [GeneratedArg.new('int64_t', '_timestamp')] if default_clock_class
-  dispatch_type_args += [GeneratedArg.new('const char *', '_event_class_name')]
-  dispatch_type_args += signatures.pop
+  timestamp = default_clock_class ? [GeneratedArg.new('int64_t', '_timestamp')] : []
+  event_class_name = [GeneratedArg.new('const char *', '_event_class_name')]
+  dispatch_type_args = matched_dispatchers.zip(signatures).map do |m, s|
+    [m.name, timestamp + event_class_name + s]
+  end.to_h
 
+  name = em.set_id
   dispatch_type = DispatchType.new(
     name, dispatch_type_args, "matching_#{sanitize(name)}", matched_dispatchers
   )
@@ -342,7 +357,7 @@ class ContextBuilder
 
   def callback_types
     @callback_types ||= begin
-      callback_types = ['generic']
+      callback_types = ['automatic']
       if @cli_options.key?(:matching)
         event_classes = trace_matcher.stream_classes.map(&:event_classes).flatten(1).filter do |em|
           raise "Key ':set_id' required for matching events." unless em.set_id
@@ -415,7 +430,7 @@ class ContextBuilder
       dispatchers, automatic_dispatch_types = t.filter_map_event_classes_with_index do |e, index_stream_class, index_event_class, default_clock_class|
         dispatcher =  Dispatcher.new(e, event_name, 'getter', index_stream_class, index_event_class,
                                      default_clock_class)
-        dispatch_type = DispatchType.new(e.name, dispatcher.args, 'generic', [dispatcher])
+        dispatch_type = DispatchType.new(e.name, { e.name => dispatcher.args }, 'automatic', [dispatcher])
         dispatcher.dispatch_types << dispatch_type
 
         [dispatcher, dispatch_type]
@@ -447,7 +462,7 @@ end
 
 def wrote_upstream(cb)
   erb_render_and_save(cb.get_context(%w[upstream]), 'upstream.h', cb.folder)
-  erb_render_and_save(cb.get_context(%w[upstream]), 'upstream.c', cb.folder)
+  erb_render_and_save(cb.get_context(%w[upstream callback_types]), 'upstream.c', cb.folder)
 end
 
 def wrote_downstream(cb)

data/lib/metababel/bt2_trace_class_generator.rb

@@ -609,7 +609,7 @@ module Babeltrace2Gen
       variable = bt_get_variable(arg_variables).name
 
       pr "// Dump data to a temporal string."
-      pr "char *#{field}_temp = malloc(sizeof(#{variable}));"
+      pr "char *#{field}_temp = (char *)malloc(sizeof(#{variable}));"
       pr "assert(#{field}_temp != NULL && \"Out of memory\");"
       pr "memcpy(#{field}_temp, &#{variable}, sizeof(#{variable}));"
       pr ""
@@ -632,6 +632,7 @@ module Babeltrace2Gen
 
   class BTFieldClass::Array::Static < BTFieldClass::Array
     extend BTFromH
+    using HashRefinements
     attr_reader :length
 
     def initialize(parent:, element_field_class:, length:)
@@ -645,8 +646,34 @@ module Babeltrace2Gen
         pr "bt_field_class *#{element_field_class_variable};"
         @element_field_class.get_declarator(trace_class: trace_class, variable: element_field_class_variable)
         pr "#{variable} = bt_field_class_array_static_create(#{trace_class}, #{element_field_class_variable}, #{@length});"
+        pr "bt_field_class_put_ref(#{element_field_class_variable});"
+      end
+    end
+
+    def get_setter(field:, arg_variables:)
+      usr_var = bt_get_variable(arg_variables, is_array: true)
+      pr "for(uint64_t _i=0; _i < #{@length} ; _i++)"
+      scope do
+        v = "#{field}_e"
+        pr "bt_field* #{v} = bt_field_array_borrow_element_field_by_index(#{field}, _i);"
+        arg_variables.fetch_append('internal', GeneratedArg.new('', "#{usr_var.name}[_i]"))
+        @element_field_class.get_setter(field: v, arg_variables: arg_variables)
+      end
+    end
+
+    def get_getter(field:, arg_variables:)
+      length = @length
+      usr_var = bt_get_variable(arg_variables, is_array: true)
+      pr "#{usr_var.name} = (#{usr_var.type}) malloc(#{length} * sizeof(#{usr_var.name}));"
+      pr "for(uint64_t _i=0; _i < #{length} ; _i++)"
+      scope do
+        v = "#{field}_e"
+        pr "const bt_field* #{v} = bt_field_array_borrow_element_field_by_index_const(#{field}, _i);"
+        arg_variables.fetch_append('internal', GeneratedArg.new('', "#{usr_var.name}[_i]"))
+        @element_field_class.get_getter(field: v, arg_variables: arg_variables)
       end
     end
+
   end
 
   class BTFieldClass::Array::Dynamic < BTFieldClass::Array
@@ -731,10 +758,13 @@ module Babeltrace2Gen
 
     attr_reader :parent, :name, :field_class
 
-    def initialize(parent:, field_class:, name: nil)
+    def initialize(parent:, field_class: nil, name: nil)
       @parent = parent
+      is_match_model = parent.rec_trace_class.match
+      raise ArgumentError.new("missing keyword: :name") unless name || is_match_model
+      raise ArgumentError.new("missing keyword: :field_class") unless field_class || is_match_model
       @name = name # Name can be nil in the matching callbacks
-      @field_class = BTFieldClass.from_h(self, field_class)
+      @field_class = BTFieldClass.from_h(self, field_class || {} )
     end
 
     def bt_get_variable()

data/lib/metababel/version.rb

@@ -1,3 +1,3 @@
 module Metababel
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end

data/template/component.c.erb

@@ -14,7 +14,6 @@ void btx_populate_params(common_data_t *common_data) {
 }
 
 <% static_callback_types.each do |e| %>
-
 void btx_register_callbacks_<%= e.name_sanitized %>(
     void *btx_handle, <%= e.name_sanitized %>_static_callback_f *callback) {
   ((common_data_t *)btx_handle)->static_callbacks-><%= e.name_sanitized %> =
@@ -32,3 +31,16 @@ void btx_call_callbacks_<%= e.name_sanitized %>(
        <%= e.args.map{ |s| s.name }.join(", ") %>);
 }
 <% end %>
+
+void btx_unregister_callbacks(common_data_t *common_data) {
+  name_to_dispatcher_t *current, *tmp;
+  HASH_ITER(hh, common_data->name_to_dispatcher, current, tmp) {
+    HASH_DEL(common_data->name_to_dispatcher, current);
+    <% callback_types.each do |id| %>
+    if (current->callbacks-><%= id %>)
+      utarray_free(current->callbacks-><%= id %>);
+    <% end %>
+    free(current->callbacks);
+    free(current);
+  }
+}

data/template/component.h.erb

@@ -169,6 +169,7 @@ struct common_data_s {
 <% end %>
 
 void btx_register_usr_callbacks(void *btx_handle);
+void btx_unregister_callbacks(common_data_t *common_data);
 
 <% static_callback_types.each do |e| %>
 typedef void <%= e.name_sanitized %>_static_callback_f(

data/template/downstream.c.erb

@@ -20,8 +20,8 @@ void btx_downstream_move_messages(
   }
 }
 
-static inline
-void _btx_push_message(btx_message_iterator_t *message_iterator_private_data,
+static inline void
+_btx_push_message(btx_message_iterator_t *message_iterator_private_data,
                   const bt_message *message) {
 
   struct el *elt;
@@ -51,7 +51,7 @@ void btx_downstream_push_message(
     btx_message_iterator_t *message_iterator_private_data,
     const bt_message *message) {
 
-<% unless options[:disable_callbaks].include?('on_downstream') %>
+  <% unless options[:disable_callbaks].include?('on_downstream') %>
   on_downstream_message_callback_f *p =
       (on_downstream_message_callback_f *)message_iterator_private_data
           ->common_data->on_downstream_message_callback;
@@ -60,7 +60,7 @@ void btx_downstream_push_message(
       message_iterator_private_data->common_data->usr_data, message);
     return;
   }
-<% end %>
+  <% end %>
   _btx_push_message(message_iterator_private_data, message);
 }
 
@@ -168,7 +168,8 @@ void btx_push_message_<%= e.name_sanitized %>(
       _downstream_event<%= e.args.map{ |s| s.name }.join_with_prefix(", ") %>);
 
   btx_message_iterator_t *_message_iterator_private_data =
-      bt_self_message_iterator_get_data(common_data->self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          common_data->self_message_iterator);
   btx_downstream_push_message(_message_iterator_private_data, _message);
 }
 <% end %>

data/template/filter.c.erb

@@ -28,7 +28,8 @@ filter_message_iterator_next_finalizing(
     bt_message_array_const messages, uint64_t capacity, uint64_t *count) {
 
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
 
   /* No more messages, we can stop the plugin, and transition to END  */
   if (!message_iterator_private_data->queue) {
@@ -55,7 +56,8 @@ filter_message_iterator_next_processing_sending(
     bt_message_array_const messages, uint64_t capacity, uint64_t *count) {
   /* Retrieve our private data from the message iterator's user data */
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
 
   /* This should never append. When transitioning to sending,
      we check that we have some messages to send */
@@ -167,7 +169,8 @@ filter_message_iterator_next_processing_reading(
     bt_message_array_const messages, uint64_t capacity, uint64_t *count) {
   /* Retrieve our private data from the message iterator's user data */
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
 
   common_data_t *common_data = message_iterator_private_data->common_data;
 
@@ -229,7 +232,8 @@ filter_message_iterator_next_processing(
     bt_message_array_const messages, uint64_t capacity, uint64_t *count) {
 
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
 
   switch (message_iterator_private_data->processing_state) {
   case BTX_FILTER_PROCESSING_STATE_READING:
@@ -257,7 +261,8 @@ filter_message_iterator_next_initializing(
 
   /* Retrieve our private data from the message iterator's user data */
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
 
   /* Begining of Stream */
   btx_push_messages_stream_beginning(self_message_iterator,
@@ -293,7 +298,8 @@ filter_message_iterator_next(bt_self_message_iterator *self_message_iterator,
 
   /* Retrieve our private data from the message iterator's user data */
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
 
   switch (message_iterator_private_data->state) {
   case BTX_FILTER_STATE_INITIALIZING:
@@ -334,9 +340,11 @@ filter_initialize(bt_self_component_filter *self_component_filter,
                   const bt_value *params, void *initialize_method_data) {
 
   /* Allocate a private data structure */
-  common_data_t *common_data = calloc(1, sizeof(common_data_t));
-  common_data->static_callbacks = calloc(1, sizeof(static_callbacks_t));
-  common_data->btx_params = calloc(1, sizeof(btx_params_t));
+  common_data_t *common_data =
+      (common_data_t *)calloc(1, sizeof(common_data_t));
+  common_data->static_callbacks =
+      (static_callbacks_t *)calloc(1, sizeof(static_callbacks_t));
+  common_data->btx_params = (btx_params_t *)calloc(1, sizeof(btx_params_t));
   common_data->params = params;
 
   /* Read parameters */
@@ -346,8 +354,7 @@ filter_initialize(bt_self_component_filter *self_component_filter,
   /* Register User Callbacks */
   btx_register_usr_callbacks((void *)common_data);
   /* Call initialize_processing*/
-  btx_call_callbacks_initialize_component((void *)common_data,
-                                          &common_data->usr_data);
+  btx_call_callbacks_initialize_component(common_data, &common_data->usr_data);
   /* Call read callbacks */
   btx_call_callbacks_read_params(common_data, common_data->usr_data,
                                  common_data->btx_params);
@@ -427,10 +434,10 @@ filter_message_iterator_initialize(
     bt_self_component_port_output *self_port_output) {
   /* Allocate a private data structure */
   btx_message_iterator_t *message_iterator_private_data =
-      calloc(1, sizeof(btx_message_iterator_t));
+      (btx_message_iterator_t *)calloc(1, sizeof(btx_message_iterator_t));
 
   /* Retrieve the component's private data from its user data */
-  common_data_t *common_data = bt_self_component_get_data(
+  common_data_t *common_data = (common_data_t *)bt_self_component_get_data(
       bt_self_message_iterator_borrow_component(self_message_iterator));
 
   /* Save a link to the self_message_iterator */
@@ -470,7 +477,7 @@ filter_message_iterator_initialize(
 }
 
 static void filter_finalize(bt_self_component_filter *self_component_filter) {
-  common_data_t *common_data = bt_self_component_get_data(
+  common_data_t *common_data = (common_data_t *)bt_self_component_get_data(
       bt_self_component_filter_as_self_component(self_component_filter));
 
   /* Finalize Component */
@@ -481,7 +488,7 @@ static void filter_finalize(bt_self_component_filter *self_component_filter) {
   bt_trace_put_ref(common_data->downstream_trace);
 
   /* Delete name_to_dispatchers */
-  btx_delete_dispatchers(common_data);
+  btx_unregister_callbacks(common_data);
 
   /* We allocate it, we need to free it */
   free(common_data->btx_params);
@@ -494,7 +501,8 @@ static void filter_message_iterator_finalize(
     bt_self_message_iterator *self_message_iterator) {
   /* Retrieve our private data from the message iterator's user data */
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
 
   {
     struct el *elt, *tmp;

data/template/sink.c.erb

@@ -19,7 +19,7 @@ sink_consume(bt_self_component_sink *self_component_sink) {
 
   /* Retrieve our private data from the component's user data */
   /* This containt user data and the message iterator */
-  common_data_t *common_data = bt_self_component_get_data(
+  common_data_t *common_data = (common_data_t *)bt_self_component_get_data(
       bt_self_component_sink_as_self_component(self_component_sink));
 
   /* Consume a batch of messages from the upstream message iterator */
@@ -82,9 +82,11 @@ sink_initialize(bt_self_component_sink *self_component_sink,
                 bt_self_component_sink_configuration *configuration,
                 const bt_value *params, void *initialize_method_data) {
   /* Allocate a private data structure */
-  common_data_t *common_data = calloc(1, sizeof(common_data_t));
-  common_data->static_callbacks = calloc(1, sizeof(static_callbacks_t));
-  common_data->btx_params = calloc(1, sizeof(btx_params_t));
+  common_data_t *common_data =
+      (common_data_t *)calloc(1, sizeof(common_data_t));
+  common_data->static_callbacks =
+      (static_callbacks_t *)calloc(1, sizeof(static_callbacks_t));
+  common_data->btx_params = (btx_params_t *)calloc(1, sizeof(btx_params_t));
   common_data->params = params;
 
   /* Read parameters */
@@ -94,8 +96,7 @@ sink_initialize(bt_self_component_sink *self_component_sink,
   /* Register User Callbacks */
   btx_register_usr_callbacks((void *)common_data);
   /* Call initialize_processing*/
-  btx_call_callbacks_initialize_component((void *)common_data,
-                                          &common_data->usr_data);
+  btx_call_callbacks_initialize_component(common_data, &common_data->usr_data);
   /* Call read callbacks */
   btx_call_callbacks_read_params(common_data, common_data->usr_data,
                                  common_data->btx_params);
@@ -118,14 +119,14 @@ sink_initialize(bt_self_component_sink *self_component_sink,
 }
 
 static void sink_finalize(bt_self_component_sink *self_component_sink) {
-  common_data_t *common_data = bt_self_component_get_data(
+  common_data_t *common_data = (common_data_t *)bt_self_component_get_data(
       bt_self_component_sink_as_self_component(self_component_sink));
 
   /* Finalize Component */
   btx_call_callbacks_finalize_component(common_data, common_data->usr_data);
 
   // Delete name_to_dispatcher
-  btx_delete_dispatchers(common_data);
+  btx_unregister_callbacks(common_data);
 
   // We allocate it, we need to free it
   free(common_data->btx_params);
@@ -145,7 +146,7 @@ static void sink_finalize(bt_self_component_sink *self_component_sink) {
 static bt_component_class_sink_graph_is_configured_method_status
 sink_graph_is_configured(bt_self_component_sink *self_component_sink) {
   /* Retrieve our private data from the component's user data */
-  common_data_t *common_data = bt_self_component_get_data(
+  common_data_t *common_data = (common_data_t *)bt_self_component_get_data(
       bt_self_component_sink_as_self_component(self_component_sink));
 
   /* Borrow our unique port */

data/template/source.c.erb

@@ -23,7 +23,11 @@ source_message_iterator_next(bt_self_message_iterator *self_message_iterator,
 
   /* Retrieve our private data from the message iterator's user data */
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
+
+  // Avoid C++ crosses initialization warning
+  btx_source_status_t status;
 
   /* When you return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END, you must
    * not put any message into the message array */
@@ -46,7 +50,7 @@ source_message_iterator_next(bt_self_message_iterator *self_message_iterator,
       return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
     }
 
-    btx_source_status_t status = BTX_SOURCE_END;
+    status = BTX_SOURCE_END;
 
     btx_call_callbacks_push_usr_messages(
         message_iterator_private_data->common_data,
@@ -85,9 +89,11 @@ source_initialize(bt_self_component_source *self_component_source,
                   bt_self_component_source_configuration *configuration,
                   const bt_value *params, void *initialize_method_data) {
   /* Allocate a private data structure */
-  common_data_t *common_data = calloc(1, sizeof(common_data_t));
-  common_data->static_callbacks = calloc(1, sizeof(static_callbacks_t));
-  common_data->btx_params = calloc(1, sizeof(btx_params_t));
+  common_data_t *common_data =
+      (common_data_t *)calloc(1, sizeof(common_data_t));
+  common_data->static_callbacks =
+      (static_callbacks_t *)calloc(1, sizeof(static_callbacks_t));
+  common_data->btx_params = (btx_params_t *)calloc(1, sizeof(btx_params_t));
   common_data->params = params;
 
   /* Read parameters */
@@ -97,8 +103,7 @@ source_initialize(bt_self_component_source *self_component_source,
   /* Register User Callbacks */
   btx_register_usr_callbacks((void *)common_data);
   /* Call initialize_processing*/
-  btx_call_callbacks_initialize_component((void *)common_data,
-                                          &common_data->usr_data);
+  btx_call_callbacks_initialize_component(common_data, &common_data->usr_data);
   /* Call read callbacks */
   btx_call_callbacks_read_params(common_data, common_data->usr_data,
                                  common_data->btx_params);
@@ -142,12 +147,12 @@ source_message_iterator_initialize(
     bt_self_component_port_output *self_port) {
   /* Allocate a private data structure */
   btx_message_iterator_t *message_iterator_private_data =
-      calloc(1, sizeof(btx_message_iterator_t));
+      (btx_message_iterator_t *)calloc(1, sizeof(btx_message_iterator_t));
 
   message_iterator_private_data->state = BTX_SOURCE_STATE_INITIALIZING;
 
   /* Retrieve the component's private data from its user data */
-  common_data_t *common_data = bt_self_component_get_data(
+  common_data_t *common_data = (common_data_t *)bt_self_component_get_data(
       bt_self_message_iterator_borrow_component(self_message_iterator));
 
   /* Save a link to the self_message_iterator */
@@ -164,26 +169,20 @@ source_message_iterator_initialize(
 }
 
 static void source_finalize(bt_self_component_source *self_component_source) {
-  common_data_t *common_data = bt_self_component_get_data(
+  common_data_t *common_data = (common_data_t *)bt_self_component_get_data(
       bt_self_component_source_as_self_component(self_component_source));
 
   /* Finalize Component */
   btx_call_callbacks_finalize_component(common_data, common_data->usr_data);
 
   btx_streams_put_ref(common_data->downstream_trace); // ??
-  // We allocate it, we need to put ref
+  /* We allocate it, we need to put ref */
   bt_trace_put_ref(common_data->downstream_trace);
 
-  // Delete name_to_dispatcher
-  name_to_dispatcher_t *current, *tmp;
-  HASH_ITER(hh, common_data->name_to_dispatcher, current, tmp) {
-    HASH_DEL(common_data->name_to_dispatcher, current);
-    utarray_free(current->callbacks->generic);
-    free(current->callbacks);
-    free(current);
-  }
+  /* Delete name_to_dispatchers */
+  btx_unregister_callbacks(common_data);
 
-  // We allocate it, we need to free it
+  /* We allocate it, we need to free it */
   free(common_data->btx_params);
   free(common_data->static_callbacks);
   bt_value_put_ref(common_data->params);
@@ -194,7 +193,8 @@ static void source_message_iterator_finalize(
     bt_self_message_iterator *self_message_iterator) {
   /* Retrieve our private data from the message iterator's user data */
   btx_message_iterator_t *message_iterator_private_data =
-      bt_self_message_iterator_get_data(self_message_iterator);
+      (btx_message_iterator_t *)bt_self_message_iterator_get_data(
+          self_message_iterator);
 
   struct el *elt, *tmp;
   DL_FOREACH_SAFE(message_iterator_private_data->pool, elt, tmp) {

data/template/upstream.c.erb

@@ -28,7 +28,7 @@ static void btx_dispatch_<%= dispatcher.name_sanitized %>(
   bt_clock_snapshot_get_ns_from_origin(clock_snapshot, &_timestamp);
   <% end %>
   <%# event_class_name, only required when there is at least one matching callback for this event.  %>
-  <% if dispatcher.dispatch_types.map(&:args).flatten.any? { |arg| arg.name == '_event_class_name' } %>
+  <% if dispatcher.dispatch_types.map { |dt| dt.args[dispatcher.name] }.flatten.any? { |arg| arg.name == '_event_class_name' } %>
   const char *_event_class_name = "<%= dispatcher.name %>";
   <% end %>
 
@@ -37,11 +37,12 @@ static void btx_dispatch_<%= dispatcher.name_sanitized %>(
   {
     if (callbacks-><%= dispatch_type.id %>) {
       void **_p = NULL;
-      while ((_p = utarray_next(callbacks-><%= dispatch_type.id %>, _p))) {
+      while ((
+          _p = (void **)utarray_next(callbacks-><%= dispatch_type.id %>, _p))) {
         (*((<%= dispatch_type.name_sanitized %>_callback_f **)(_p)))(
             (void *)common_data,
             common_data
-                ->usr_data<%= dispatch_type.args.map{ |a| a.name }.join_with_prefix(", ") %>);
+                ->usr_data<%= dispatch_type.args[dispatcher.name].map{ |a| a.name }.join_with_prefix(", ") %>);
       }
     }
   }
@@ -53,56 +54,45 @@ static void btx_dispatch_<%= dispatcher.name_sanitized %>(
 }
 
 <% end %>
-<% dispatchers.each do |dispatcher| %>
-void btx_generic_register_callback_<%= dispatcher.name_sanitized %>(
-    void *btx_handle, const char *id, void *callback) {
-  // Look-up our dispatcher
+
+static void bt_register_callbacks(void *btx_handle, const char *dispatcher_name,
+                                  void *btx_dispatch_p, const char *id,
+                                  void *callback) {
+
   name_to_dispatcher_t *s = NULL;
+
   name_to_dispatcher_t **name_to_dispatcher =
       &((common_data_t *)btx_handle)->name_to_dispatcher;
-  HASH_FIND_STR(*name_to_dispatcher, "<%= dispatcher.name %>", s);
+  HASH_FIND_STR(*name_to_dispatcher, dispatcher_name, s);
+
   if (!s) {
     // We didn't find the dispatcher, so we need to create it.
     s = (name_to_dispatcher_t *)malloc(sizeof(name_to_dispatcher_t));
-    s->name = "<%= dispatcher.name %>";
-    s->dispatcher = (void *)&btx_dispatch_<%= dispatcher.name_sanitized %>;
-    s->callbacks = calloc(1, sizeof(callbacks_t));
+    s->name = dispatcher_name;
+    s->dispatcher = btx_dispatch_p;
+    s->callbacks = (callbacks_t *)calloc(1, sizeof(callbacks_t));
     // 2. Register it
     HASH_ADD_KEYPTR(hh, *name_to_dispatcher, s->name, strlen(s->name), s);
   }
 
-  <% dispatcher.dispatch_types.each do |dispatch_type| %>
-  if (strcmp("<%= dispatch_type.id %>", id) == 0) {
+  <% callback_types.each_with_index do |id,i| %>
+  <%= i == 0 ? "if" : "else if" %>(strcmp("<%= id %>", id) == 0) {
     // Add the callbacks to the array
-    if (!s->callbacks-><%= dispatch_type.id %>)
-      utarray_new(s->callbacks-><%= dispatch_type.id %>, &ut_ptr_icd);
-    utarray_push_back(s->callbacks-><%= dispatch_type.id %>, &callback);
+    if (!s->callbacks-><%= id %>)
+      utarray_new(s->callbacks-><%= id %>, &ut_ptr_icd);
+    utarray_push_back(s->callbacks-><%= id %>, &callback);
   }
-
   <% end %>
 }
 
-<% end %>
 <% dispatch_types.each do |dispatch_type| %>
 void btx_register_callbacks_<%= dispatch_type.name_sanitized %>(
     void *btx_handle,
     <%= dispatch_type.name_sanitized %>_callback_f *callback) {
   <% dispatch_type.matched_dispatchers.each do |dispatcher| %>
-  btx_generic_register_callback_<%= dispatcher.name_sanitized %>(
-      btx_handle, "<%= dispatch_type.id %>", (void *)callback);
+  bt_register_callbacks(btx_handle, "<%= dispatcher.name %>",
+                        (void *)&btx_dispatch_<%= dispatcher.name_sanitized %>,
+                        "<%= dispatch_type.id %>", (void *)callback);
   <% end %>
 }
-
 <% end %>
-void btx_delete_dispatchers(common_data_t *common_data) {
-  name_to_dispatcher_t *current, *tmp;
-  HASH_ITER(hh, common_data->name_to_dispatcher, current, tmp) {
-    HASH_DEL(common_data->name_to_dispatcher, current);
-    <% dispatch_types.map(&:id).uniq.each do |name| %>
-    if (current->callbacks-><%= name %>)
-      utarray_free(current->callbacks-><%= name %>);
-    <% end %>
-    free(current->callbacks);
-    free(current);
-  }
-}

data/template/upstream.h.erb

@@ -13,13 +13,13 @@ typedef void(dispatcher_t)(callbacks_t *callbacks, common_data_t *common_data,
 typedef void <%= dispatch_type.name_sanitized %>_callback_f(
     void *btx_handle,
     void *
-        usr_data<%= dispatch_type.args.map{ |s| s.type }.join_with_prefix(', ') %>);
+        usr_data<%= dispatch_type.args.values[0].map{ |s| s.type }.join_with_prefix(', ') %>);
 
 void btx_register_callbacks_<%= dispatch_type.name_sanitized %>(
     void *btx_handle, <%= dispatch_type.name_sanitized %>_callback_f *callback);
 
 <% end %>
-void btx_delete_dispatchers(common_data_t *common_data);
+void btx_unregister_callbacks(common_data_t *common_data);
 
 #ifdef __cplusplus
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metababel
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Thomas Applencourt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: