X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=a179206fc5c7995a57bb7dab3a712a7b4fb61cf1;hb=f46376a14da2eb796690cb4e718e8b213839d6ea;hp=eaa04d302ae6abf61c8a60b24223ab638bbb2051;hpb=04ed9e10dfa0b3c88d4a7abe9fa59b8e03b7e49a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index eaa04d302..a179206fc 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -12,6 +12,7 @@
 #include <common/hashtable/hashtable.h>
 #include <lttng/lttng.h>
 #include <urcu/ref.h>
+#include <algorithm>
 
 #include "snapshot.h"
 
@@ -19,6 +20,19 @@ struct snapshot;
 struct snapshot_output;
 struct ltt_session;
 
+/*
+ * Needed until we use C++14, where std::max is constexpr.
+ *
+ * Use a static_assert so we remember to remove it when we upgrade to a newer
+ * C++.
+ */
+static_assert(__cplusplus == 201103L, "");
+template <typename T>
+constexpr T max_constexpr(T l, T r)
+{
+	return l > r ? l : r;
+}
+
 enum consumer_dst_type {
 	CONSUMER_DST_LOCAL,
 	CONSUMER_DST_NET,
@@ -61,39 +75,43 @@ struct consumer_socket {
 };
 
 struct consumer_data {
+	consumer_data (lttng_consumer_type type_)
+		: type(type_)
+	{}
+
 	enum lttng_consumer_type type;
 
 	/* Mutex to control consumerd pid assignation */
-	pthread_mutex_t pid_mutex;
-	pid_t pid;
+	pthread_mutex_t pid_mutex = PTHREAD_MUTEX_INITIALIZER;
+	pid_t pid = 0;
 
-	int err_sock;
+	int err_sock = -1;
 	/* These two sockets uses the cmd_unix_sock_path. */
-	int cmd_sock;
+	int cmd_sock = -1;
 	/*
 	 * Write-end of the channel monitoring pipe to be passed to the
 	 * consumer.
 	 */
-	int channel_monitor_pipe;
+	int channel_monitor_pipe = -1;
 	/*
 	 * 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;
+	int metadata_fd = 0;
+	struct consumer_socket metadata_sock {};
 
 	/* consumer error and command Unix socket path */
-	const char *err_unix_sock_path;
-	const char *cmd_unix_sock_path;
+	const char *err_unix_sock_path = nullptr;
+	const char *cmd_unix_sock_path = nullptr;
 
 	/*
 	 * 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 = PTHREAD_MUTEX_INITIALIZER;
 };
 
 /*
@@ -149,7 +167,8 @@ struct consumer_output {
 	 * Subdirectory path name used for both local and network
 	 * consumer ("kernel", "ust", or empty).
 	 */
-	char domain_subdir[max(sizeof(DEFAULT_KERNEL_TRACE_DIR),
+	char domain_subdir[
+		max_constexpr(sizeof(DEFAULT_KERNEL_TRACE_DIR),
 			sizeof(DEFAULT_UST_TRACE_DIR))];
 
 	/*
@@ -265,8 +284,6 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint64_t channel_key,
 		uint64_t session_id,
 		const char *pathname,
-		uid_t uid,
-		gid_t gid,
 		uint64_t relayd_id,
 		const char *name,
 		unsigned int nb_init_streams,
@@ -298,13 +315,11 @@ int consumer_get_lost_packets(uint64_t session_id, uint64_t channel_key,
 /* Snapshot command. */
 enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
 		uint64_t key, const struct consumer_output *output, int metadata,
-		uid_t uid, gid_t gid, const char *channel_path, int wait,
-		uint64_t nb_packets_per_stream);
+		const char *channel_path, uint64_t nb_packets_per_stream);
 
 /* Rotation commands. */
 int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
-		uid_t uid, gid_t gid, struct consumer_output *output,
-		bool is_metadata_channel);
+		struct consumer_output *output, bool is_metadata_channel);
 int consumer_init(struct consumer_socket *socket,
 		const lttng_uuid sessiond_uuid);