/*
- * lttng-context-uts-ns.c
- *
- * LTTng UST uts namespace context.
+ * SPDX-License-Identifier: LGPL-2.1-only
*
* Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * 2019 Michael Jeanson <mjeanson@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.
+ * Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
*
- * 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
+ * LTTng UST uts namespace context.
*/
#define _LGPL_SOURCE
+#include <limits.h>
#include <stddef.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
-#include <lttng/ust-tid.h>
+#include <lttng/ringbuffer-context.h>
+#include <ust-tid.h>
#include <urcu/tls-compat.h>
+
+#include "context-internal.h"
#include "lttng-tracer-core.h"
#include "ns.h"
* We cache the result to ensure we don't stat(2) the proc filesystem on
* each event.
*/
-#ifdef CONFIG_RCU_TLS
-static DEFINE_URCU_TLS(ino_t, cached_uts_ns) = NS_INO_UNINITIALIZED;
-#else
static DEFINE_URCU_TLS_INIT(ino_t, cached_uts_ns, NS_INO_UNINITIALIZED);
-#endif
static
ino_t get_uts_ns(void)
}
static
-size_t uts_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t uts_ns_get_size(void *priv __attribute__((unused)),
+ size_t offset)
{
size_t size = 0;
- size += lib_ring_buffer_align(offset, lttng_alignof(ino_t));
+ size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(ino_t));
size += sizeof(ino_t);
return size;
}
static
-void uts_ns_record(struct lttng_ctx_field *field,
+void uts_ns_record(void *priv __attribute__((unused)),
struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct lttng_channel *chan)
+ struct lttng_ust_channel_buffer *chan)
{
ino_t uts_ns;
uts_ns = get_uts_ns();
- lib_ring_buffer_align_ctx(ctx, lttng_alignof(uts_ns));
- chan->ops->event_write(ctx, &uts_ns, sizeof(uts_ns));
+ chan->ops->event_write(ctx, &uts_ns, sizeof(uts_ns), lttng_ust_rb_alignof(uts_ns));
}
static
-void uts_ns_get_value(struct lttng_ctx_field *field,
- struct lttng_ctx_value *value)
+void uts_ns_get_value(void *priv __attribute__((unused)),
+ struct lttng_ust_ctx_value *value)
{
value->u.s64 = get_uts_ns();
}
-int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx)
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+ lttng_ust_static_event_field("uts_ns",
+ lttng_ust_static_type_integer(sizeof(ino_t) * CHAR_BIT,
+ lttng_ust_rb_alignof(ino_t) * CHAR_BIT,
+ lttng_ust_is_signed_type(ino_t),
+ BYTE_ORDER, 10),
+ false, false),
+ uts_ns_get_size,
+ uts_ns_record,
+ uts_ns_get_value,
+ NULL, NULL);
+
+int lttng_add_uts_ns_to_ctx(struct lttng_ust_ctx **ctx)
{
- struct lttng_ctx_field *field;
-
- field = lttng_append_context(ctx);
- if (!field)
- return -ENOMEM;
- if (lttng_find_context(*ctx, "uts_ns")) {
- lttng_remove_context_field(ctx, field);
- return -EEXIST;
+ int ret;
+
+ if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
+ ret = -EEXIST;
+ goto error_find_context;
}
- field->event_field.name = "uts_ns";
- field->event_field.type.atype = atype_integer;
- field->event_field.type.u.basic.integer.size = sizeof(ino_t) * CHAR_BIT;
- field->event_field.type.u.basic.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
- field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(ino_t);
- field->event_field.type.u.basic.integer.reverse_byte_order = 0;
- field->event_field.type.u.basic.integer.base = 10;
- field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
- field->get_size = uts_ns_get_size;
- field->record = uts_ns_record;
- field->get_value = uts_ns_get_value;
- lttng_context_update(*ctx);
+ ret = lttng_ust_context_append(ctx, ctx_field);
+ if (ret)
+ return ret;
return 0;
+
+error_find_context:
+ return ret;
}
/*