X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fevent-notifier-notification.c;h=313339f19a3303e690de4190748ffa11e87c62f5;hb=21c7bbf6e1f4782cc2251e37962e8d1b84a55572;hp=ae997eb703a2d5d7053b7980b6e01a8ae28dd1fa;hpb=f03092d7780681b375484769c2f0e20ed0f0d2a2;p=lttng-ust.git

diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index ae997eb7..313339f1 100644
--- a/liblttng-ust/event-notifier-notification.c
+++ b/liblttng-ust/event-notifier-notification.c
@@ -1,34 +1,20 @@
 /*
- * event-notifier-notification.c
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2020 Francis Deslauriers <francis.deslauriers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define _LGPL_SOURCE
 
 #include <assert.h>
 #include <errno.h>
-#include <lttng/ust-events.h>
 #include <lttng/ust-endian.h>
 #include <usterr-signal-safe.h>
 
+#include "ust-events-internal.h"
 #include "../libmsgpack/msgpack.h"
 #include "lttng-bytecode.h"
-#include "share.h"
+#include "ust-share.h"
 
 /*
  * We want this write to be atomic AND non-blocking, meaning that we
@@ -284,13 +270,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 +301,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);
@@ -342,7 +341,7 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 	ust_notif.capture_buf_size = content_len;
 
 	/* Send all the buffers. */
-	ret = patient_writev(notif->notification_fd, iov, iovec_count);
+	ret = ust_patient_writev(notif->notification_fd, iov, iovec_count);
 	if (ret == -1) {
 		if (errno == EAGAIN) {
 			record_error(event_notifier);