Pass lttng_event struct to the set_filter API call

[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 5d2fa36a8b02fa9b7417b92c87a49b5a742c384f..41f96d8a4288c355d60df2655bbd04b135102f79 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -30,6 +30,7 @@
 #include <lttng/lttng.h>
 #include <common/compat/socket.h>
 #include <common/uri.h>
+#include <common/defaults.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -85,8 +86,11 @@ enum lttcomm_sessiond_command {
        RELAYD_VERSION,
        RELAYD_SEND_METADATA,
        RELAYD_CLOSE_STREAM,
+       RELAYD_DATA_PENDING,
+       RELAYD_QUIESCENT_CONTROL,
        LTTNG_SET_FILTER,
        LTTNG_HEALTH_CHECK,
+       LTTNG_DATA_PENDING,
 };
 
 /*
@@ -182,7 +186,6 @@ struct lttcomm_session_msg {
                /* Context */
                struct {
                        char channel_name[LTTNG_SYMBOL_NAME_LEN];
-                       char event_name[LTTNG_SYMBOL_NAME_LEN];
                        struct lttng_event_context ctx;
                } context;
                /* Use by register_consumer */
@@ -201,7 +204,7 @@ struct lttcomm_session_msg {
                } uri;
                struct {
                        char channel_name[LTTNG_SYMBOL_NAME_LEN];
-                       char event_name[LTTNG_SYMBOL_NAME_LEN];
+                       struct lttng_event event;
                        /* Length of following bytecode */
                        uint32_t bytecode_len;
                } filter;
@@ -218,6 +221,7 @@ struct lttcomm_session_msg {
 struct lttng_filter_bytecode {
        uint32_t len;   /* len of data */
        uint32_t reloc_table_offset;
+       uint64_t seqnum;
        char data[0];
 };
 
@@ -271,7 +275,7 @@ struct lttcomm_consumer_msg {
                        char path_name[PATH_MAX];
                        int net_index;
                        unsigned int metadata_flag;
-                       char name[LTTNG_SYMBOL_NAME_LEN];  /* Name string of the stream */
+                       char name[DEFAULT_STREAM_NAME_LEN];  /* Name string of the stream */
                        uint64_t session_id;   /* Tracing session id of the stream */
                } stream;
                struct {
@@ -285,7 +289,7 @@ struct lttcomm_consumer_msg {
                } destroy_relayd;
                struct {
                        uint64_t session_id;
-               } data_available;
+               } data_pending;
        } u;
 };