}
static
-size_t cgroup_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t cgroup_ns_get_size(void *priv __attribute__((unused)),
+ size_t offset)
{
size_t size = 0;
- size += lttng_ust_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 cgroup_ns_record(struct lttng_ust_ctx_field *field,
+void cgroup_ns_record(void *priv __attribute__((unused)),
struct lttng_ust_lib_ring_buffer_ctx *ctx,
struct lttng_ust_channel_buffer *chan)
{
ino_t cgroup_ns;
cgroup_ns = get_cgroup_ns();
- lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_alignof(cgroup_ns));
- chan->ops->event_write(ctx, &cgroup_ns, sizeof(cgroup_ns));
+ chan->ops->event_write(ctx, &cgroup_ns, sizeof(cgroup_ns),
+ lttng_ust_rb_alignof(cgroup_ns));
}
static
-void cgroup_ns_get_value(struct lttng_ust_ctx_field *field,
+void cgroup_ns_get_value(void *priv __attribute__((unused)),
struct lttng_ust_ctx_value *value)
{
value->u.s64 = get_cgroup_ns();
}
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+ lttng_ust_static_event_field("cgroup_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),
+ cgroup_ns_get_size,
+ cgroup_ns_record,
+ cgroup_ns_get_value,
+ NULL, NULL);
+
int lttng_add_cgroup_ns_to_ctx(struct lttng_ust_ctx **ctx)
{
- struct lttng_ust_ctx_field *field;
- struct lttng_ust_type_common *type;
int ret;
- type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
- lttng_alignof(ino_t) * CHAR_BIT,
- lttng_ust_is_signed_type(ino_t),
- BYTE_ORDER, 10);
- if (!type)
- return -ENOMEM;
- field = lttng_append_context(ctx);
- if (!field) {
- ret = -ENOMEM;
- goto error_context;
- }
- if (lttng_find_context(*ctx, "cgroup_ns")) {
+ if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
ret = -EEXIST;
goto error_find_context;
}
- field->event_field->name = strdup("cgroup_ns");
- if (!field->event_field->name) {
- ret = -ENOMEM;
- goto error_name;
- }
- field->event_field->type = type;
- field->get_size = cgroup_ns_get_size;
- field->record = cgroup_ns_record;
- field->get_value = cgroup_ns_get_value;
- lttng_context_update(*ctx);
+ ret = lttng_ust_context_append(ctx, ctx_field);
+ if (ret)
+ return ret;
return 0;
-error_name:
error_find_context:
- lttng_remove_context_field(ctx, field);
-error_context:
- lttng_ust_destroy_type(type);
return ret;
}