X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=034ba3697cf4db5cf930d57e122557d0e14a734f;hp=cf50f0e44515573c81ce2d13b58ffd3711b6f579;hb=55c9e7cac24318259d4f2549c97f7577b7b52db4;hpb=b01b201a053f492b09bde7e970d950ad636eb75c

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index cf50f0e44..034ba3697 100644
--- 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,
@@ -140,6 +140,8 @@ 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. */
 };
@@ -352,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;
@@ -457,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.
  */