Refactoring: context structures

[lttng-ust.git] / liblttng-ust / lttng-context-cpu-id.c

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index 2a8f2812338265040423f90883517ccb7511ca26..1221bf6cf687db73f56256201eeff026b5b26f24 100644 (file)
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -24,7 +24,7 @@
 #include "context-internal.h"
 
 static
-size_t cpu_id_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t cpu_id_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -34,7 +34,7 @@ size_t cpu_id_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void cpu_id_record(struct lttng_ctx_field *field,
+void cpu_id_record(struct lttng_ust_ctx_field *field,
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
@@ -46,15 +46,15 @@ void cpu_id_record(struct lttng_ctx_field *field,
 }
 
 static
-void cpu_id_get_value(struct lttng_ctx_field *field,
-               struct lttng_ctx_value *value)
+void cpu_id_get_value(struct lttng_ust_ctx_field *field,
+               struct lttng_ust_ctx_value *value)
 {
        value->u.s64 = lttng_ust_get_cpu();
 }
 
-int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_cpu_id_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)
@@ -63,14 +63,14 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
                lttng_remove_context_field(ctx, field);
                return -EEXIST;
        }
-       field->event_field.name = "cpu_id";
-       field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.integer.size = sizeof(int) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(int) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(int);
-       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 = "cpu_id";
+       field->event_field->type.atype = atype_integer;
+       field->event_field->type.u.integer.size = sizeof(int) * CHAR_BIT;
+       field->event_field->type.u.integer.alignment = lttng_alignof(int) * CHAR_BIT;
+       field->event_field->type.u.integer.signedness = lttng_is_signed_type(int);
+       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 = cpu_id_get_size;
        field->record = cpu_id_record;
        field->get_value = cpu_id_get_value;