metababel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d2bc1142062b4ea5582787ac08f4297250cfacf0fd1cfef8a6d43facdbe0c91
-  data.tar.gz: 1ca1c72dfb7094af76b7de63b78334e366e90cd1ad9f4749e9b9606fd2c91a6e
+  metadata.gz: 3e44583997647f4d7d9e241dd5e066abc80586445283bd2846fa9fa453542de7
+  data.tar.gz: a89855eeb46c35a71325937679b30bc0ef3fe46317cc1239419980b13f43a1b5
 SHA512:
-  metadata.gz: 81c2894b9df348051da07351eede13c30c861e846ed1cd1aa45d6b0d9cd9f0afe1b1a8ee667aa5cec08c825096e86eace166e1d70e7099027ba4d77833491d87
-  data.tar.gz: 75b744ab367615c963951248d95828a8e51365efe9024ae6b88be3f72a857e73dc4c7aef0b84f60f39383f53d3978da8e324124acd94a8bc8c28dcc6c370cb63
+  metadata.gz: 8ece21929325026051ef4897d8f9871c19e5af621d963d1fcd8e57e8e481feb460e6fe3a02675eefb0bd44dc64505af329231ea22b52c54acbbfc7d9efcdaf2a
+  data.tar.gz: 62fd169ca6e45a414b71228c2b6fc763bd0d18dd83fcbc6266d1663bb7303a8aa608f56863b3bbea0154d5862e4b80f26adbdbd6401b11541a658e200c278704

data/bin/metababel

@@ -33,7 +33,7 @@ class Hash
   end
 end
 
-EventInfo = Struct.new(:name, :args, :body, :index_stream_class, :index_event_class) do
+EventInfo = Struct.new(:name, :args, :body, :index_stream_class, :index_event_class, :default_clock_class) do
   def name_sanitized
     name.gsub(/[^0-9A-Za-z-]/, '_')
   end
@@ -56,7 +56,7 @@ class Babeltrace2Gen::BTTraceClass
   def map_event_classes_with_index
     @stream_classes.map.with_index do |s, index_stream_class|
       s.event_classes.map.with_index do |e, index_event_class|
-        yield(e, index_stream_class, index_event_class)
+        yield(e, index_stream_class, index_event_class, s.default_clock_class)
       end
     end.flatten
   end
@@ -71,8 +71,10 @@ end
 # But we clean the white space empty line afterward \o/
 def wrote_event_dispatchers(folder, t)
   event_name = 'event'
-  event_dispatchers = t.map_event_classes_with_index do |e, index_stream_class, index_event_class|
+  event_dispatchers = t.map_event_classes_with_index do |e, index_stream_class, index_event_class, default_clock_class|
     arg_variables = []
+    arg_variables << GeneratedArg.new("uint64_t", "timestamp") if default_clock_class
+
     body = Babeltrace2Gen.context(indent: 1) do
       e.get_getter(event: event_name, arg_variables: arg_variables)
     end
@@ -88,16 +90,18 @@ end
 
 def wrote_creates(folder, t)
   event_name = 'event'
-  downstream_events = t.map_event_classes_with_index do |e, index_stream_class, index_event_class|
+  downstream_events = t.map_event_classes_with_index do |e, index_stream_class, index_event_class, default_clock_class|
     arg_variables = []
     body = Babeltrace2Gen.context(indent: 1) do
       e.get_setter(event: event_name, arg_variables: arg_variables)
     end
-    EventInfo.new(e.name, arg_variables, "\n" + body, index_stream_class, index_event_class)
+    arg_variables.insert(0,GeneratedArg.new("uint64_t", "timestamp")) if default_clock_class
+
+    EventInfo.new(e.name, arg_variables, "\n" + body, index_stream_class, index_event_class, default_clock_class)
   end
 
   body_declarator_classes = "\n" + Babeltrace2Gen.context(indent: 1) do
-    t.get_declarator(variable: 'trace_class')
+    t.get_declarator(variable: 'trace_class', self_component: 'self_component')
   end
 
   d = { body_declarator_classes: body_declarator_classes,
@@ -203,6 +207,8 @@ if options.key?(:params)
   end
   d[:params_declaration] = c.get_struct_definition('params')
   d[:params_definition] = body
+else
+  d[:params_declaration] = "char _dummy;"
 end
 
 erb_render_and_save(d, "#{options[:component_type].downcase}.c", base_folder, out_name: "main.c")

data/lib/metababel/bt2_stream_classes_generator.rb

@@ -89,7 +89,8 @@ module Babeltrace2Gen
       end
     end
 
-    def get_declarator(variable:)
+    def get_declarator(variable:, self_component:)
+      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});"
       end
