X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=f6179f31dc5132838516b5c75021d32eeecd6ada;hp=344ba508dc0d109608506aafc25f97f1abef927d;hb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc;hpb=93ec662e687dc15a3601704a1e0c96c51ad228c9

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 344ba508d..f6179f31d 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -29,6 +29,8 @@
 #include <lttng/lttng.h>
 #include <lttng/snapshot-internal.h>
 #include <lttng/save-internal.h>
+#include <lttng/channel-internal.h>
+#include <lttng/trigger/trigger-internal.h>
 #include <common/compat/socket.h>
 #include <common/uri.h>
 #include <common/defaults.h>
@@ -40,7 +42,7 @@
 
 #include "inet.h"
 #include "inet6.h"
-#include "unix.h"
+#include <common/unix.h>
 
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
@@ -56,7 +58,7 @@
 enum lttcomm_sessiond_command {
 	/* Tracer command */
 	LTTNG_ADD_CONTEXT                   = 0,
-	LTTNG_CALIBRATE                     = 1,
+	/* LTTNG_CALIBRATE used to be here */
 	LTTNG_DISABLE_CHANNEL               = 2,
 	LTTNG_DISABLE_EVENT                 = 3,
 	LTTNG_LIST_SYSCALLS                 = 4,
@@ -94,7 +96,10 @@ enum lttcomm_sessiond_command {
 	LTTNG_UNTRACK_PID                   = 33,
 	LTTNG_LIST_TRACKER_PIDS             = 34,
 	LTTNG_SET_SESSION_SHM_PATH          = 40,
-	LTTNG_METADATA_REGENERATE           = 41,
+	LTTNG_REGENERATE_METADATA           = 41,
+	LTTNG_REGENERATE_STATEDUMP          = 42,
+	LTTNG_REGISTER_TRIGGER              = 43,
+	LTTNG_UNREGISTER_TRIGGER            = 44,
 };
 
 enum lttcomm_relayd_command {
@@ -145,6 +150,7 @@ enum lttcomm_return_code {
 	LTTCOMM_CONSUMERD_RELAYD_FAIL,              /* Error on remote relayd */
 	LTTCOMM_CONSUMERD_CHANNEL_FAIL,             /* Channel creation failed. */
 	LTTCOMM_CONSUMERD_CHAN_NOT_FOUND,           /* Channel not found. */
+	LTTCOMM_CONSUMERD_ALREADY_SET,              /* Resource already set. */
 
 	/* MUST be last element */
 	LTTCOMM_NR,						/* Last element */
@@ -268,6 +274,8 @@ struct lttcomm_session_msg {
 		/* Create channel */
 		struct {
 			struct lttng_channel chan LTTNG_PACKED;
+			/* struct lttng_channel_extended is already packed. */
+			struct lttng_channel_extended extended;
 		} LTTNG_PACKED channel;
 		/* Context */
 		struct {
@@ -310,6 +318,9 @@ struct lttcomm_session_msg {
 		struct {
 			uint32_t pid;
 		} LTTNG_PACKED pid_tracker;
+		struct {
+			uint32_t length;
+		} LTTNG_PACKED trigger;
 	} u;
 } LTTNG_PACKED;
 
@@ -372,14 +383,6 @@ struct lttcomm_event_extended_header {
 	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.
  */
@@ -422,6 +425,8 @@ struct lttcomm_consumer_msg {
 			uint32_t monitor;
 			/* timer to check the streams usage in live mode (usec). */
 			unsigned int live_timer_interval;
+			/* timer to sample a channel's positions (usec). */
+			unsigned int monitor_timer_interval;
 		} LTTNG_PACKED channel; /* Only used by Kernel. */
 		struct {
 			uint64_t stream_key;
@@ -452,7 +457,8 @@ struct lttcomm_consumer_msg {
 			int32_t overwrite;			/* 1: overwrite, 0: discard */
 			uint32_t switch_timer_interval;		/* usec */
 			uint32_t read_timer_interval;		/* usec */
-			unsigned int live_timer_interval;		/* usec */
+			unsigned int live_timer_interval;	/* usec */
+			uint32_t monitor_timer_interval;	/* usec */
 			int32_t output;				/* splice, mmap */
 			int32_t type;				/* metadata or per_cpu */
 			uint64_t session_id;			/* Tracing session id */
@@ -500,6 +506,9 @@ struct lttcomm_consumer_msg {
 		struct {
 			uint64_t key;	/* Channel key. */
 		} LTTNG_PACKED flush_channel;
+		struct {
+			uint64_t key;	/* Channel key. */
+		} LTTNG_PACKED clear_quiescent_channel;
 		struct {
 			char pathname[PATH_MAX];
 			/* Indicate if the snapshot goes on the relayd or locally. */
@@ -523,10 +532,23 @@ struct lttcomm_consumer_msg {
 		} LTTNG_PACKED lost_packets;
 		struct {
 			uint64_t session_id;
-		} LTTNG_PACKED metadata_regenerate;
+		} LTTNG_PACKED regenerate_metadata;
 	} u;
 } LTTNG_PACKED;
 
+/*
+ * Channel monitoring message returned to the session daemon on every
+ * monitor timer expiration.
+ */
+struct lttcomm_consumer_channel_monitor_msg {
+	/* Key of the sampled channel. */
+	uint64_t key;
+	/*
+	 * Lowest and highest usage (bytes) at the moment the sample was taken.
+	 */
+	uint64_t lowest, highest;
+} LTTNG_PACKED;
+
 /*
  * Status message returned to the sessiond after a received command.
  */