tracepoint: Refactor representation of nested types

[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 fb6e407cfb9c1c82bdd9a2eb741e42bb0a8e7b02..7a9dd5fd43b28cd46de3ed3d1047cc8522596cc2 100644 (file)
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -27,6 +27,8 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
+#include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
@@ -35,7 +37,7 @@
 #include "../libringbuffer/getcpu.h"
 
 static
-size_t cpu_id_get_size(size_t offset)
+size_t cpu_id_get_size(struct lttng_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -58,12 +60,9 @@ void cpu_id_record(struct lttng_ctx_field *field,
 
 static
 void cpu_id_get_value(struct lttng_ctx_field *field,
-               union lttng_ctx_value *value)
+               struct lttng_ctx_value *value)
 {
-       int cpu;
-
-       cpu = lttng_ust_get_cpu();
-       value->s64 = cpu;
+       value->u.s64 = lttng_ust_get_cpu();
 }
 
 int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
@@ -79,12 +78,12 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
        }
        field->event_field.name = "cpu_id";
        field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.basic.integer.size = sizeof(int) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.alignment = lttng_alignof(int) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(int);
-       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->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;