#ifndef _CONSUMER_H
#define _CONSUMER_H
-#include <common/consumer.h>
+#include <common/consumer/consumer.h>
#include <common/hashtable/hashtable.h>
#include <lttng/lttng.h>
#include <urcu/ref.h>
int err_sock;
/* These two sockets uses the cmd_unix_sock_path. */
int cmd_sock;
+ /*
+ * Write-end of the channel monitoring pipe to be passed to the
+ * consumer.
+ */
+ int channel_monitor_pipe;
/*
* The metadata socket object is handled differently and only created
* locally in this object thus it's the only reference available in the
struct consumer_socket metadata_sock;
/* consumer error and command Unix socket path */
- char err_unix_sock_path[PATH_MAX];
- char cmd_unix_sock_path[PATH_MAX];
+ const char *err_unix_sock_path;
+ const char *cmd_unix_sock_path;
/*
* This lock has two purposes. It protects any change to the consumer
/* Data path for network streaming. */
struct lttng_uri data;
+
+ /* <hostname>/<session-name> */
+ char base_dir[PATH_MAX];
};
/*
* index. The relayd sockets are index with it on the consumer side.
*/
uint64_t net_seq_index;
+ /* Store the relay protocol in use if the session is remote. */
+ uint32_t relay_major_version;
+ uint32_t relay_minor_version;
/*
- * Subdirectory path name used for both local and network consumer.
+ * Subdirectory path name used for both local and network
+ * consumer (/kernel or /ust).
*/
- char subdir[PATH_MAX];
+ char subdir[LTTNG_PATH_MAX];
/*
* Hashtable of consumer_socket index by the file descriptor value. For
unsigned int snapshot:1;
union {
- char trace_path[PATH_MAX];
+ char session_root_path[LTTNG_PATH_MAX];
struct consumer_net net;
} dst;
+
+ /*
+ * Sub-directory below the session_root_path where the next chunk of
+ * trace will be stored (\0 before the first session rotation).
+ */
+ char chunk_path[LTTNG_PATH_MAX];
};
struct consumer_socket *consumer_find_socket(int key,
void consumer_output_put(struct consumer_output *obj);
int consumer_set_network_uri(struct consumer_output *obj,
struct lttng_uri *uri);
-int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd);
+int consumer_send_fds(struct consumer_socket *sock, const int *fds,
+ size_t nb_fd);
int consumer_send_msg(struct consumer_socket *sock,
struct lttcomm_consumer_msg *msg);
int consumer_send_stream(struct consumer_socket *sock,
struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
- int *fds, size_t nb_fd);
+ const int *fds, size_t nb_fd);
int consumer_send_channel(struct consumer_socket *sock,
struct lttcomm_consumer_msg *msg);
int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer,
enum lttng_stream_type type, uint64_t session_id,
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_destroy_relayd(struct consumer_socket *sock,
struct consumer_output *consumer);
int consumer_recv_status_reply(struct consumer_socket *sock);
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
unsigned int live_timer_interval,
+ unsigned int monitor_timer_interval,
int output,
int type,
uint64_t session_id,
uint64_t session_id_per_pid,
unsigned int monitor,
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,
uint64_t tracefile_size,
uint64_t tracefile_count,
unsigned int monitor,
- unsigned int live_timer_interval);
+ unsigned int live_timer_interval,
+ unsigned int monitor_timer_interval);
int consumer_is_data_pending(uint64_t session_id,
struct consumer_output *consumer);
int consumer_close_metadata(struct consumer_socket *socket,
uint64_t metadata_key);
int consumer_push_metadata(struct consumer_socket *socket,
uint64_t metadata_key, char *metadata_str, size_t len,
- size_t target_offset);
+ size_t target_offset, uint64_t version);
int consumer_flush_channel(struct consumer_socket *socket, uint64_t key);
+int consumer_clear_quiescent_channel(struct consumer_socket *socket, uint64_t key);
+int consumer_get_discarded_events(uint64_t session_id, uint64_t channel_key,
+ struct consumer_output *consumer, uint64_t *discarded);
+int consumer_get_lost_packets(uint64_t session_id, uint64_t channel_key,
+ 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);
+ 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);
+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_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,
+ uid_t uid, gid_t gid);
#endif /* _CONSUMER_H */
projects / lttng-tools.git / blobdiff