#include <limits.h>
#include <lttng/lttng.h>
#include <lttng/snapshot-internal.h>
+#include <lttng/save-internal.h>
#include <common/compat/socket.h>
#include <common/uri.h>
#include <common/defaults.h>
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,
LTTNG_DISABLE_CONSUMER = 19,
LTTNG_ENABLE_CONSUMER = 20,
LTTNG_SET_CONSUMER_URI = 21,
- LTTNG_ENABLE_EVENT_WITH_FILTER = 22,
- LTTNG_HEALTH_CHECK = 23,
+ /* 22 */
+ /* 23 */
LTTNG_DATA_PENDING = 24,
LTTNG_SNAPSHOT_ADD_OUTPUT = 25,
LTTNG_SNAPSHOT_DEL_OUTPUT = 26,
LTTNG_SNAPSHOT_RECORD = 28,
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 {
RELAYD_ADD_INDEX = 12,
RELAYD_SEND_INDEX = 13,
RELAYD_CLOSE_INDEX = 14,
+ /* Live-reading commands (2.4+). */
+ RELAYD_LIST_SESSIONS = 15,
+ /* All streams of the channel have been sent to the relayd (2.4+). */
+ RELAYD_STREAMS_SENT = 16,
};
/*
* lttcomm error code.
*/
enum lttcomm_return_code {
+ LTTCOMM_CONSUMERD_SUCCESS = 0, /* Everything went fine. */
LTTCOMM_CONSUMERD_COMMAND_SOCK_READY = 1, /* Command socket ready */
LTTCOMM_CONSUMERD_SUCCESS_RECV_FD, /* Success on receiving fds */
LTTCOMM_CONSUMERD_ERROR_RECV_FD, /* Error on receiving fds */
LTTCOMM_CONSUMERD_ERROR_METADATA, /* Error with metadata. */
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 */
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];
- struct lttng_event event;
+ 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;
+ /* exclusion data */
+ uint32_t exclusion_count;
+ /*
+ * After this structure, the following variable-length
+ * items are transmitted:
+ * - char exclusion_names[LTTNG_SYMBOL_NAME_LEN][exclusion_count]
+ * - unsigned char filter_expression[expression_len]
+ * - 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;
+ struct lttng_channel chan LTTNG_PACKED;
} LTTNG_PACKED channel;
/* Context */
struct {
char channel_name[LTTNG_SYMBOL_NAME_LEN];
- struct lttng_event_context ctx;
+ struct lttng_event_context ctx LTTNG_PACKED;
} LTTNG_PACKED context;
/* Use by register_consumer */
struct {
uint32_t size;
} LTTNG_PACKED uri;
struct {
- struct lttng_snapshot_output output;
+ struct lttng_snapshot_output output LTTNG_PACKED;
} LTTNG_PACKED snapshot_output;
struct {
uint32_t wait;
- struct lttng_snapshot_output output;
+ struct lttng_snapshot_output output LTTNG_PACKED;
} LTTNG_PACKED snapshot_record;
struct {
uint32_t nb_uri;
unsigned int timer_interval; /* usec */
} LTTNG_PACKED session_live;
+ 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;
char data[0];
} LTTNG_PACKED;
+/*
+ * Event exclusion data. At the end of the structure, there will actually
+ * by zero or more names, where the actual number of names is given by
+ * the 'count' item of the structure.
+ */
+#define LTTNG_EVENT_EXCLUSION_PADDING 32
+struct lttng_event_exclusion {
+ uint32_t count;
+ char padding[LTTNG_EVENT_EXCLUSION_PADDING];
+ char names[LTTNG_SYMBOL_NAME_LEN][0];
+} LTTNG_PACKED;
+
/*
* Data structure for the response from sessiond to the lttng client.
*/
uint32_t id;
} LTTNG_PACKED;
-struct lttcomm_health_msg {
- uint32_t component;
- uint32_t cmd;
-} LTTNG_PACKED;
-
-struct lttcomm_health_data {
- uint32_t ret_code;
-} LTTNG_PACKED;
-
/*
* lttcomm_consumer_msg is the message sent from sessiond to consumerd
* to either add a channel, add a stream, update a stream, or stop
struct lttcomm_relayd_sock sock;
/* Tracing session id associated to the relayd. */
uint64_t session_id;
+ /* Relayd session id, only used with control socket. */
+ uint64_t relayd_session_id;
} LTTNG_PACKED relayd_sock;
struct {
uint64_t net_seq_idx;
* 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;
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;
+ uint64_t net_seq_idx;
+ } LTTNG_PACKED sent_streams;
} u;
} LTTNG_PACKED;
* Status message returned to the sessiond after a received command.
*/
struct lttcomm_consumer_status_msg {
- enum lttng_error_code ret_code;
+ enum lttcomm_return_code ret_code;
} LTTNG_PACKED;
struct lttcomm_consumer_status_channel {
- enum lttng_error_code ret_code;
+ enum lttcomm_return_code ret_code;
uint64_t key;
unsigned int stream_count;
} LTTNG_PACKED;
projects / lttng-tools.git / blobdiff