Refactoring: context structures

[lttng-ust.git] / liblttng-ust / lttng-context-user-ns.c

diff --git a/liblttng-ust/lttng-context-user-ns.c b/liblttng-ust/lttng-context-user-ns.c
index d2a79b52883320b6d4c8bfeba983d4fc52ca42a9..fccf70f2491fc6c3133bd99159dd8e99a021fc0d 100644 (file)
--- a/liblttng-ust/lttng-context-user-ns.c
+++ b/liblttng-ust/lttng-context-user-ns.c
@@ -72,7 +72,7 @@ void lttng_context_user_ns_reset(void)
 }
 
 static
-size_t user_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t user_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -82,7 +82,7 @@ size_t user_ns_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void user_ns_record(struct lttng_ctx_field *field,
+void user_ns_record(struct lttng_ust_ctx_field *field,
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
@@ -94,15 +94,15 @@ void user_ns_record(struct lttng_ctx_field *field,
 }
 
 static
-void user_ns_get_value(struct lttng_ctx_field *field,
-               struct lttng_ctx_value *value)
+void user_ns_get_value(struct lttng_ust_ctx_field *field,
+               struct lttng_ust_ctx_value *value)
 {
        value->u.s64 = get_user_ns();
 }
 
-int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_user_ns_to_ctx(struct lttng_ust_ctx **ctx)
 {
-       struct lttng_ctx_field *field;
+       struct lttng_ust_ctx_field *field;
 
        field = lttng_append_context(ctx);
        if (!field)
@@ -111,14 +111,14 @@ int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx)
                lttng_remove_context_field(ctx, field);
                return -EEXIST;
        }
-       field->event_field.name = "user_ns";
-       field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.integer.size = sizeof(ino_t) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(ino_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->event_field->name = "user_ns";
+       field->event_field->type.atype = atype_integer;
+       field->event_field->type.u.integer.size = sizeof(ino_t) * CHAR_BIT;
+       field->event_field->type.u.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
+       field->event_field->type.u.integer.signedness = lttng_is_signed_type(ino_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 = user_ns_get_size;
        field->record = user_ns_record;
        field->get_value = user_ns_get_value;