#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>
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,
};
/*
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;
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>