metababel 0.0.0 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579d0e3d53d8a2cc77b458621e278d01e98cc5a9b736f9615671c35d5a7ec881
-  data.tar.gz: dede291f1c00394ed257784551fc3c2cffbcd1c9d5404fdb305f272d10c4bb41
+  metadata.gz: 5d2bc1142062b4ea5582787ac08f4297250cfacf0fd1cfef8a6d43facdbe0c91
+  data.tar.gz: 1ca1c72dfb7094af76b7de63b78334e366e90cd1ad9f4749e9b9606fd2c91a6e
 SHA512:
-  metadata.gz: 8da116eba6fc46b84324f10ace6a46aad4b8144d8ec4eadbbfe80c380abf4cd2cd7deaafcc70e3ac86ce3e6ce4971e354029ff93b7885f87e19cb455a6d22a37
-  data.tar.gz: 585f64b8cb02ab0255d131a94f4ecda9fa24dcd7ecaecc7d1ffa9825004671dd550054fbdd638ac3a0fe597fbf1881f1b78cc6ab4cea2c00e75a9b009f6b55ea
+  metadata.gz: 81c2894b9df348051da07351eede13c30c861e846ed1cd1aa45d6b0d9cd9f0afe1b1a8ee667aa5cec08c825096e86eace166e1d70e7099027ba4d77833491d87
+  data.tar.gz: 75b744ab367615c963951248d95828a8e51365efe9024ae6b88be3f72a857e73dc4c7aef0b84f60f39383f53d3978da8e324124acd94a8bc8c28dcc6c370cb63

data/bin/metababel

@@ -110,35 +110,31 @@ def wrote_creates(folder, t)
 end
 
 def wrote_component(options, d, folder)
-
   component_dispatchers = [EventInfo.new('initialize_usr_data',
                                          [GeneratedArg.new('void **', 'usr_data_p')]),
                            EventInfo.new('finalize_usr_data',
                                          [GeneratedArg.new('void *', 'usr_data')]),
                            EventInfo.new('read_params',
                                          [GeneratedArg.new('void *', 'usr_data'),
-                                          GeneratedArg.new('btx_params_t *', 'usr_params')])
-                          ]
+                                          GeneratedArg.new('btx_params_t *', 'usr_params')])]
 
-  if options[:component_type] == "SOURCE"
-     component_dispatchers <<  EventInfo.new('push_usr_messages',
-                                         [GeneratedArg.new('void *', 'usr_data'),
-                                          GeneratedArg.new('btx_source_status_t*', 'status') ])
+  if options[:component_type] == 'SOURCE'
+    component_dispatchers << EventInfo.new('push_usr_messages',
+                                           [GeneratedArg.new('void *', 'usr_data'),
+                                            GeneratedArg.new('btx_source_status_t*', 'status')])
   end
 
   d2 = { component_dispatchers: component_dispatchers,
          event_name: 'dummy_event' }
 
-  erb_render_and_save(d2.update(d).update(:options => options), 'component.h', folder)
-  erb_render_and_save(d2.update(d).update(:options => options), 'component.c', folder)
+  erb_render_and_save(d2.update(d).update(options: options), 'component.h', folder)
+  erb_render_and_save(d2.update(d).update(options: options), 'component.c', folder)
 end
 
-options = { plugin_name: 'metababel',
-            component_name: 'btx' }
-
 # Display help if no arguments.
 ARGV << '-h' if ARGV.empty?
 
+options = {}
 OptionParser.new do |opts|
   opts.banner = 'Usage: example.rb [options]'
 
@@ -187,13 +183,15 @@ OptionParser.new do |opts|
 end.parse!
 
 raise OptionParser::MissingArgument if options[:component_type].nil?
+options[:plugin_name] ||= "metababel_#{options[:component_type].downcase}"
+options[:component_name] ||= "btx"
 
 # Babeltrace can be extended by plugins, which provide one or more component classes.
 base_folder = options[:folder] || "#{options[:component_type]}.#{options[:plugin_name]}.#{options[:component_name]}"
 folder = "#{base_folder}/metababel"
 FileUtils.mkdir_p(folder)
 
-d = {:options => options}
+d = { options: options }
 
 d[:params_declaration] = ''
 d[:params_definition] = ''
@@ -207,8 +205,8 @@ if options.key?(:params)
   d[:params_definition] = body
 end
 
-erb_render_and_save(d, "#{options[:component_type].downcase}.c", base_folder, out_name: "#{options[:plugin_name]}.c")
-erb_render_and_save({options: options}, 'metababel.h', folder, prefix: '')
+erb_render_and_save(d, "#{options[:component_type].downcase}.c", base_folder, out_name: "main.c")
+erb_render_and_save({ options: options }, 'metababel.h', folder, prefix: '')
 
 wrote_component(options, d, folder)
 if %w[SOURCE FILTER].include?(options[:component_type])

