/*
- * 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 <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
* 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;
case atype_integer:
integer_type = &nested_type->u.integer;
break;
- case atype_enum:
+ case atype_enum_nestable:
/* Treat enumeration as an integer. */
integer_type = &nested_type->u.enum_nestable.container_type->u.integer;
break;
{
struct lttng_msgpack_writer *writer = ¬if->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;
}
}
lttng_msgpack_write_nil(¬if->writer);
}
+static void record_error(struct lttng_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_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
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",
}
}
-void lttng_event_notifier_notification_send(struct lttng_event_notifier *event_notifier,
+void lttng_event_notifier_notification_send(
+ struct lttng_event_notifier *event_notifier,
const char *stack_data)
{
/*
* Send the notification (including the capture buffer) to the
* sessiond.
*/
- notification_send(¬if);
+ notification_send(¬if, event_notifier);
}