struct snapshot;
struct snapshot_output;
+struct ltt_session;
enum consumer_dst_type {
CONSUMER_DST_LOCAL,
struct consumer_data {
enum lttng_consumer_type type;
- pthread_t thread; /* Worker thread interacting with the consumer */
-
- /* Conditions used by the consumer thread to indicate readiness. */
- pthread_cond_t cond;
- pthread_condattr_t condattr;
- pthread_mutex_t cond_mutex;
-
- /*
- * This is a flag condition indicating that the consumer thread is ready
- * and connected to the lttng-consumerd daemon. This flag MUST only be
- * updated by locking the condition mutex above or before spawning a
- * consumer thread.
- *
- * A value of 0 means that the thread is NOT ready. A value of 1 means that
- * the thread consumer did connect successfully to the lttng-consumerd
- * daemon. A negative value indicates that there is been an error and the
- * thread has likely quit.
- */
- int consumer_thread_is_ready;
-
/* Mutex to control consumerd pid assignation */
pthread_mutex_t pid_mutex;
pid_t pid;
* consumer.
*/
int channel_monitor_pipe;
- /*
- * Write-end of the channel rotation pipe to be passed to the
- * consumer.
- */
- int channel_rotate_pipe;
/*
* The metadata socket object is handled differently and only created
* locally in this object thus it's the only reference available in the
/*
* Subdirectory path name used for both local and network
- * consumer (/kernel or /ust).
+ * consumer ("/kernel", "/ust", or empty).
*/
- char subdir[LTTNG_PATH_MAX];
+ char domain_subdir[max(sizeof(DEFAULT_KERNEL_TRACE_DIR),
+ sizeof(DEFAULT_UST_TRACE_DIR))];
/*
* Hashtable of consumer_socket index by the file descriptor value. For
- * multiarch consumer support, we can have more than one consumer (ex: 32
- * and 64 bit).
+ * multiarch consumer support, we can have more than one consumer (ex:
+ * 32 and 64 bit).
*/
struct lttng_ht *socks;
struct consumer_output *consumer_copy_output(struct consumer_output *obj);
void consumer_output_get(struct consumer_output *obj);
void consumer_output_put(struct consumer_output *obj);
-int consumer_set_network_uri(struct consumer_output *obj,
+int consumer_set_network_uri(const struct ltt_session *session,
+ struct consumer_output *obj,
struct lttng_uri *uri);
int consumer_send_fds(struct consumer_socket *sock, const int *fds,
size_t nb_fd);
char *session_name, char *hostname, int session_live_timer);
int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
int pipe);
-int consumer_send_channel_rotate_pipe(struct consumer_socket *consumer_sock,
- int pipe);
int consumer_send_destroy_relayd(struct consumer_socket *sock,
struct consumer_output *consumer);
int consumer_recv_status_reply(struct consumer_socket *sock);
void consumer_output_send_destroy_relayd(struct consumer_output *consumer);
int consumer_create_socket(struct consumer_data *data,
struct consumer_output *output);
-int consumer_set_subdir(struct consumer_output *consumer,
- const char *session_name);
void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
uint64_t subbuf_size,
uint32_t ust_app_uid,
int64_t blocking_timeout,
const char *root_shm_path,
- const char *shm_path);
-void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
- enum lttng_consumer_command cmd,
+ const char *shm_path,
+ uint64_t trace_archive_id);
+void consumer_init_add_stream_comm_msg(struct lttcomm_consumer_msg *msg,
uint64_t channel_key,
uint64_t stream_key,
- int cpu);
+ int32_t cpu,
+ uint64_t trace_archive_id);
void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg,
enum lttng_consumer_command cmd,
uint64_t channel_key, uint64_t net_seq_idx);
-void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
- enum lttng_consumer_command cmd,
+void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
uint64_t channel_key,
uint64_t session_id,
const char *pathname,
struct consumer_output *consumer, uint64_t *lost);
/* Snapshot command. */
-int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
- struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
- const char *session_path, int wait, uint64_t nb_packets_per_stream);
+enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
+ uint64_t key, struct snapshot_output *output, int metadata,
+ uid_t uid, gid_t gid, const char *session_path, int wait,
+ uint64_t nb_packets_per_stream, uint64_t trace_archive_id);
+/* Rotation commands. */
int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
uid_t uid, gid_t gid, struct consumer_output *output,
- char *domain_path, bool is_metadata_channel, uint64_t new_chunk_id,
- bool *rotate_pending_relay);
+ const char *domain_path, bool is_metadata_channel,
+ uint64_t new_chunk_id);
int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
const struct consumer_output *output, const char *old_path,
const char *new_path, uid_t uid, gid_t gid);
-int consumer_rotate_pending_relay(struct consumer_socket *socket,
- struct consumer_output *output, uint64_t session_id,
+int consumer_check_rotation_pending_local(struct consumer_socket *socket,
+ uint64_t session_id, uint64_t chunk_id);
+int consumer_check_rotation_pending_relay(struct consumer_socket *socket,
+ const struct consumer_output *output, uint64_t session_id,
uint64_t chunk_id);
int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id,
const struct consumer_output *output, const char *path,
projects / lttng-tools.git / blobdiff