Store the relay protocol version in the consumer_output

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

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index ec7d36ae50d07d021738d635a44267d7de84fc03..a60fc4506a9c63b42cc36300a79e08b125e69802 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -341,6 +341,42 @@ struct lttng_event_exclusion {
 #define LTTNG_EVENT_EXCLUSION_NAME_AT(_exclusion, _i) \
        (&(_exclusion)->names[_i][0])
 
+/*
+ * Event command header.
+ */
+struct lttcomm_event_command_header {
+       /* Number of events */
+       uint32_t nb_events;
+} LTTNG_PACKED;
+
+/*
+ * Event extended info header. This is the structure preceding each
+ * extended info data.
+ */
+struct lttcomm_event_extended_header {
+       /*
+        * Size of filter string immediately following this header.
+        * This size includes the terminal null character.
+        */
+       uint32_t filter_len;
+
+       /*
+        * Number of exclusion names, immediately following the filter
+        * string. Each exclusion name has a fixed length of
+        * LTTNG_SYMBOL_NAME_LEN bytes, including the terminal null
+        * character.
+        */
+       uint32_t nb_exclusions;
+} LTTNG_PACKED;
+
+/*
+ * Channel extended info.
+ */
+struct lttcomm_channel_extended {
+       uint64_t discarded_events;
+       uint64_t lost_packets;
+} LTTNG_PACKED;
+
 /*
  * Data structure for the response from sessiond to the lttng client.
  */
@@ -348,9 +384,8 @@ struct lttcomm_lttng_msg {
        uint32_t cmd_type;      /* enum lttcomm_sessiond_command */
        uint32_t ret_code;      /* enum lttcomm_return_code */
        uint32_t pid;           /* pid_t */
+       uint32_t cmd_header_size;
        uint32_t data_size;
-       /* Contains: trace_name + data */
-       char payload[];
 } LTTNG_PACKED;
 
 struct lttcomm_lttng_output_id {
@@ -474,6 +509,14 @@ struct lttcomm_consumer_msg {
                        uint64_t channel_key;
                        uint64_t net_seq_idx;
                } LTTNG_PACKED sent_streams;
+               struct {
+                       uint64_t session_id;
+                       uint64_t channel_key;
+               } LTTNG_PACKED discarded_events;
+               struct {
+                       uint64_t session_id;
+                       uint64_t channel_key;
+               } LTTNG_PACKED lost_packets;
        } u;
 } LTTNG_PACKED;