Cleanup: remove duplicated implementation of rculfhash

[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 87bdfd293b35fec09b0df7a446c65904a3b8184c..1e51ae12352af6334c9293c013e8064027e9fe04 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -60,10 +60,10 @@ enum lttcomm_sessiond_command {
        LTTNG_CALIBRATE                     = 1,
        LTTNG_DISABLE_CHANNEL               = 2,
        LTTNG_DISABLE_EVENT                 = 3,
-       LTTNG_DISABLE_ALL_EVENT             = 4,
+       LTTNG_LIST_SYSCALLS                 = 4,
        LTTNG_ENABLE_CHANNEL                = 5,
        LTTNG_ENABLE_EVENT                  = 6,
-       LTTNG_ENABLE_ALL_EVENT              = 7,
+       /* 7 */
        /* Session daemon command */
        LTTNG_CREATE_SESSION                = 8,
        LTTNG_DESTROY_SESSION               = 9,
@@ -91,6 +91,10 @@ enum lttcomm_sessiond_command {
        LTTNG_CREATE_SESSION_SNAPSHOT       = 29,
        LTTNG_CREATE_SESSION_LIVE           = 30,
        LTTNG_SAVE_SESSION                  = 31,
+       LTTNG_TRACK_PID                     = 32,
+       LTTNG_UNTRACK_PID                   = 33,
+       LTTNG_LIST_TRACKER_PIDS             = 34,
+       LTTNG_SET_SESSION_SHM_PATH          = 40,
 };
 
 enum lttcomm_relayd_command {
@@ -138,6 +142,7 @@ enum lttcomm_return_code {
        LTTCOMM_CONSUMERD_FATAL,                    /* Fatal error. */
        LTTCOMM_CONSUMERD_RELAYD_FAIL,              /* Error on remote relayd */
        LTTCOMM_CONSUMERD_CHANNEL_FAIL,             /* Channel creation failed. */
+       LTTCOMM_CONSUMERD_CHAN_NOT_FOUND,           /* Channel not found. */
 
        /* MUST be last element */
        LTTCOMM_NR,                                             /* Last element */
@@ -226,10 +231,6 @@ struct lttcomm_session_msg {
        struct lttng_session session;
        struct lttng_domain domain;
        union {
-               struct {
-                       char channel_name[LTTNG_SYMBOL_NAME_LEN];
-                       char name[NAME_MAX];
-               } LTTNG_PACKED disable;
                /* Event data */
                struct {
                        char channel_name[LTTNG_SYMBOL_NAME_LEN];
@@ -248,6 +249,20 @@ struct lttcomm_session_msg {
                         * - unsigned char filter_bytecode[bytecode_len]
                         */
                } LTTNG_PACKED enable;
+               struct {
+                       char channel_name[LTTNG_SYMBOL_NAME_LEN];
+                       struct lttng_event event LTTNG_PACKED;
+                       /* Length of following filter expression. */
+                       uint32_t expression_len;
+                       /* Length of following bytecode for filter. */
+                       uint32_t bytecode_len;
+                       /*
+                        * After this structure, the following variable-length
+                        * items are transmitted:
+                        * - unsigned char filter_expression[expression_len]
+                        * - unsigned char filter_bytecode[bytecode_len]
+                        */
+               } LTTNG_PACKED disable;
                /* Create channel */
                struct {
                        struct lttng_channel chan LTTNG_PACKED;
@@ -285,6 +300,12 @@ struct lttcomm_session_msg {
                struct {
                        struct lttng_save_session_attr attr; /* struct already packed */
                } LTTNG_PACKED save_session;
+               struct {
+                       char shm_path[PATH_MAX];
+               } LTTNG_PACKED set_shm_path;
+               struct {
+                       uint32_t pid;
+               } LTTNG_PACKED pid_tracker;
        } u;
 } LTTNG_PACKED;
 
@@ -413,6 +434,8 @@ struct lttcomm_consumer_msg {
                         * because the application can be in the tracing for instance.
                         */
                        uint32_t ust_app_uid;
+                       char root_shm_path[PATH_MAX];
+                       char shm_path[PATH_MAX];
                } LTTNG_PACKED ask_channel;
                struct {
                        uint64_t key;
@@ -441,7 +464,7 @@ struct lttcomm_consumer_msg {
                        uint32_t metadata;              /* This a metadata snapshot. */
                        uint64_t relayd_id;             /* Relayd id if apply. */
                        uint64_t key;
-                       uint64_t max_stream_size;
+                       uint64_t nb_packets_per_stream;
                } LTTNG_PACKED snapshot_channel;
                struct {
                        uint64_t channel_key;