trackers: support tracking feature

[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 8c2a47538535e2e190a0d72c77b0d8d9b80f9cf9..034ba3697cf4db5cf930d57e122557d0e14a734f 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -95,9 +95,9 @@ enum lttcomm_sessiond_command {
        /* 29 */
        /* 30 */
        LTTNG_SAVE_SESSION                    = 31,
-       LTTNG_TRACK_PID                       = 32,
-       LTTNG_UNTRACK_PID                     = 33,
-       LTTNG_LIST_TRACKER_PIDS               = 34,
+       LTTNG_TRACK_ID                       = 32,
+       LTTNG_UNTRACK_ID                     = 33,
+       LTTNG_LIST_TRACKER_IDS               = 34,
        LTTNG_SET_SESSION_SHM_PATH            = 40,
        LTTNG_REGENERATE_METADATA             = 41,
        LTTNG_REGENERATE_STATEDUMP            = 42,
@@ -107,7 +107,8 @@ enum lttcomm_sessiond_command {
        LTTNG_ROTATION_GET_INFO               = 46,
        LTTNG_ROTATION_SET_SCHEDULE           = 47,
        LTTNG_SESSION_LIST_ROTATION_SCHEDULES = 48,
-       LTTNG_CREATE_SESSION_EXT              = 49
+       LTTNG_CREATE_SESSION_EXT              = 49,
+       LTTNG_CLEAR_SESSION                   = 50,
 };
 
 enum lttcomm_relayd_command {
@@ -139,6 +140,10 @@ enum lttcomm_relayd_command {
        RELAYD_CLOSE_TRACE_CHUNK            = 20,
        /* Ask the relay whether a trace chunk exists (2.11+) */
        RELAYD_TRACE_CHUNK_EXISTS           = 21,
+       /* Get the current configuration of a relayd peer (2.12+) */
+       RELAYD_GET_CONFIGURATION            = 22,
+
+       /* Feature branch specific commands start at 10000. */
 };
 
 /*
@@ -181,6 +186,7 @@ enum lttcomm_return_code {
        LTTCOMM_CONSUMERD_TRACE_CHUNK_EXISTS_LOCAL, /* Trace chunk exists on consumer daemon. */
        LTTCOMM_CONSUMERD_TRACE_CHUNK_EXISTS_REMOTE,/* Trace chunk exists on relay daemon. */
        LTTCOMM_CONSUMERD_UNKNOWN_TRACE_CHUNK,      /* Unknown trace chunk. */
+       LTTCOMM_CONSUMERD_RELAYD_CLEAR_DISALLOWED,  /* Relayd does not accept clear command. */
 
        /* MUST be last element */
        LTTCOMM_NR,                                             /* Last element */
@@ -348,8 +354,21 @@ struct lttcomm_session_msg {
                        char shm_path[PATH_MAX];
                } LTTNG_PACKED set_shm_path;
                struct {
-                       uint32_t pid;
-               } LTTNG_PACKED pid_tracker;
+                       uint32_t tracker_type; /* enum lttng_tracker_type */
+                       uint32_t id_type; /* enum lttng_tracker_id_type */
+                       union {
+                               int32_t value;
+                               uint32_t var_len;
+                       } u;
+                       /*
+                        * for LTTNG_ID_STRING, followed by a variable length
+                        * zero-terminated string of length "var_len", which
+                        * includes the final \0.
+                        */
+               } LTTNG_PACKED id_tracker;
+               struct {
+                       uint32_t tracker_type; /* enum lttng_tracker_type */
+               } LTTNG_PACKED id_tracker_list;
                struct {
                        uint32_t length;
                } LTTNG_PACKED trigger;
@@ -453,6 +472,21 @@ struct lttcomm_session_destroy_command_header {
        int32_t rotation_state;
 };
 
+/*
+ * tracker command header.
+ */
+struct lttcomm_tracker_command_header {
+       uint32_t nb_tracker_id;
+} LTTNG_PACKED;
+
+struct lttcomm_tracker_id_header {
+       uint32_t type; /* enum lttng_tracker_id_type */
+       union {
+               int32_t value;
+               uint32_t var_data_len;
+       } u;
+} LTTNG_PACKED;
+
 /*
  * Data structure for the response from sessiond to the lttng client.
  */
@@ -660,6 +694,9 @@ struct lttcomm_consumer_msg {
                struct {
                        lttng_uuid sessiond_uuid;
                } LTTNG_PACKED init;
+               struct {
+                       uint64_t key;
+               } LTTNG_PACKED clear_channel;
        } u;
 } LTTNG_PACKED;