Propagate trace format all the way to the consumer

[lttng-tools.git] / src / common / sessiond-comm / sessiond-comm.hpp

diff --git a/src/common/sessiond-comm/sessiond-comm.hpp b/src/common/sessiond-comm/sessiond-comm.hpp
index ae3111855468f19a1c5551fd2f802e026694a88a..f5e55ec34e1e7557fbaf1ded64981a9799c1a44d 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.hpp
+++ b/src/common/sessiond-comm/sessiond-comm.hpp
@@ -667,6 +667,7 @@ struct lttcomm_consumer_msg {
                        uint8_t is_live;
                        /* timer to sample a channel's positions (usec). */
                        unsigned int monitor_timer_interval;
+                       int trace_format;
                } LTTNG_PACKED channel; /* Only used by Kernel. */
                struct {
                        uint64_t stream_key;
@@ -732,6 +733,7 @@ struct lttcomm_consumer_msg {
                        int64_t blocking_timeout;
                        char root_shm_path[PATH_MAX];
                        char shm_path[PATH_MAX];
+                       int trace_format;
                } LTTNG_PACKED ask_channel;
                struct {
                        uint64_t key;
@@ -830,7 +832,7 @@ struct lttcomm_consumer_msg {
                        uint64_t chunk_id;
                } LTTNG_PACKED trace_chunk_exists;
                struct {
-                       lttng_uuid sessiond_uuid;
+                       uint8_t sessiond_uuid[LTTNG_UUID_LEN];
                } LTTNG_PACKED init;
                struct {
                        uint64_t key;
@@ -848,6 +850,8 @@ struct lttcomm_consumer_msg {
 struct lttcomm_consumer_channel_monitor_msg {
        /* Key of the sampled channel. */
        uint64_t key;
+       /* Id of the sampled channel's session. */
+       uint64_t session_id;
        /*
         * Lowest and highest usage (bytes) at the moment the sample was taken.
         */
@@ -855,7 +859,7 @@ struct lttcomm_consumer_channel_monitor_msg {
        /*
         * Sum of all the consumed positions for a channel.
         */
-       uint64_t total_consumed;
+       uint64_t consumed_since_last_sample;
 } LTTNG_PACKED;
 
 /*