X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fevent-notifier-notification.c;h=422233265944f0dc991a90110f5027dabd508358;hb=c589eca21586907ffd057fa614e7e2715086b5c7;hp=6fce4357fe85fe5d1511495b675449b5e10797a6;hpb=d37ecb3fc622dee6f80f84c21f38d32eef407262;p=lttng-ust.git

diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index 6fce4357..42223326 100644
--- a/liblttng-ust/event-notifier-notification.c
+++ b/liblttng-ust/event-notifier-notification.c
@@ -1,34 +1,23 @@
 /*
- * 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 <byteswap.h>
 #include <errno.h>
-#include <lttng/ust-events.h>
+#include <limits.h>
+
+#include <lttng/ust-endian.h>
 #include <usterr-signal-safe.h>
+#include <urcu/rculist.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
@@ -38,7 +27,7 @@
  * of the notification struct we are sending alongside the capture buffer.
  */
 #define CAPTURE_BUFFER_SIZE \
-	(PIPE_BUF - sizeof(struct lttng_ust_event_notifier_notification) - 1)
+	(PIPE_BUF - sizeof(struct lttng_ust_abi_event_notifier_notification) - 1)
 
 struct lttng_event_notifier_notification {
 	int notification_fd;
@@ -74,11 +63,11 @@ void capture_enum(struct lttng_msgpack_writer *writer,
 
 static
 int64_t capture_sequence_element_signed(uint8_t *ptr,
-		const struct lttng_integer_type *type)
+		struct lttng_ust_type_integer *integer_type)
 {
 	int64_t value;
-	unsigned int size = type->size;
-	bool byte_order_reversed = type->reverse_byte_order;
+	unsigned int size = integer_type->size;
+	bool byte_order_reversed = integer_type->reverse_byte_order;
 
 	switch (size) {
 	case 8:
@@ -123,11 +112,11 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 
 static
 uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
-		const struct lttng_integer_type *type)
+		struct lttng_ust_type_integer *integer_type)
 {
 	uint64_t value;
-	unsigned int size = type->size;
-	bool byte_order_reversed = type->reverse_byte_order;
+	unsigned int size = integer_type->size;
+	bool byte_order_reversed = integer_type->reverse_byte_order;
 
 	switch (size) {
 	case 8:
@@ -174,8 +163,8 @@ static
 void capture_sequence(struct lttng_msgpack_writer *writer,
 		struct lttng_interpreter_output *output)
 {
-	const struct lttng_integer_type *integer_type;
-	const struct lttng_type *nested_type;
+	struct lttng_ust_type_integer *integer_type;
+	struct lttng_ust_type_common *nested_type;
 	uint8_t *ptr;
 	bool signedness;
 	int i;
@@ -184,13 +173,13 @@ void capture_sequence(struct lttng_msgpack_writer *writer,
 
 	ptr = (uint8_t *) output->u.sequence.ptr;
 	nested_type = output->u.sequence.nested_type;
-	switch (nested_type->atype) {
-	case atype_integer:
-		integer_type = &nested_type->u.integer;
+	switch (nested_type->type) {
+	case lttng_ust_type_integer:
+		integer_type = lttng_ust_get_type_integer(nested_type);
 		break;
-	case atype_enum:
+	case lttng_ust_type_enum:
 		/* Treat enumeration as an integer. */
-		integer_type = &nested_type->u.enum_nestable.container_type->u.integer;
+		integer_type = lttng_ust_get_type_integer(lttng_ust_get_type_enum(nested_type)->container_type);
 		break;
 	default:
 		/* Capture of array of non-integer are not supported. */
@@ -224,19 +213,19 @@ void capture_sequence(struct lttng_msgpack_writer *writer,
 
 static
 void notification_init(struct lttng_event_notifier_notification *notif,
-		struct lttng_event_notifier *event_notifier)
+		struct lttng_ust_event_notifier *event_notifier)
 {
 	struct lttng_msgpack_writer *writer = &notif->writer;
 
-	notif->event_notifier_token = event_notifier->user_token;
-	notif->notification_fd = event_notifier->group->notification_fd;
+	notif->event_notifier_token = event_notifier->priv->parent.user_token;
+	notif->notification_fd = event_notifier->priv->group->notification_fd;
 	notif->has_captures = false;
 
-	if (event_notifier->num_captures > 0) {
+	if (event_notifier->priv->num_captures > 0) {
 		lttng_msgpack_writer_init(writer, notif->capture_buf,
 				CAPTURE_BUFFER_SIZE);
 
-		lttng_msgpack_begin_array(writer, event_notifier->num_captures);
+		lttng_msgpack_begin_array(writer, event_notifier->priv->num_captures);
 		notif->has_captures = true;
 	}
 }
@@ -280,18 +269,47 @@ void notification_append_empty_capture(
 	lttng_msgpack_write_nil(&notif->writer);
 }
 
+static void record_error(struct lttng_ust_event_notifier *event_notifier)
+{
+	struct lttng_event_notifier_group *event_notifier_group =
+			event_notifier->priv->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->priv->error_counter_index;
+	ret = event_notifier_group->error_counter->ops->counter_add(
+			error_counter->counter, dimension_index, 1);
+	if (ret)
+		WARN_ON_ONCE(1);
+}
+
 static
-void notification_send(struct lttng_event_notifier_notification *notif)
+void notification_send(struct lttng_event_notifier_notification *notif,
+		struct lttng_ust_event_notifier *event_notifier)
 {
 	ssize_t ret;
 	size_t content_len;
 	int iovec_count = 1;
-	struct lttng_ust_event_notifier_notification ust_notif;
+	struct lttng_ust_abi_event_notifier_notification ust_notif = {0};
 	struct iovec iov[2];
 
 	assert(notif);
 
-	ust_notif.token = notif->event_notifier_token;
+	ust_notif.token = event_notifier->priv->parent.user_token;
 
 	/*
 	 * Prepare sending the notification from multiple buffers using an
@@ -326,10 +344,11 @@ 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) {
-			DBG("Cannot send event notifier notification without blocking: %s",
+			record_error(event_notifier);
+			DBG("Cannot send event_notifier notification without blocking: %s",
 				strerror(errno));
 		} else {
 			DBG("Error to sending event notifier notification: %s",
@@ -339,8 +358,10 @@ void notification_send(struct lttng_event_notifier_notification *notif)
 	}
 }
 
-void lttng_event_notifier_notification_send(struct lttng_event_notifier *event_notifier,
-		const char *stack_data)
+void lttng_event_notifier_notification_send(
+		struct lttng_ust_event_notifier *event_notifier,
+		const char *stack_data,
+		struct lttng_ust_notification_ctx *notif_ctx)
 {
 	/*
 	 * This function is called from the probe, we must do dynamic
@@ -350,8 +371,8 @@ void lttng_event_notifier_notification_send(struct lttng_event_notifier *event_n
 
 	notification_init(&notif, event_notifier);
 
-	if (caa_unlikely(!cds_list_empty(&event_notifier->capture_bytecode_runtime_head))) {
-		struct lttng_bytecode_runtime *capture_bc_runtime;
+	if (caa_unlikely(notif_ctx->eval_capture)) {
+		struct lttng_ust_bytecode_runtime *capture_bc_runtime;
 
 		/*
 		 * Iterate over all the capture bytecodes. If the interpreter
@@ -359,12 +380,12 @@ void lttng_event_notifier_notification_send(struct lttng_event_notifier *event_n
 		 * `output` parameter to the capture buffer. If the interpreter
 		 * fails, append an empty capture to the buffer.
 		 */
-		cds_list_for_each_entry(capture_bc_runtime,
-				&event_notifier->capture_bytecode_runtime_head, node) {
+		cds_list_for_each_entry_rcu(capture_bc_runtime,
+				&event_notifier->priv->capture_bytecode_runtime_head, node) {
 			struct lttng_interpreter_output output;
 
-			if (capture_bc_runtime->interpreter_funcs.capture(capture_bc_runtime,
-					stack_data, &output) & LTTNG_INTERPRETER_RECORD_FLAG)
+			if (capture_bc_runtime->interpreter_func(capture_bc_runtime,
+					stack_data, &output) == LTTNG_UST_BYTECODE_INTERPRETER_OK)
 				notification_append_capture(&notif, &output);
 			else
 				notification_append_empty_capture(&notif);
@@ -375,5 +396,5 @@ void lttng_event_notifier_notification_send(struct lttng_event_notifier *event_n
 	 * Send the notification (including the capture buffer) to the
 	 * sessiond.
 	 */
-	notification_send(&notif);
+	notification_send(&notif, event_notifier);
 }