@@ -98,7 +99,7 @@ module Babeltrace2Gen
         stream_class_name = "#{variable}_sc_#{i}"
         scope do
           pr "bt_stream_class *#{stream_class_name};"
-          m.get_declarator(trace_class: variable, variable: stream_class_name)
+          m.get_declarator(variable: stream_class_name, self_component: self_component, trace_class: variable)
         end
       end
     end
@@ -109,10 +110,14 @@ module Babeltrace2Gen
     include BTPrinter
     include BTLocator
     extend BTFromH
-    attr_reader :packet_context_field_class, :event_common_context_field_class, :event_classes, :id, :name
+    attr_reader :packet_context_field_class, :event_common_context_field_class, :event_classes, :default_clock_class, :id, :name
 
     def initialize(parent:, name: nil, packet_context_field_class: nil, event_common_context_field_class: nil,
-                   event_classes: [], id: nil, assigns_automatic_event_class_id: nil, assigns_automatic_stream_id: nil)
+                   event_classes: [], id: nil, assigns_automatic_event_class_id: nil, assigns_automatic_stream_id: nil,
+                   default_clock_class: nil)
+      # Handle clock class property:
+      #   https://babeltrace.org/docs/v2.0/libbabeltrace2/group__api-tir-clock-cls.html#gae0f705eb48cd65784da28b1906ca05a5
+
       @parent = parent
       @name = name
 
@@ -137,15 +142,26 @@ module Babeltrace2Gen
       end
       @assigns_automatic_stream_id = assigns_automatic_stream_id
       @id = id
+      @default_clock_class = default_clock_class
     end
 
-    def get_declarator(trace_class:, variable:)
+    def get_declarator(variable:, trace_class:, self_component:)
       if @id
         pr "#{variable} = bt_stream_class_create_with_id(#{trace_class}, #{@id});"
       else
         pr "#{variable} = bt_stream_class_create(#{trace_class});"
       end
       pr "bt_stream_class_set_name(#{variable}, \"#{name}\");" if @name
+      if @default_clock_class
+        clock_class_name = "#{variable}_dcc"
+        scope do
+          pr "bt_clock_class *#{clock_class_name};"
+          # TODO: @default_clock_class.get_declarator(variable: clock_class_name, self_component: self_component)
+          pr "#{clock_class_name} = bt_clock_class_create(#{self_component});"
+          pr "bt_stream_class_set_default_clock_class(#{variable}, #{clock_class_name});"
+          pr "bt_clock_class_put_ref(#{clock_class_name});"
+        end
+      end
 
       if @packet_context_field_class
         var_pc = "#{variable}_pc_fc"
@@ -185,7 +201,6 @@ module Babeltrace2Gen
       end
 
       pr "bt_stream_class_put_ref(#{variable});"
-
     end
   end
 

data/lib/metababel/version.rb

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

data/template/downstream.c.erb

@@ -37,7 +37,7 @@ void btx_downstream_push_message(
 
 bt_trace_class *
 btx_downstream_trace_class_create_rec(bt_self_component *self_component) {
-  bt_trace_class *trace_class = bt_trace_class_create(self_component);
+  bt_trace_class *trace_class;
   <%= body_declarator_classes %>
   return trace_class;
 }
@@ -124,9 +124,14 @@ void btx_push_message_<%= e.name_sanitized %>(
   bt_stream_class *stream_class = bt_stream_borrow_class(stream);
   bt_event_class *event_class = bt_stream_class_borrow_event_class_by_index(
       stream_class, <%= e.index_event_class %>);
-
+  <% if !e.default_clock_class %>
   bt_message *message = bt_message_event_create(
       common_data->self_message_iterator, event_class, stream);
+  <% else %>
+  bt_message *message = bt_message_event_create_with_default_clock_snapshot(
+      common_data->self_message_iterator, event_class, stream, timestamp);
+  <% end %>
+
   bt_event *downstream_event = bt_message_event_borrow_event(message);
 
   btx_set_message_<%= e.name_sanitized %>(

data/template/filter.c.erb

@@ -241,7 +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->btx_params = calloc(1, sizeof(btx_params_t));
   common_data->params = params;
   // Read parameters
   btx_populate_params(common_data);

data/template/sink.c.erb

@@ -80,7 +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->btx_params = calloc(1, sizeof(btx_params_t));
   common_data->params = params;
   // Read parameters
   btx_populate_params(common_data);

data/template/source.c.erb

@@ -93,7 +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->btx_params = calloc(1, sizeof(btx_params_t));
   common_data->params = params;
   // Read parameters
   btx_populate_params(common_data);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metababel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Thomas Applencourt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -55,8 +55,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