Refactoring: add back constness of public API structures

[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 a032b26ab7f57e1dee47f430cdf1f12931b7b9fb..da02d1a862b1d58a52d09f999cfde1c9fa6f479b 100644 (file)
--- a/liblttng-ust/lttng-context-pthread-id.c
+++ b/liblttng-ust/lttng-context-pthread-id.c
@@ -17,7 +17,7 @@
 #include "context-internal.h"
 
 static
-size_t pthread_id_get_size(struct lttng_ust_ctx_field *field __attribute__((unused)),
+size_t pthread_id_get_size(void *priv __attribute__((unused)),
                size_t offset)
 {
        size_t size = 0;
@@ -28,7 +28,7 @@ size_t pthread_id_get_size(struct lttng_ust_ctx_field *field __attribute__((unus
 }
 
 static
-void pthread_id_record(struct lttng_ust_ctx_field *field __attribute__((unused)),
+void pthread_id_record(void *priv __attribute__((unused)),
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct lttng_ust_channel_buffer *chan)
 {
@@ -39,49 +39,37 @@ void pthread_id_record(struct lttng_ust_ctx_field *field __attribute__((unused))
 }
 
 static
-void pthread_id_get_value(struct lttng_ust_ctx_field *field __attribute__((unused)),
+void pthread_id_get_value(void *priv __attribute__((unused)),
                struct lttng_ust_ctx_value *value)
 {
        value->u.s64 = (unsigned long) pthread_self();
 }
 
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+       lttng_ust_static_event_field("pthread_id",
+               lttng_ust_static_type_integer(sizeof(unsigned long) * CHAR_BIT,
+                               lttng_ust_rb_alignof(unsigned long) * CHAR_BIT,
+                               lttng_ust_is_signed_type(unsigned long),
+                               BYTE_ORDER, 10),
+               false, false),
+       pthread_id_get_size,
+       pthread_id_record,
+       pthread_id_get_value,
+       NULL, NULL);
+
 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;
 
-       type = lttng_ust_create_type_integer(sizeof(unsigned long) * CHAR_BIT,
-                       lttng_ust_rb_alignof(unsigned long) * CHAR_BIT,
-                       lttng_ust_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")) {
+       if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
                ret = -EEXIST;
                goto error_find_context;
        }
-       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);
+       ret = lttng_ust_context_append(ctx, ctx_field);
+       if (ret)
+               return ret;
        return 0;
 
-error_name:
 error_find_context:
-       lttng_remove_context_field(ctx, field);
-error_context:
-       lttng_ust_destroy_type(type);
        return ret;
 }