metababel 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8622843bd93dc9b0e2ed91f3ad7bb444ea2216ba183651d17773de232749a187
-  data.tar.gz: 762a87b56229cee6bebe99ebb5358610672a6fb2a171718c3255ad079391ba85
+  metadata.gz: 2300af1bdf99bcc52ff067a635c5272fb7b4f843faad18638b7587ee8f5693b9
+  data.tar.gz: 21ad38ee40814173d3fda727a03ad0492c04192f5506d445652417ad5f873bd2
 SHA512:
-  metadata.gz: 0fbe1685dafbc6d45e03a494607efa1010cde5973167f394150322b36d784eb23305664b8adea0ef12d90c0552a61d726cb1fce83620211f8827c1e4101f0ee0
-  data.tar.gz: cb578b9f45359fd1a93d219761f41ecdb0e0670150be69c731f4d5c1c2695e3ade918e2b5e825701cff380dcaaad6f76c09638628664f3d879f009191e9f9b58
+  metadata.gz: 72b7df6f07c3cf3ca42702b00ce83e7dad7696f69388abe421141686301dd97989b44d68b02e3f61de05be5e867870d2b9968e35fde192f6832a9dd09109cbfa
+  data.tar.gz: c244c572f89da35cfdeae2793357ba0a31760f39b594cc0a98a36a6c15c27df21df9c466cc19da573f0fddbc114e958a41f915530e2bb88782f6fced17a862d9

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,15 @@ 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 }
+    @hash ||=
+      instance_variables.reduce(0) { |a, b| a ^ instance_variable_get(b).hash }
   end
 end
 
@@ -173,8 +175,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 +219,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 +230,13 @@ 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 "Nil or empty event set for '#{em.set_id}'." unless dispatchers.is_a?(Set)
 
   matched_dispatchers, signatures = dispatchers.filter_map do |dispatcher|

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 ""
@@ -731,10 +731,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.2'
 end

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 */
@@ -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,7 +119,7 @@ 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 */
@@ -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,7 +169,7 @@ 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 */
@@ -194,7 +199,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

@@ -37,7 +37,8 @@ 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
@@ -66,7 +67,7 @@ void btx_generic_register_callback_<%= dispatcher.name_sanitized %>(
     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->callbacks = (callbacks_t *)calloc(1, sizeof(callbacks_t));
     // 2. Register it
     HASH_ADD_KEYPTR(hh, *name_to_dispatcher, s->name, strlen(s->name), s);
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metababel
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 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: 2023-11-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -57,8 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Helper for creation Babeltrace plugins