Consumer: strip ring buffer header when consuming ctf2 ring buffer packet

[deliverable/lttng-tools.git] / src / common / consumer / consumer.hpp

diff --git a/src/common/consumer/consumer.hpp b/src/common/consumer/consumer.hpp
index 44dd5d1bb4582d5e740499c89f925db9ddd6b30e..891b650b53ef0cb37630d34cba848e2fef5feaba 100644 (file)
--- a/src/common/consumer/consumer.hpp
+++ b/src/common/consumer/consumer.hpp
@@ -253,6 +253,9 @@ struct lttng_consumer_channel {
        uint64_t lost_packets;
 
        bool streams_sent_to_relayd;
+       uint64_t last_consumed_size_sample_sent;
+
+       int trace_format;
 };
 
 struct stream_subbuffer {
@@ -345,8 +348,7 @@ typedef int (*extract_subbuffer_info_cb)(
  *
  * Stream and channel locks are acquired during this call.
  */
-typedef int (*pre_consume_subbuffer_cb)(struct lttng_consumer_stream *,
-               const struct stream_subbuffer *);
+typedef int (*pre_consume_subbuffer_cb)(struct lttng_consumer_stream *, struct stream_subbuffer *);
 
 /*
  * Consume subbuffer contents.
@@ -972,7 +974,8 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
                unsigned int live_timer_interval,
                bool is_in_live_session,
                const char *root_shm_path,
-               const char *shm_path);
+               const char *shm_path,
+               int trace_format);
 void consumer_del_stream(struct lttng_consumer_stream *stream,
                struct lttng_ht *ht);
 void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,