Refactoring: remove struct_size from struct lttng_ust_ctx_value

[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 62eda808786d01b1cf7eb165d4915a0e909b6a40..162b2cf4c78bb966a8c0c0bd688562b7d2a3ade8 100644 (file)
--- a/liblttng-ust/lttng-context-pthread-id.c
+++ b/liblttng-ust/lttng-context-pthread-id.c
@@ -1,19 +1,22 @@
 /*
- * (C) Copyright       2009-2011 -
- *             Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * LTTng UST pthread_id context.
+ * Copyright (C) 2009-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * LTTng UST pthread_id context.
  */
 
+#define _LGPL_SOURCE
+#include <stddef.h>
 #include <pthread.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ringbuffer-config.h>
 
+#include "context-internal.h"
+
 static
-size_t pthread_id_get_size(size_t offset)
+size_t pthread_id_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -23,9 +26,9 @@ size_t pthread_id_get_size(size_t offset)
 }
 
 static
-void pthread_id_record(struct lttng_ctx_field *field,
+void pthread_id_record(struct lttng_ust_ctx_field *field,
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-                struct ltt_channel *chan)
+                struct lttng_channel *chan)
 {
        unsigned long pthread_id;
 
@@ -34,9 +37,16 @@ void pthread_id_record(struct lttng_ctx_field *field,
        chan->ops->event_write(ctx, &pthread_id, sizeof(pthread_id));
 }
 
-int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx)
+static
+void pthread_id_get_value(struct lttng_ust_ctx_field *field,
+               struct lttng_ust_ctx_value *value)
+{
+       value->u.s64 = (unsigned long) pthread_self();
+}
+
+int lttng_add_pthread_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)
@@ -45,15 +55,17 @@ int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx)
                lttng_remove_context_field(ctx, field);
                return -EEXIST;
        }
-       field->event_field.name = "pthread_id";
-       field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-       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->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->get_size = pthread_id_get_size;
        field->record = pthread_id_record;
+       field->get_value = pthread_id_get_value;
+       lttng_context_update(*ctx);
        return 0;
 }