data/lib/metababel/bt2_stream_classes_generator.rb

@@ -153,6 +153,7 @@ module Babeltrace2Gen
           pr "bt_field_class *#{var_pc};"
           @packet_context_field_class.get_declarator(trace_class: trace_class, variable: var_pc)
           pr "bt_stream_class_set_packet_context_field_class(#{variable}, #{var_pc});"
+          pr "bt_field_class_put_ref(#{var_pc});"
         end
       end
 
@@ -162,6 +163,7 @@ module Babeltrace2Gen
           pr "bt_field_class *#{var_ecc};"
           @event_common_context_field_class.get_declarator(trace_class: trace_class, variable: var_ecc)
           pr "bt_stream_class_set_event_common_context_field_class(#{variable}, #{var_ecc});"
+          pr "bt_field_class_put_ref(#{var_ecc});"
         end
       end
       # Need to do is afert packet an devent_common_context because it can refer members to those
@@ -174,12 +176,16 @@ module Babeltrace2Gen
         scope do
           pr "bt_event_class *#{var_name};"
           ec.get_declarator(trace_class: trace_class, variable: var_name, stream_class: variable)
+          pr "bt_event_class_put_ref(#{var_name});"
         end
       end
 
       bt_set_conditionally(@assigns_automatic_stream_id) do |v|
         pr "bt_stream_class_set_assigns_automatic_stream_id(#{variable}, #{v});"
       end
+
+      pr "bt_stream_class_put_ref(#{variable});"
+
     end
   end
 
@@ -218,6 +224,7 @@ module Babeltrace2Gen
           pr "bt_field_class *#{var_name};"
           @specific_context_field_class.get_declarator(trace_class: trace_class, variable: var_name)
           pr "bt_event_class_set_specific_context_field_class(#{variable}, #{var_name});"
+          pr "bt_field_class_put_ref(#{var_name});"
         end
       end
 
@@ -227,6 +234,7 @@ module Babeltrace2Gen
           pr "bt_field_class *#{var_name};"
           @payload_field_class.get_declarator(trace_class: trace_class, variable: var_name)
           pr "bt_event_class_set_payload_field_class(#{variable}, #{var_name});"
+          pr "bt_field_class_put_ref(#{var_name});"
         end
       end
     end
@@ -588,6 +596,7 @@ module Babeltrace2Gen
           pr "bt_field_class *#{var_name};"
           m.field_class.get_declarator(trace_class: trace_class, variable: var_name)
           pr "bt_field_class_structure_append_member(#{variable}, \"#{m.name}\", #{var_name});"
+          pr "bt_field_class_put_ref(#{var_name});"
         end
       end
     end

data/lib/metababel/version.rb

@@ -1,3 +1,3 @@
 module Metababel
-  VERSION = '0.0.0'
-end
+  VERSION = '0.0.2'
+end

data/template/downstream.c.erb

@@ -48,12 +48,32 @@ bt_trace *btx_downstream_trace_create_rec(bt_trace_class *trace_class) {
   {
     bt_stream_class *stream_class =
         bt_trace_class_borrow_stream_class_by_index(trace_class, <%= i %>);
-    bt_stream_create(stream_class, trace);
+    bt_stream_put_ref(bt_stream_create(stream_class, trace));
   }
   <% end %>
   return trace;
 }
 
