#include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/un.h>
+#include <stdbool.h>
#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
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,
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_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,
};
enum lttcomm_relayd_command {
RELAYD_LIST_SESSIONS = 15,
/* All streams of the channel have been sent to the relayd (2.4+). */
RELAYD_STREAMS_SENT = 16,
+ /* Ask the relay to reset the metadata trace file (2.8+) */
+ RELAYD_RESET_METADATA = 17,
};
/*
struct lttcomm_sock sock;
uint32_t major;
uint32_t minor;
+ /* The number of bytes to ignore on the next receive. */
+ size_t bytes_to_ignore_on_recv;
} LTTNG_PACKED;
struct lttcomm_net_family {
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;
} u;
} LTTNG_PACKED;
#define LTTNG_EVENT_EXCLUSION_NAME_AT(_exclusion, _i) \
(&(_exclusion)->names[_i][0])
+/*
+ * Event command header.
+ */
+struct lttcomm_event_command_header {
+ /* Number of events */
+ uint32_t nb_events;
+} LTTNG_PACKED;
+
+/*
+ * Event extended info header. This is the structure preceding each
+ * extended info data.
+ */
+struct lttcomm_event_extended_header {
+ /*
+ * Size of filter string immediately following this header.
+ * This size includes the terminal null character.
+ */
+ uint32_t filter_len;
+
+ /*
+ * Number of exclusion names, immediately following the filter
+ * string. Each exclusion name has a fixed length of
+ * LTTNG_SYMBOL_NAME_LEN bytes, including the terminal null
+ * character.
+ */
+ uint32_t nb_exclusions;
+} LTTNG_PACKED;
+
+/*
+ * Channel extended info.
+ */
+struct lttcomm_channel_extended {
+ uint64_t discarded_events;
+ uint64_t lost_packets;
+} LTTNG_PACKED;
+
+/*
+ * 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.
*/
uint32_t monitor;
/* timer to check the streams usage in live mode (usec). */
unsigned int live_timer_interval;
+ /* is part of a live session */
+ uint8_t is_live;
} LTTNG_PACKED channel; /* Only used by Kernel. */
struct {
uint64_t stream_key;
uint32_t switch_timer_interval; /* usec */
uint32_t read_timer_interval; /* usec */
unsigned int live_timer_interval; /* usec */
+ uint8_t is_live; /* is part of a live session */
int32_t output; /* splice, mmap */
int32_t type; /* metadata or per_cpu */
uint64_t session_id; /* Tracing session id */
uint64_t key; /* Metadata channel key. */
uint64_t target_offset; /* Offset in the consumer */
uint64_t len; /* Length of metadata to be received. */
+ uint64_t version; /* Version of the metadata. */
} LTTNG_PACKED push_metadata;
struct {
uint64_t key; /* Metadata channel key. */
struct {
uint64_t key; /* Channel key. */
} LTTNG_PACKED flush_channel;
+ struct {
+ uint64_t key; /* Channel key. */
+ } LTTNG_PACKED stop_live_timer;
+ struct {
+ uint64_t key; /* Channel key. */
+ } LTTNG_PACKED start_live_timer;
+ 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. */
uint64_t channel_key;
uint64_t net_seq_idx;
} LTTNG_PACKED sent_streams;
+ struct {
+ uint64_t session_id;
+ uint64_t channel_key;
+ } LTTNG_PACKED discarded_events;
+ struct {
+ uint64_t session_id;
+ uint64_t channel_key;
+ } LTTNG_PACKED lost_packets;
+ struct {
+ uint64_t session_id;
+ } LTTNG_PACKED regenerate_metadata;
} u;
} LTTNG_PACKED;