metababel 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2300af1bdf99bcc52ff067a635c5272fb7b4f843faad18638b7587ee8f5693b9
-  data.tar.gz: 21ad38ee40814173d3fda727a03ad0492c04192f5506d445652417ad5f873bd2
+  metadata.gz: 94a55badce2025551858542b3ad05ec6f2fadfa18ea7a3d32e43dfc8fa588505
+  data.tar.gz: 861f4853f64c5de23d47f6678e8a369b49b1e5f84cd4ad1944b077a32e5a8a87
 SHA512:
-  metadata.gz: 72b7df6f07c3cf3ca42702b00ce83e7dad7696f69388abe421141686301dd97989b44d68b02e3f61de05be5e867870d2b9968e35fde192f6832a9dd09109cbfa
-  data.tar.gz: c244c572f89da35cfdeae2793357ba0a31760f39b594cc0a98a36a6c15c27df21df9c466cc19da573f0fddbc114e958a41f915530e2bb88782f6fced17a862d9
+  metadata.gz: 10357d19a20bb264699f6f586f49fd2d5229a7da0ea7dd51234d5b5733bee78340c83f564a2084a26a99db9d13073332ad211c67def4b469c6251e2f219b4efa
+  data.tar.gz: 92a55fb2d187388088d13d30a827548b1543bec100f81ff4fa58a7dae41d77ad52f53268b33abd93a1149ea9479c838354b3d1b1773e6dbdf8f2b54a0ae1351b

data/README.md

