projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: reference counting of consumer output
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.h
diff --git
a/src/bin/lttng-sessiond/consumer.h
b/src/bin/lttng-sessiond/consumer.h
index a954a073eed4c5824b37df9048d30fe0aebdfa96..73f113d0aca6fd8f4d33e2ba60cfe9bedd398d9f 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.h
+++ b/
src/bin/lttng-sessiond/consumer.h
@@
-21,6
+21,7
@@
#include <common/consumer.h>
#include <common/hashtable/hashtable.h>
#include <lttng/lttng.h>
#include <common/consumer.h>
#include <common/hashtable/hashtable.h>
#include <lttng/lttng.h>
+#include <urcu/ref.h>
#include "snapshot.h"
#include "snapshot.h"
@@
-33,8
+34,13
@@
enum consumer_dst_type {
};
struct consumer_socket {
};
struct consumer_socket {
- /* File descriptor */
- int fd;
+ /*
+ * File descriptor. This is just a reference to the consumer data meaning
+ * that every access must be locked and checked for a possible invalid
+ * value.
+ */
+ int *fd_ptr;
+
/*
* To use this socket (send/recv), this lock MUST be acquired.
*/
/*
* To use this socket (send/recv), this lock MUST be acquired.
*/
@@
-87,13
+93,24
@@
struct consumer_data {
int err_sock;
/* These two sockets uses the cmd_unix_sock_path. */
int cmd_sock;
int err_sock;
/* These two sockets uses the cmd_unix_sock_path. */
int cmd_sock;
+ /*
+ * The metadata socket object is handled differently and only created
+ * locally in this object thus it's the only reference available in the
+ * session daemon. For that reason, a variable for the fd is required and
+ * the metadata socket fd points to it.
+ */
+ int metadata_fd;
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];
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];
- /* communication lock */
+ /*
+ * This lock has two purposes. It protects any change to the consumer
+ * socket and make sure only one thread uses this object for read/write
+ * operations.
+ */
pthread_mutex_t lock;
};
pthread_mutex_t lock;
};
@@
-124,6
+141,8
@@
struct consumer_net {
* Consumer output object describing where and how to send data.
*/
struct consumer_output {
* Consumer output object describing where and how to send data.
*/
struct consumer_output {
+ struct urcu_ref ref; /* Refcount */
+
/* If the consumer is enabled meaning that should be used */
unsigned int enabled;
enum consumer_dst_type type;
/* If the consumer is enabled meaning that should be used */
unsigned int enabled;
enum consumer_dst_type type;
@@
-147,6
+166,9
@@
struct consumer_output {
*/
struct lttng_ht *socks;
*/
struct lttng_ht *socks;
+ /* Tell if this output is used for snapshot. */
+ unsigned int snapshot:1;
+
union {
char trace_path[PATH_MAX];
struct consumer_net net;
union {
char trace_path[PATH_MAX];
struct consumer_net net;
@@
-157,7
+179,7
@@
struct consumer_socket *consumer_find_socket(int key,
struct consumer_output *consumer);
struct consumer_socket *consumer_find_socket_by_bitness(int bits,
struct consumer_output *consumer);
struct consumer_output *consumer);
struct consumer_socket *consumer_find_socket_by_bitness(int bits,
struct consumer_output *consumer);
-struct consumer_socket *consumer_allocate_socket(int fd);
+struct consumer_socket *consumer_allocate_socket(int
*
fd);
void consumer_add_socket(struct consumer_socket *sock,
struct consumer_output *consumer);
void consumer_del_socket(struct consumer_socket *sock,
void consumer_add_socket(struct consumer_socket *sock,
struct consumer_output *consumer);
void consumer_del_socket(struct consumer_socket *sock,
@@
-165,10
+187,16
@@
void consumer_del_socket(struct consumer_socket *sock,
void consumer_destroy_socket(struct consumer_socket *sock);
int consumer_copy_sockets(struct consumer_output *dst,
struct consumer_output *src);
void consumer_destroy_socket(struct consumer_socket *sock);
int consumer_copy_sockets(struct consumer_output *dst,
struct consumer_output *src);
+void consumer_destroy_output_sockets(struct consumer_output *obj);
+int consumer_socket_send(struct consumer_socket *socket, void *msg,
+ size_t len);
+int consumer_socket_recv(struct consumer_socket *socket, void *msg,
+ size_t len);
struct consumer_output *consumer_create_output(enum consumer_dst_type type);
struct consumer_output *consumer_copy_output(struct consumer_output *obj);
struct consumer_output *consumer_create_output(enum consumer_dst_type type);
struct consumer_output *consumer_copy_output(struct consumer_output *obj);
-void consumer_destroy_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,
struct lttng_uri *uri);
int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd);
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);
@@
-181,7
+209,8
@@
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,
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);
+ enum lttng_stream_type type, uint64_t session_id,
+ char *session_name, char *hostname, int session_live_timer);
int consumer_send_destroy_relayd(struct consumer_socket *sock,
struct consumer_output *consumer);
int consumer_recv_status_reply(struct consumer_socket *sock);
int consumer_send_destroy_relayd(struct consumer_socket *sock,
struct consumer_output *consumer);
int consumer_recv_status_reply(struct consumer_socket *sock);
@@
-199,6
+228,7
@@
void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
int overwrite,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
int overwrite,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
+ unsigned int live_timer_interval,
int output,
int type,
uint64_t session_id,
int output,
int type,
uint64_t session_id,
@@
-212,12
+242,19
@@
void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
uint32_t chan_id,
uint64_t tracefile_size,
uint64_t tracefile_count,
uint32_t chan_id,
uint64_t tracefile_size,
uint64_t tracefile_count,
- unsigned int monitor);
+ uint64_t session_id_per_pid,
+ unsigned int monitor,
+ uint32_t ust_app_uid,
+ 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,
uint64_t channel_key,
uint64_t stream_key,
int cpu);
void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
enum lttng_consumer_command cmd,
uint64_t channel_key,
uint64_t stream_key,
int cpu);
+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,
uint64_t channel_key,
void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
enum lttng_consumer_command cmd,
uint64_t channel_key,
@@
-232,7
+269,8
@@
void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
int type,
uint64_t tracefile_size,
uint64_t tracefile_count,
int type,
uint64_t tracefile_size,
uint64_t tracefile_count,
- unsigned int monitor);
+ unsigned int monitor,
+ unsigned int live_timer_interval);
int consumer_is_data_pending(uint64_t session_id,
struct consumer_output *consumer);
int consumer_close_metadata(struct consumer_socket *socket,
int consumer_is_data_pending(uint64_t session_id,
struct consumer_output *consumer);
int consumer_close_metadata(struct consumer_socket *socket,
@@
-247,6
+285,6
@@
int consumer_flush_channel(struct consumer_socket *socket, uint64_t key);
/* 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,
/* 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,
-
int wait
);
+
const char *session_path, int wait, uint64_t nb_packets_per_stream
);
#endif /* _CONSUMER_H */
#endif /* _CONSUMER_H */
This page took
0.025874 seconds
and
4
git commands to generate.