+// Workarround of a bug where gepping trace alive (and not the stream) provoke
+// some segfault
+void btx_streams_get_ref(bt_trace *trace) {
+  <% stream_classes.each_with_index do |_,i| %>
+  {
+    bt_stream *stream = bt_trace_borrow_stream_by_index(trace, <%= i %>);
+    bt_stream_get_ref(stream);
+  }
+  <% end %>
+}
+
+void btx_streams_put_ref(bt_trace *trace) {
+  <% stream_classes.each_with_index do |_,i| %>
+  {
+    bt_stream *stream = bt_trace_borrow_stream_by_index(trace, <%= i %>);
+    bt_stream_put_ref(stream);
+  }
+  <% end %>
+}
+
 void btx_push_messages_stream_beginning(
     bt_self_message_iterator *self_message_iterator,
     btx_message_iterator_t *message_iterator_private_data) {

data/template/downstream.h.erb

@@ -17,6 +17,9 @@ btx_downstream_trace_class_create_rec(bt_self_component *self_component);
 
 bt_trace *btx_downstream_trace_create_rec(bt_trace_class *trace_class);
 
+void btx_streams_get_ref(bt_trace *trace);
+void btx_streams_put_ref(bt_trace *trace);
+
 void btx_push_messages_stream_beginning(
     bt_self_message_iterator *self_message_iterator,
     btx_message_iterator_t *message_iterator_private_data);

data/template/filter.c.erb

@@ -9,7 +9,7 @@
  * https://babeltrace.org/docs/v2.0/libbabeltrace2/example-simple-flt-cmp-cls.html
  */
 
-static const char *get_port_name(uint64_t current) {
+static char *get_port_name(uint64_t current) {
   int num_len = snprintf(NULL, 0, "in%ld", current);
   char *result = (char *)malloc(num_len + 1);
   sprintf(result, "in%ld", current);
@@ -91,9 +91,10 @@ filter_message_iterator_next_processing_reading(
     /* We are setting the state, so this function will never being call twice */
     bt_message_iterator_put_ref(
         message_iterator_private_data->head_mi->message_iterator);
+    struct el_mi *tmp = message_iterator_private_data->head_mi;
+    CDL_DELETE(message_iterator_private_data->head_mi, tmp);
+    free(tmp);
 
-    CDL_DELETE(message_iterator_private_data->head_mi,
-               message_iterator_private_data->head_mi);
     if (!message_iterator_private_data->head_mi) {
       /* Call Finalize user callback */
       btx_call_callbacks_finalize_usr_data(
@@ -240,6 +241,7 @@ filter_initialize(bt_self_component_filter *self_component_filter,
 
   /* Allocate a private data structure */
   common_data_t *common_data = calloc(1, sizeof(common_data_t));
+  common_data->btx_params = calloc(1,sizeof(btx_params_t));
   common_data->params = params;
   // Read parameters
   btx_populate_params(common_data);
@@ -274,9 +276,12 @@ filter_initialize(bt_self_component_filter *self_component_filter,
   const uint64_t current =
       bt_component_filter_get_input_port_count(common_data->component);
 
-  bt_self_component_filter_add_input_port(self_component_filter,
-                                          get_port_name(current), NULL, NULL);
-
+  {
+    char *name = get_port_name(current);
+    bt_self_component_filter_add_input_port(self_component_filter, name, NULL,
+                                            NULL);
+    free(name);
+  }
   bt_self_component_filter_add_output_port(self_component_filter, "out", NULL,
                                            NULL);
 
@@ -289,17 +294,26 @@ filter_initialize(bt_self_component_filter *self_component_filter,
   /* Instantiate a `downstream_trace` of `trace_class` and all the children
    * stream */
   common_data->downstream_trace = btx_downstream_trace_create_rec(trace_class);
+  btx_streams_get_ref(common_data->downstream_trace); // ??
+  bt_trace_class_put_ref(trace_class);
+
   return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
 }
 
 bt_component_class_port_connected_method_status
-filter_input_port_connected(bt_self_component_filter *self_comp,
+filter_input_port_connected(bt_self_component_filter *self_component_filter,
                             bt_self_component_port_input *self_port,
                             const bt_port_output *other_port) {
   const uint64_t current = bt_component_filter_get_input_port_count(
-      bt_self_component_filter_as_component_filter(self_comp));
-  bt_self_component_filter_add_input_port(self_comp, get_port_name(current),
-                                          NULL, NULL);
+      bt_self_component_filter_as_component_filter(self_component_filter));
+
+  {
+    char *name = get_port_name(current);
+    bt_self_component_filter_add_input_port(self_component_filter, name, NULL,
+                                            NULL);
+    free(name);
+  }
+
   return BT_COMPONENT_CLASS_PORT_CONNECTED_METHOD_STATUS_OK;
 }
 /*
@@ -342,6 +356,7 @@ filter_message_iterator_initialize(
     el_mi *mi = (el_mi *)malloc(sizeof *mi);
     bt_message_iterator_create_from_message_iterator(
         self_message_iterator, self_port, &mi->message_iterator);
+
     CDL_APPEND(message_iterator_private_data->head_mi, mi);
   }
 
@@ -359,6 +374,19 @@ 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(
       bt_self_component_filter_as_self_component(self_component_filter));
+
+  btx_streams_put_ref(common_data->downstream_trace); // ??
+  // 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);
+    free(current);
+  }
+
   // We allocate it, we need to free it
   free(common_data->btx_params);
   bt_value_put_ref(common_data->params);
@@ -371,12 +399,14 @@ static void filter_message_iterator_finalize(
   btx_message_iterator_t *message_iterator_private_data =
       bt_self_message_iterator_get_data(self_message_iterator);
 
-  struct el *elt, *tmp;
-  DL_FOREACH_SAFE(message_iterator_private_data->pool, elt, tmp) {
-    DL_DELETE(message_iterator_private_data->pool, elt);
-    free(elt);
+  {
+    struct el *elt, *tmp;
+    DL_FOREACH_SAFE(message_iterator_private_data->pool, elt, tmp) {
+      DL_DELETE(message_iterator_private_data->pool, elt);
+      free(elt);
+    }
   }
-
+  assert(!message_iterator_private_data->head_mi);
   /* Free the allocated structure */
   free(message_iterator_private_data);
 }
@@ -388,10 +418,10 @@ BT_PLUGIN(<%= options[:plugin_name] %>);
 BT_PLUGIN_FILTER_COMPONENT_CLASS(<%= options[:component_name] %>,
                                  filter_message_iterator_next);
 
-BT_PLUGIN_FILTER_COMPONENT_CLASS_INITIALIZE_METHOD(<%= options[:component_name] %>,
-                                                   filter_initialize);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD(<%= options[:component_name] %>,
-                                                 filter_finalize);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_INITIALIZE_METHOD(
+    <%= options[:component_name] %>, filter_initialize);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD(
+    <%= options[:component_name] %>, filter_finalize);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD(
     <%= options[:component_name] %>, filter_message_iterator_initialize);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_CLASS_FINALIZE_METHOD(

data/template/sink.c.erb

@@ -50,6 +50,7 @@ sink_consume(bt_self_component_sink *self_component_sink) {
   for (uint64_t i = 0; i < message_count; i++) {
     const bt_message *message = messages[i];
     if (bt_message_get_type(message) != BT_MESSAGE_TYPE_EVENT) {
+      bt_message_put_ref(message);
       continue;
     }
 
@@ -79,6 +80,7 @@ sink_initialize(bt_self_component_sink *self_component_sink,
                 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->btx_params = calloc(1,sizeof(btx_params_t));
   common_data->params = params;
   // Read parameters
   btx_populate_params(common_data);
@@ -118,6 +120,15 @@ static void sink_finalize(bt_self_component_sink *self_component_sink) {
   /* Finalize User Data */
   /* Call Finalize user callback */
   btx_call_callbacks_finalize_usr_data(common_data, common_data->usr_data);
+
+  // 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);
+    free(current);
+  }
+
   // We allocate it, we need to free it
   free(common_data->btx_params);
   bt_value_put_ref(common_data->params);
@@ -157,8 +168,8 @@ BT_PLUGIN(<%= options[:plugin_name] %>);
 /* Add the output  component class */
 BT_PLUGIN_SINK_COMPONENT_CLASS(<%= options[:component_name] %>, sink_consume);
 
-BT_PLUGIN_SINK_COMPONENT_CLASS_INITIALIZE_METHOD(<%= options[:component_name] %>,
-                                                 sink_initialize);
+BT_PLUGIN_SINK_COMPONENT_CLASS_INITIALIZE_METHOD(
+    <%= options[:component_name] %>, sink_initialize);
 BT_PLUGIN_SINK_COMPONENT_CLASS_FINALIZE_METHOD(<%= options[:component_name] %>,
                                                sink_finalize);
 

data/template/source.c.erb

@@ -93,6 +93,7 @@ source_initialize(bt_self_component_source *self_component_source,
                   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->btx_params = calloc(1,sizeof(btx_params_t));
   common_data->params = params;
   // Read parameters
   btx_populate_params(common_data);
@@ -110,6 +111,8 @@ source_initialize(bt_self_component_source *self_component_source,
   /* Instantiate a `downstream_trace` of `trace_class` and all the children
    * stream */
   common_data->downstream_trace = btx_downstream_trace_create_rec(trace_class);
+  btx_streams_get_ref(common_data->downstream_trace); // ??
+  bt_trace_class_put_ref(trace_class);
 
   /* Set the component's user data to our private data structure */
   bt_self_component_set_data(self_component, common_data);
@@ -161,6 +164,19 @@ 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(
       bt_self_component_source_as_self_component(self_component_source));
+
+  btx_streams_put_ref(common_data->downstream_trace); // ??
+  // 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);
+    free(current);
+  }
+
   // We allocate it, we need to free it
   free(common_data->btx_params);
   bt_value_put_ref(common_data->params);
@@ -190,10 +206,10 @@ BT_PLUGIN(<%= options[:plugin_name] %>);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS(<%= options[:component_name] %>,
                                  source_message_iterator_next);
 
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_INITIALIZE_METHOD(<%= options[:component_name] %>,
-                                                   source_initialize);
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_FINALIZE_METHOD(<%= options[:component_name] %>,
-                                                 source_finalize);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_INITIALIZE_METHOD(
+    <%= options[:component_name] %>, source_initialize);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_FINALIZE_METHOD(
+    <%= options[:component_name] %>, source_finalize);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD(
     <%= options[:component_name] %>, source_message_iterator_initialize);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_CLASS_FINALIZE_METHOD(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metababel
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.2
 platform: ruby
 authors:
 - Thomas Applencourt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -55,7 +55,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Helper for creation Babeltrace plugins