Refactoring: bytecode interpreter ABI

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

diff --git a/liblttng-ust/lttng-context-pthread-id.c b/liblttng-ust/lttng-context-pthread-id.c
index 162b2cf4c78bb966a8c0c0bd688562b7d2a3ade8..59a6f3815ed26822fcf9baa024d06b0a429254d5 100644 (file)
--- a/liblttng-ust/lttng-context-pthread-id.c
+++ b/liblttng-ust/lttng-context-pthread-id.c
@@ -11,7 +11,7 @@
 #include <pthread.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"
 
@@ -28,7 +28,7 @@ size_t pthread_id_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void pthread_id_record(struct lttng_ust_ctx_field *field,
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+                struct lttng_ust_channel_buffer *chan)
 {
        unsigned long pthread_id;
 
@@ -47,25 +47,40 @@ void pthread_id_get_value(struct lttng_ust_ctx_field *field,
 int lttng_add_pthread_id_to_ctx(struct lttng_ust_ctx **ctx)
 {
        struct lttng_ust_ctx_field *field;
+       struct lttng_ust_type_common *type;
+       int ret;
 
-       field = lttng_append_context(ctx);
-       if (!field)
+       type = lttng_ust_create_type_integer(sizeof(unsigned long) * CHAR_BIT,
+                       lttng_alignof(unsigned long) * CHAR_BIT,
+                       lttng_is_signed_type(unsigned long),
+                       BYTE_ORDER, 10);
+       if (!type)
                return -ENOMEM;
+       field = lttng_append_context(ctx);
+       if (!field) {
+               ret = -ENOMEM;
+               goto error_context;
+       }
        if (lttng_find_context(*ctx, "pthread_id")) {
-               lttng_remove_context_field(ctx, field);
-               return -EEXIST;
+               ret = -EEXIST;
+               goto error_find_context;
        }
-       field->event_field->name = "pthread_id";
-       field->event_field->type.atype = atype_integer;
-       field->event_field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
-       field->event_field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-       field->event_field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
-       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 = strdup("pthread_id");
+       if (!field->event_field->name) {
+               ret = -ENOMEM;
+               goto error_name;
+       }
+       field->event_field->type = type;
        field->get_size = pthread_id_get_size;
        field->record = pthread_id_record;
        field->get_value = pthread_id_get_value;
        lttng_context_update(*ctx);
        return 0;
+
+error_name:
+error_find_context:
+       lttng_remove_context_field(ctx, field);
+error_context:
+       lttng_ust_destroy_type(type);
+       return ret;
 }