X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.cpp;h=67fca2a357bb3fcac0814d150313e49ae38532a2;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=f0140ce552356a258252f7b39b493fd8ec741f4e;hpb=f46376a14da2eb796690cb4e718e8b213839d6ea;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.cpp b/src/bin/lttng-sessiond/notification-thread-events.cpp
index f0140ce55..67fca2a35 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.cpp
+++ b/src/bin/lttng-sessiond/notification-thread-events.cpp
@@ -6,46 +6,46 @@
  */
 
 #include "lttng/action/action.h"
-#include "lttng/trigger/trigger-internal.h"
+#include "lttng/trigger/trigger-internal.hpp"
 #define _LGPL_SOURCE
 #include <urcu.h>
 #include <urcu/rculfhash.h>
 
-#include <common/defaults.h>
-#include <common/error.h>
-#include <common/futex.h>
-#include <common/unix.h>
-#include <common/dynamic-buffer.h>
-#include <common/hashtable/utils.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/macros.h>
+#include <common/defaults.hpp>
+#include <common/error.hpp>
+#include <common/futex.hpp>
+#include <common/unix.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/hashtable/utils.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/macros.hpp>
 #include <lttng/condition/condition.h>
-#include <lttng/action/action-internal.h>
-#include <lttng/action/list-internal.h>
-#include <lttng/domain-internal.h>
-#include <lttng/notification/notification-internal.h>
-#include <lttng/condition/condition-internal.h>
-#include <lttng/condition/buffer-usage-internal.h>
-#include <lttng/condition/session-consumed-size-internal.h>
-#include <lttng/condition/session-rotation-internal.h>
-#include <lttng/condition/event-rule-matches-internal.h>
-#include <lttng/domain-internal.h>
-#include <lttng/notification/channel-internal.h>
-#include <lttng/trigger/trigger-internal.h>
-#include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/action/action-internal.hpp>
+#include <lttng/action/list-internal.hpp>
+#include <lttng/domain-internal.hpp>
+#include <lttng/notification/notification-internal.hpp>
+#include <lttng/condition/condition-internal.hpp>
+#include <lttng/condition/buffer-usage-internal.hpp>
+#include <lttng/condition/session-consumed-size-internal.hpp>
+#include <lttng/condition/session-rotation-internal.hpp>
+#include <lttng/condition/event-rule-matches-internal.hpp>
+#include <lttng/domain-internal.hpp>
+#include <lttng/notification/channel-internal.hpp>
+#include <lttng/trigger/trigger-internal.hpp>
+#include <lttng/event-rule/event-rule-internal.hpp>
 
 #include <time.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <fcntl.h>
 
-#include "condition-internal.h"
-#include "event-notifier-error-accounting.h"
-#include "notification-thread.h"
-#include "notification-thread-events.h"
-#include "notification-thread-commands.h"
-#include "lttng-sessiond.h"
-#include "kernel.h"
+#include "condition-internal.hpp"
+#include "event-notifier-error-accounting.hpp"
+#include "notification-thread.hpp"
+#include "notification-thread-events.hpp"
+#include "notification-thread-commands.hpp"
+#include "lttng-sessiond.hpp"
+#include "kernel.hpp"
 
 #define CLIENT_POLL_MASK_IN (LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP)
 #define CLIENT_POLL_MASK_IN_OUT (CLIENT_POLL_MASK_IN | LPOLLOUT)
@@ -1031,8 +1031,15 @@ int evaluate_condition_for_client(const struct lttng_trigger *trigger,
 	struct lttng_evaluation *evaluation = NULL;
 	struct notification_client_list client_list = {
 		.lock = PTHREAD_MUTEX_INITIALIZER,
+		.ref = {},
+		.condition = NULL,
+		.triggers_list = {},
+		.clients_list = {},
+		.notification_trigger_clients_ht = NULL,
+		.notification_trigger_clients_ht_node = {},
+		.rcu_node = {},
 	};
-	struct notification_client_list_element client_list_element = { 0 };
+	struct notification_client_list_element client_list_element = {};
 	uid_t object_uid = 0;
 	gid_t object_gid = 0;
 
@@ -2064,7 +2071,7 @@ int drain_event_notifier_notification_pipe(
 		struct notification_thread_state *state,
 		int pipe, enum lttng_domain_type domain)
 {
-	struct lttng_poll_event events = {0};
+	struct lttng_poll_event events = {};
 	int ret;
 
 	ret = lttng_poll_create(&events, 1, LTTNG_CLOEXEC);
@@ -3700,6 +3707,7 @@ int client_send_command_reply(struct notification_client *client,
 	struct lttng_notification_channel_message msg = {
 		.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_COMMAND_REPLY,
 		.size = sizeof(reply),
+		.fds = 0,
 	};
 	char buffer[sizeof(msg) + sizeof(reply)];
 	enum client_transmission_status transmission_status;
@@ -3804,6 +3812,7 @@ int client_handle_message_handshake(struct notification_client *client,
 	const struct lttng_notification_channel_message msg_header = {
 			.type = LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_HANDSHAKE,
 			.size = sizeof(handshake_reply),
+			.fds = 0,
 	};
 	enum lttng_notification_channel_status status =
 			LTTNG_NOTIFICATION_CHANNEL_STATUS_OK;
@@ -4274,6 +4283,8 @@ int client_notification_overflow(struct notification_client *client)
 	int ret = 0;
 	const struct lttng_notification_channel_message msg = {
 		.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_NOTIFICATION_DROPPED,
+		.size = 0,
+		.fds = 0,
 	};
 
 	ASSERT_LOCKED(client->lock);
@@ -4378,6 +4389,8 @@ int notification_client_list_send_evaluation(
 	};
 	struct lttng_notification_channel_message msg_header = {
 		.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_NOTIFICATION,
+		.size = 0,
+		.fds = 0,
 	};
 	const struct lttng_credentials *trigger_creds =
 			lttng_trigger_get_credentials(trigger);