metababel 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124ff9daf13cc0153c89747496e05c47c8b62ebead5ff692c0b131ff0f175fa5
-  data.tar.gz: 64df9b6129c3063d77bed406379e38c16ff272ad476b900d6ee6b00f1530d1ed
+  metadata.gz: a1d7b3860274d4b24281ea23457f20ec61b0908faa6c876456188f54ca45c4ab
+  data.tar.gz: bcc0e1388f58fca090fac605d6c005df948692a7a8cdd98f9f29b8fb6f52f30a
 SHA512:
-  metadata.gz: 96938604f5fc1384574e842b6b5656a04893e666f502fdc3661e793f67081c5008402722eb5d9c5f5d47d52d63b95f854a4d3e5940fd8c43a5bb83d57c29deb4
-  data.tar.gz: 39e182c9fff334721aa613325cf6c526c3b392f829337c3bb3d53a876a28c8d8df12b428d11edc676c24ed9425af58c9d6b3070bfed9d9d3de875604efe0fee4
+  metadata.gz: d2d84b4f7f26d135da71393c9119b2d324d5e38224e5ed5f6015e8dab27c7097a5539edd5e29e8b7e2ccf8d0f0b8b0bfb1bf7044e5346e01e0e0481cf619099e
+  data.tar.gz: f935dc50f8163fe849d0dd27734e0cfaa8364ae2add5a61ec833e9c7ac211dabc87b9bcaef4d7f98c558d1a54756f0341af224167fd5f4f3eb9f0b65cf2d7658

data/bin/metababel

@@ -196,7 +196,7 @@ def parse_argv
     puts File.readlines(path)
     exit
   }
-
+  parser.on('--drop','[Optional] Drop unknow messages')
 
   options = { 'disable-callbaks': ['on_downstream'].to_set,
               'component-name': 'btx',

data/lib/metababel/version.rb

@@ -1,3 +1,3 @@
 module Metababel
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 end

data/shared/stripper.cpp

@@ -3,50 +3,89 @@
 #include <unordered_map>
 
 typedef std::unordered_map<const bt_stream *, const bt_message *> StreamToMessage_t;
+typedef std::unordered_map<const bt_packet *, const bt_message *> PacketToMessage_t;
 
-static void btx_initialize_usr_data(void **usr_data) { *usr_data = new StreamToMessage_t{}; }
+struct StreamToMessages_s {
+  StreamToMessage_t stream_beginning;
+  PacketToMessage_t packet_beginning;
+};
+typedef struct StreamToMessages_s StreamToMessages_t;
 
-static void btx_finalize_usr_data(void *usr_data) { delete ((StreamToMessage_t *)(usr_data)); }
+static void btx_initialize_usr_data(void **usr_data) { *usr_data = new StreamToMessages_t{}; }
+
+static void btx_finalize_usr_data(void *usr_data) { delete ((StreamToMessages_t *)(usr_data)); }
+
+static void push_associated_beginnings(void *btx_handle, StreamToMessages_t *h,
+                                       const bt_message *message) {
+
+  const bt_event *event = bt_message_event_borrow_event_const(message);
+  const bt_stream *stream = bt_event_borrow_stream_const(event);
+
+  auto it_stream = h->stream_beginning.find(stream);
+  if (it_stream != h->stream_beginning.end()) {
+    btx_push_message(btx_handle, it_stream->second);
+    h->stream_beginning.erase(it_stream);
+  }
+
+  if (bt_stream_class_supports_packets(bt_stream_borrow_class_const(stream))) {
+    const auto packet = bt_event_borrow_packet_const(event);
+    auto it_packet = h->packet_beginning.find(packet);
+    if (it_packet != h->packet_beginning.end()) {
+      btx_push_message(btx_handle, it_packet->second);
+      h->packet_beginning.erase(it_packet);
+    }
+  }
+}
+
+template <typename T>
+static void push_or_drop_message(void *btx_handle,
+                                 std::unordered_map<const T *, const bt_message *> &stm,
+                                 const T *key, const bt_message *message) {
+  auto it = stm.find(key);
+  if (it == stm.end()) {
+    btx_push_message(btx_handle, message);
+  } else {
+    bt_message_put_ref(message);
+    bt_message_put_ref(it->second);
+    stm.erase(it);
+  }
+}
 
 static void on_downstream_message_callback(void *btx_handle, void *usr_data,
                                            const bt_message *message) {
 
-  auto *h = (StreamToMessage_t *)usr_data;
+  auto *h = (StreamToMessages_t *)usr_data;
   switch (bt_message_get_type(message)) {
-  // Just forward the first message
+  // Save begins
   case (BT_MESSAGE_TYPE_STREAM_BEGINNING): {
     const bt_stream *stream = bt_message_stream_beginning_borrow_stream_const(message);
-    h->insert({stream, message});
+    h->stream_beginning.insert({stream, message});
     break;
   }
+  case (BT_MESSAGE_TYPE_PACKET_BEGINNING): {
+    const bt_packet *packet = bt_message_packet_beginning_borrow_packet_const(message);
+    h->packet_beginning.insert({packet, message});
+    break;
+  }
+  // Push event and associated beginnings
   case (BT_MESSAGE_TYPE_EVENT): {
-    // If required Pop and Push stream_begin message associated with the stream of the current
-    // message
-    const bt_event *event = bt_message_event_borrow_event_const(message);
-    const bt_stream *stream = bt_event_borrow_stream_const(event);
-    auto it = h->find(stream);
-    if (it != h->end()) {
-      btx_push_message(btx_handle, it->second);
-      h->erase(it);
-    }
+    push_associated_beginnings(btx_handle, h, message);
     btx_push_message(btx_handle, message);
     break;
   }
+  // Drop or push ends
+  case (BT_MESSAGE_TYPE_PACKET_END): {
+    const bt_packet *packet = bt_message_packet_end_borrow_packet_const(message);
+    push_or_drop_message(btx_handle, h->packet_beginning, packet, message);
+    break;
+  }
   case (BT_MESSAGE_TYPE_STREAM_END): {
     const bt_stream *stream = bt_message_stream_end_borrow_stream_const(message);
-    auto it = h->find(stream);
-    // Only send stream_end message if begin have been sent, if not drop
-    if (it == h->end()) {
-      btx_push_message(btx_handle, message);
-    } else {
-      bt_message_put_ref(message);
-      bt_message_put_ref(it->second);
-      h->erase(it);
-    }
+    push_or_drop_message(btx_handle, h->stream_beginning, stream, message);
     break;
   }
   default:
-    bt_message_put_ref(message);
+    btx_push_message(btx_handle, message);
   }
 }
 

data/template/filter.c.erb

@@ -118,8 +118,15 @@ static inline void filter_message_iterator_next_call_dispatchers(
     bt_message_put_ref(upstream_message);
   } else {
     /* Push upstream message to downstream */
-    btx_downstream_push_message(message_iterator_private_data,
-                                upstream_message);
+    <% if options[:drop] %>
+      /* Drop message. Including PACKET_{BEGIN,END} messages.
+       * It's ok as ALL message will be drop, so we will never get
+       * any EVENT without BEGIN */
+      bt_message_put_ref(upstream_message);
+    <% else %>
+      btx_downstream_push_message(message_iterator_private_data,
+                                  upstream_message);
+    <% end %>
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metababel
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Thomas Applencourt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: