*/
#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/ringbuffer-context.h>
#include "context-internal.h"
#include "creds.h"
}
static
-size_t vuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t vuid_get_size(void *priv __attribute__((unused)),
+ size_t offset)
{
size_t size = 0;
- size += lib_ring_buffer_align(offset, lttng_alignof(uid_t));
+ size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uid_t));
size += sizeof(uid_t);
return size;
}
static
-void vuid_record(struct lttng_ust_ctx_field *field,
+void vuid_record(void *priv __attribute__((unused)),
struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct lttng_channel *chan)
+ struct lttng_ust_channel_buffer *chan)
{
uid_t vuid;
vuid = get_vuid();
- lib_ring_buffer_align_ctx(ctx, lttng_alignof(vuid));
- chan->ops->event_write(ctx, &vuid, sizeof(vuid));
+ chan->ops->event_write(ctx, &vuid, sizeof(vuid), lttng_ust_rb_alignof(vuid));
}
static
-void vuid_get_value(struct lttng_ust_ctx_field *field,
+void vuid_get_value(void *priv __attribute__((unused)),
struct lttng_ust_ctx_value *value)
{
value->u.s64 = get_vuid();
}
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+ lttng_ust_static_event_field("vuid",
+ lttng_ust_static_type_integer(sizeof(uid_t) * CHAR_BIT,
+ lttng_ust_rb_alignof(uid_t) * CHAR_BIT,
+ lttng_ust_is_signed_type(uid_t),
+ BYTE_ORDER, 10),
+ false, false),
+ vuid_get_size,
+ vuid_record,
+ vuid_get_value,
+ NULL, NULL);
+
int lttng_add_vuid_to_ctx(struct lttng_ust_ctx **ctx)
{
- struct lttng_ust_ctx_field *field;
-
- field = lttng_append_context(ctx);
- if (!field)
- return -ENOMEM;
- if (lttng_find_context(*ctx, "vuid")) {
- 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 = "vuid";
- field->event_field->type.atype = atype_integer;
- field->event_field->type.u.integer.size = sizeof(uid_t) * CHAR_BIT;
- field->event_field->type.u.integer.alignment = lttng_alignof(uid_t) * CHAR_BIT;
- field->event_field->type.u.integer.signedness = lttng_is_signed_type(uid_t);
- field->event_field->type.u.integer.reverse_byte_order = 0;
- field->event_field->type.u.integer.base = 10;
- field->event_field->type.u.integer.encoding = lttng_encode_none;
- field->get_size = vuid_get_size;
- field->record = vuid_record;
- field->get_value = vuid_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;
}