X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fevent-notifier-notification.c;h=5bbbbd31064a6743a2b2d7b2119d704a4c063f28;hb=abbb25fd2b9d5bea6ec4d76e5df4a2b7259ece04;hp=f1fb8adcbe427a554de8b44bd67f6175375a1f56;hpb=6566528bd873067b5e68a0599d57044060908e29;p=lttng-ust.git

diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index f1fb8adc..5bbbbd31 100644
--- a/liblttng-ust/event-notifier-notification.c
+++ b/liblttng-ust/event-notifier-notification.c
@@ -21,9 +21,9 @@
 #define _LGPL_SOURCE
 
 #include <assert.h>
-#include <byteswap.h>
 #include <errno.h>
 #include <lttng/ust-events.h>
+#include <lttng/ust-endian.h>
 #include <usterr-signal-safe.h>
 
 #include "../libmsgpack/msgpack.h"
@@ -284,13 +284,26 @@ static void record_error(struct lttng_event_notifier *event_notifier)
 {
 	struct lttng_event_notifier_group *event_notifier_group =
 			event_notifier->group;
+	struct lttng_counter *error_counter;
 	size_t dimension_index[1];
 	int ret;
 
+	error_counter = CMM_LOAD_SHARED(event_notifier_group->error_counter);
+	/*
+	 * load-acquire paired with store-release orders creation of the
+	 * error counter and setting error_counter_len before the
+	 * error_counter is used.
+	 * Currently a full memory barrier is used, which could be
+	 * turned into acquire-release barriers.
+	 */
+	cmm_smp_mb();
+	/* This group may not have an error counter attached to it. */
+	if (!error_counter)
+		return;
+
 	dimension_index[0] = event_notifier->error_counter_index;
 	ret = event_notifier_group->error_counter->ops->counter_add(
-			event_notifier_group->error_counter->counter,
-			dimension_index, 1);
+			error_counter->counter, dimension_index, 1);
 	if (ret)
 		WARN_ON_ONCE(1);
 }
@@ -302,7 +315,7 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 	ssize_t ret;
 	size_t content_len;
 	int iovec_count = 1;
-	struct lttng_ust_event_notifier_notification ust_notif;
+	struct lttng_ust_event_notifier_notification ust_notif = {0};
 	struct iovec iov[2];
 
 	assert(notif);