metababel 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2300af1bdf99bcc52ff067a635c5272fb7b4f843faad18638b7587ee8f5693b9
-  data.tar.gz: 21ad38ee40814173d3fda727a03ad0492c04192f5506d445652417ad5f873bd2
+  metadata.gz: 29d62dad7a8e18caa6eae836db0caf7b0e7dd5012c6d83492e51140d9c4ab110
+  data.tar.gz: 9781c211009fbb238c4a96b3faf0341607da2b202155179f58aa545d75f45809
 SHA512:
-  metadata.gz: 72b7df6f07c3cf3ca42702b00ce83e7dad7696f69388abe421141686301dd97989b44d68b02e3f61de05be5e867870d2b9968e35fde192f6832a9dd09109cbfa
-  data.tar.gz: c244c572f89da35cfdeae2793357ba0a31760f39b594cc0a98a36a6c15c27df21df9c466cc19da573f0fddbc114e958a41f915530e2bb88782f6fced17a862d9
+  metadata.gz: d0fef46f9f4461770e2b1994e087788a53dfe3b198d8a529e9e0486320a788f6eac20b4230605f612dbd7cdcbc69746b93e9605f06086353f78a70f6da5774f0
+  data.tar.gz: '0791014239ed111d63148bdb45c2a8d48f45ad0e51a2440fc9171e2220465add097e1f7a4340fef82aca2f4f2b303e1083803ab9d76a6252cfbf9795fc72dfbe'

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
@@ -427,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]
@@ -459,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

@@ -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

data/lib/metababel/version.rb

@@ -1,3 +1,3 @@
 module Metababel
-  VERSION = '1.0.2'
+  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/filter.c.erb

@@ -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

@@ -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.3
 platform: ruby
 authors:
 - Thomas Applencourt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -57,7 +57,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubyforge_project: 
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Helper for creation Babeltrace plugins