#include <common/compat/socket.h>
#include <common/uri.h>
#include <common/defaults.h>
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
#include <common/macros.h>
#include <common/optional.h>
/* 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,
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 {
RELAYD_STREAMS_SENT = 16,
/* Ask the relay to reset the metadata trace file (2.8+) */
RELAYD_RESET_METADATA = 17,
- /* Ask the relay to rotate a stream file (2.11+) */
- RELAYD_ROTATE_STREAM = 18,
- /* Rename a chunk after the rotation is completed (2.11+) */
- RELAYD_ROTATE_RENAME = 19,
- /* Check if a chunk has data pending (2.11+) */
- RELAYD_ROTATE_PENDING = 20,
- /* Create a folder on the relayd FS (2.11+) */
- RELAYD_MKDIR = 21,
+ /* Ask the relay to rotate a set of stream files (2.11+) */
+ RELAYD_ROTATE_STREAMS = 18,
+ /* Ask the relay to create a trace chunk (2.11+) */
+ RELAYD_CREATE_TRACE_CHUNK = 19,
+ /* Ask the relay to close a trace chunk (2.11+) */
+ 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. */
};
/*
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 */
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;
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.
*/
uint64_t channel_key;
uint64_t session_id;
/* ID of the session's current trace chunk. */
- LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED chunk_id;
+ LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED chunk_id;
char pathname[PATH_MAX];
uint64_t relayd_id;
/* nb_init_streams is the number of streams open initially. */
uint64_t relayd_id; /* Relayd id if apply. */
uint64_t key; /* Unique channel key. */
/* ID of the session's current trace chunk. */
- LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED chunk_id;
- unsigned char uuid[UUID_LEN]; /* uuid for ust tracer. */
+ LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED chunk_id;
+ unsigned char uuid[LTTNG_UUID_LEN]; /* uuid for ust tracer. */
uint32_t chan_id; /* Channel ID on the tracer side. */
uint64_t tracefile_size; /* bytes */
uint32_t tracefile_count; /* number of tracefiles */
* (relayd_id unset).
*
* `override_name` is left NULL (all-zeroes) if the
- * chunk's name is not overriden.
+ * chunk's name is not overridden.
*/
- LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED relayd_id;
+ LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED relayd_id;
char override_name[LTTNG_NAME_MAX];
uint64_t session_id;
uint64_t chunk_id;
uint64_t creation_timestamp;
- struct {
+ LTTNG_OPTIONAL_COMM(struct {
uint32_t uid;
uint32_t gid;
- } LTTNG_PACKED credentials;
+ } LTTNG_PACKED ) LTTNG_PACKED credentials;
} LTTNG_PACKED create_trace_chunk;
struct {
- LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED relayd_id;
+ LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED relayd_id;
uint64_t session_id;
uint64_t chunk_id;
uint64_t close_timestamp;
+ /* enum lttng_trace_chunk_command_type */
+ LTTNG_OPTIONAL_COMM(uint32_t) LTTNG_PACKED close_command;
} LTTNG_PACKED close_trace_chunk;
struct {
- LTTNG_OPTIONAL(uint64_t) LTTNG_PACKED relayd_id;
+ LTTNG_OPTIONAL_COMM(uint64_t) LTTNG_PACKED relayd_id;
uint64_t session_id;
uint64_t chunk_id;
} LTTNG_PACKED trace_chunk_exists;
struct {
lttng_uuid sessiond_uuid;
} LTTNG_PACKED init;
+ struct {
+ uint64_t key;
+ } LTTNG_PACKED clear_channel;
} u;
} LTTNG_PACKED;
unsigned int stream_count;
} LTTNG_PACKED;
+struct lttcomm_consumer_close_trace_chunk_reply {
+ enum lttcomm_return_code ret_code;
+ uint32_t path_length;
+ char path[];
+};
+
#ifdef HAVE_LIBLTTNG_UST_CTL
#include <lttng/ust-abi.h>