@@ -38,8 +38,8 @@ stateDiagram-v2
 
 ```mermaid
 stateDiagram-v2
-    [*] --> BTX_SOURCE_STATE_INITIALIZING
-    BTX_SOURCE_STATE_INITIALIZING --> BTX_FILTER_PROCESSING
+    [*] --> BTX_FILTER_STATE_INITIALIZING
+    BTX_FILTER_STATE_INITIALIZING --> BTX_FILTER_PROCESSING
     state BTX_FILTER_PROCESSING {
         [*] --> BTX_FILTER_PROCESSING_STATE_READING
         [*] --> BTX_FILTER_PROCESSING_STATE_SENDING

data/bin/btx_gen_source_callbacks

@@ -0,0 +1,113 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'yaml'
+require 'erb'
+require 'time'
+
+REGEXT_PRETTY = /
+ =\s            # We are interested to the right of the equal sign
+ (
+    ""|         # Empty string
+    ".*?[^\\]"| # String who can contain space and quoted string
+    [^\s,]+     # Anything except space and comma
+ )
+/x.freeze
+
+SOURCE_TEMPLATE = <<~TEXT.freeze
+  /* Code generated by #{__FILE__} */
+
+  #include <metababel/metababel.h>
+
+  void btx_push_usr_messages(void *btx_handle, void *usr_data, btx_source_status_t *status) {
+      <%- if not data.empty? and not data.first[:hostname].nil? -%>
+      btx_downstream_set_environment_hostname(btx_handle, "<%= data.first[:hostname] %>");
+      <%- end -%>
+
+      <%- data.each do | entry | -%>
+      <%- entry.fetch(:times,1).times do -%>
+      btx_push_message_<%= entry[:name] %>(btx_handle<%= ', ' if not entry[:field_values].empty? %><%= entry[:field_values].join(", ") %>);
+      <%- end -%>
+      <%- end -%>
+
+      *status = BTX_SOURCE_END;
+  }
+
+  void btx_register_usr_callbacks(void *btx_handle) {
+    btx_register_callbacks_push_usr_messages(btx_handle, &btx_push_usr_messages);
+  }
+TEXT
+
+def parse_event(line)
+  h = { hostname: nil,
+        name: nil,
+        field_values: [] }
+  # Parse a token one at a time
+  head, tail = line.split(nil, 2)
+  # Timestamp?
+  if head.start_with?('[')
+    t = Time.parse(head[1...-1])
+    # Need to convert in nasosecond
+    h[:field_values] << ((t.to_i * 1_000_000_000) + t.nsec)
+    # discard next token, the offset "(+x.xxxxxxxx)", which
+    # always follows the bracketed timestamp
+    _, head, tail = tail.split(nil, 3)
+  end
+  # Hostname?
+  unless head.end_with?(':')
+    h[:hostname] = head
+    head, tail = tail.split(nil, 2)
+  end
+  h[:name] = head.chop.gsub(/[^0-9A-Za-z-]/, '_')
+  # Handle the fields
+  h[:field_values] += tail.scan(REGEXT_PRETTY).flatten
+  h
+end
+
+def parse_log(input_path)
+  File.open(input_path, 'r') do |file|
+    file.each_line.map do |line|
+      parse_event(line)
+    end
+  end
+end
+
+def render_and_save(data, output_path)
+  renderer = ERB.new(SOURCE_TEMPLATE, trim_mode: '-')
+  output = renderer.result(binding)
+  File.write(output_path, output, mode: 'w')
+end
+
+DOCS = <<-DOCS.freeze
+  Usage: #{$0}.rb [options]
+
+  Example:
+    ruby #{$0} -y stream_classes.yaml -i btx_log.txt -o callbacks.c
+DOCS
+
+# Display help if no arguments.
+ARGV << '-h' if ARGV.empty?
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.banner = DOCS
+
+  opts.on('-h', '--help', 'Prints this help') do
+    puts opts
+    exit
+  end
+
+  opts.on('-i', '--log PATH', '[Mandatory] Path to btx_log.txt.') do |p|
+    options[:input_path] = p
+  end
+
+  opts.on('-o', '--output PATH', '[Mandatory] Path to the bt2 SOURCE file.') do |p|
+    options[:output_path] = p
+  end
+end.parse!
+
+raise OptionParser::MissingArgument if options[:output_path].nil?
+
+data = options.key?(:input_path) ? parse_log(options[:input_path]) : []
+render_and_save(data, options[:output_path])

data/bin/metababel

@@ -62,8 +62,11 @@ class BaseDispatch
   alias eql? ==
 
   def hash
-    @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
 
@@ -103,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
@@ -230,13 +233,12 @@ def parse_argv
 end
 
 def get_dispatch_type(em, default_clock_class, context)
-
   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|
@@ -251,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
   )
@@ -354,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
@@ -409,7 +412,20 @@ class ContextBuilder
         t.get_declarator(variable: '_trace_class', self_component: '_self_component')
       end
 
+      downstream_environements = if t.environment.nil?
+                                   []
+                                 else
+                                   t.environment.entries.map do |e|
+                                     args = {}
+                                     body = "\n" + Babeltrace2Gen.context(indent: 1) do
+                                       e.get_setter(trace: '_trace', arg_variables: args)
+                                     end
+                                     [args['outputs'].first, body]
+                                   end
+                                 end
+
       { body_declarator_classes: body_declarator_classes,
+        downstream_environements: downstream_environements,
         downstream_events: downstream_events,
         stream_classes: t.stream_classes,
         event_name: event_name }
@@ -427,7 +443,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]
@@ -459,7 +475,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

@@ -100,8 +100,6 @@ module Babeltrace2Gen
     end
 
     def get_declarator(variable:, self_component:)
-      raise NotImplementedError, "':environment' keyword not supported in downstream model" if environment
-
       pr "#{variable} = bt_trace_class_create(#{self_component});"
       bt_set_conditionally(@assigns_automatic_stream_class_id) do |v|
         pr "bt_trace_class_set_assigns_automatic_stream_class_id(#{variable}, #{v});"
@@ -632,6 +630,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 +644,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
@@ -958,15 +983,20 @@ module Babeltrace2Gen
     end
 
     def get_getter(trace:, arg_variables:)
-      var_name = @name
-      arg_variables.fetch_append('outputs', bt_get_variable)
-      bt_func_get = self.class.instance_variable_get(:@bt_func)
+      var_name = bt_get_variable(arg_variables).name
       pr "const bt_value *#{var_name}_value = bt_trace_borrow_environment_entry_value_by_name_const(#{trace}, \"#{var_name}\");"
-      pr "#{var_name} = #{bt_func_get}(#{var_name}_value);"
+      pr "#{var_name} = bt_value_#{@type}_get(#{var_name}_value);"
     end
 
-    def bt_get_variable()
-      GeneratedArg.new(self.class.instance_variable_get(:@bt_type), @name)
+    def get_setter(trace:, arg_variables:)
+      var_name = bt_get_variable(arg_variables).name
+      bt_type_set = self.class.instance_variable_get(:@bt_type_set)
+      pr "bt_trace_set_environment_entry_#{bt_type_set}(#{trace}, \"#{var_name}\", #{var_name});"
+    end
+
+    def bt_get_variable(arg_variables={})
+      var = GeneratedArg.new(self.class.instance_variable_get(:@bt_type), @name)
+      arg_variables.fetch_append('outputs', var)
     end
   end
 
@@ -978,13 +1008,14 @@ module Babeltrace2Gen
     extend BTFromH
 
     @bt_type = 'const char*'
-    @bt_func = 'bt_value_string_get'
+    @bt_type_set = 'string'
   end
 
   class BTEntryClass::IntegerSigned < BTEntryClass
     extend BTFromH
 
     @bt_type = 'int64_t'
-    @bt_func = 'bt_value_integer_signed_get'
+    # Sadly it's ` bt_trace_set_environment_entry_integer() ` and not ` bt_trace_set_environment_entry_integer_signed()`
+    @bt_type_set = 'integer'
   end
 end

data/lib/metababel/version.rb

@@ -1,3 +1,3 @@
 module Metababel
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 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

@@ -173,3 +173,12 @@ void btx_push_message_<%= e.name_sanitized %>(
   btx_downstream_push_message(_message_iterator_private_data, _message);
 }
 <% end %>
+
+<% downstream_environements.each do |arg, body| %>
+void btx_downstream_set_environment_<%= arg.name%>(void *btx_handle,
+                                                   <%= arg.type%> <%= arg.name%>) {
+  common_data_t *common_data = (common_data_t *)btx_handle;
+  bt_trace *_trace = common_data->downstream_trace;
+  <%= body %>
+}
+<% end %>

data/template/downstream.h.erb

@@ -42,6 +42,11 @@ void btx_register_on_downstream_message_callback(
     void *btx_handle, on_downstream_message_callback_f *callback);
 <% end %>
 
+<% downstream_environements.each do |arg, body| %>
+void btx_downstream_set_environment_<%= arg.name%>(void *btx_handle,
+                                                   <%= arg.type%> <%= arg.name%>);
+<% end %>
+
 #ifdef __cplusplus
 }
 #endif

data/template/filter.c.erb

@@ -347,18 +347,6 @@ filter_initialize(bt_self_component_filter *self_component_filter,
   common_data->btx_params = (btx_params_t *)calloc(1, sizeof(btx_params_t));
   common_data->params = params;
 
-  /* Read parameters */
-  btx_populate_params(common_data);
-  bt_value_get_ref(common_data->params);
-
-  /* Register User Callbacks */
-  btx_register_usr_callbacks((void *)common_data);
-  /* Call initialize_processing*/
-  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);
-
   /* Set the component's user data to our private data structure */
   bt_self_component_set_data(
       bt_self_component_filter_as_self_component(self_component_filter),
@@ -406,6 +394,18 @@ filter_initialize(bt_self_component_filter *self_component_filter,
   btx_streams_get_ref(common_data->downstream_trace); // ??
   bt_trace_class_put_ref(trace_class);
 
+  /* Read parameters */
+  btx_populate_params(common_data);
+  bt_value_get_ref(common_data->params);
+
+  /* Register User Callbacks */
+  btx_register_usr_callbacks((void *)common_data);
+  /* Call initialize_processing*/
+  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);
+
   return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
 }
 
@@ -488,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);

data/template/sink.c.erb

@@ -126,7 +126,7 @@ static void sink_finalize(bt_self_component_sink *self_component_sink) {
   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);

data/template/source.c.erb

@@ -96,18 +96,6 @@ source_initialize(bt_self_component_source *self_component_source,
   common_data->btx_params = (btx_params_t *)calloc(1, sizeof(btx_params_t));
   common_data->params = params;
 
-  /* Read parameters */
-  btx_populate_params(common_data);
-  bt_value_get_ref(common_data->params);
-
-  /* Register User Callbacks */
-  btx_register_usr_callbacks((void *)common_data);
-  /* Call initialize_processing*/
-  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);
-
   /* Upcast `self_component_source` to the `bt_self_component` type */
   bt_self_component *self_component =
       bt_self_component_source_as_self_component(self_component_source);
@@ -134,6 +122,18 @@ source_initialize(bt_self_component_source *self_component_source,
   bt_self_component_source_add_output_port(self_component_source, "out", NULL,
                                            NULL);
 
+  /* Read parameters */
+  btx_populate_params(common_data);
+  bt_value_get_ref(common_data->params);
+
+  /* Register User Callbacks */
+  btx_register_usr_callbacks((void *)common_data);
+  /* Call initialize_processing*/
+  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);
+
   return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
 }
 
@@ -176,19 +176,13 @@ static void source_finalize(bt_self_component_source *self_component_source) {
   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);

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 %>
 
@@ -42,7 +42,7 @@ static void btx_dispatch_<%= dispatcher.name_sanitized %>(
         (*((<%= 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(", ") %>);
       }
     }
   }
@@ -54,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->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.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Thomas Applencourt
@@ -10,16 +10,18 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
 executables:
 - metababel
+- btx_gen_source_callbacks
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- bin/btx_gen_source_callbacks
 - bin/metababel
 - lib/metababel.rb
 - lib/metababel/bt2_generator_utils.rb