Namespace lttng/align.h as lttng/ust-align.h

[lttng-ust.git] / liblttng-ust / lttng-context-procname.c

diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c
index ec89bd8af336bdaca2de0adc1e9120982e1f19a6..1221298ec24eb6efe41e447fefb471f0493d7567 100644 (file)
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 #include <urcu/tls-compat.h>
 #include <assert.h>
 #include "compat.h"
@@ -56,7 +56,7 @@ char *wrapper_getprocname(void)
 }
 
 /* Reset should not be called from a signal handler. */
-void lttng_context_procname_reset(void)
+void lttng_ust_context_procname_reset(void)
 {
        CMM_STORE_SHARED(URCU_TLS(cached_procname)[1][0], '\0');
        CMM_STORE_SHARED(URCU_TLS(procname_nesting), 1);
@@ -65,13 +65,13 @@ void lttng_context_procname_reset(void)
 }
 
 static
-size_t procname_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t procname_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        return LTTNG_UST_ABI_PROCNAME_LEN;
 }
 
 static
-void procname_record(struct lttng_ctx_field *field,
+void procname_record(struct lttng_ust_ctx_field *field,
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
@@ -82,36 +82,48 @@ void procname_record(struct lttng_ctx_field *field,
 }
 
 static
-void procname_get_value(struct lttng_ctx_field *field,
-               struct lttng_ctx_value *value)
+void procname_get_value(struct lttng_ust_ctx_field *field,
+               struct lttng_ust_ctx_value *value)
 {
        value->u.str = wrapper_getprocname();
 }
 
-static const struct lttng_type procname_array_elem_type =
-       __type_integer(char, BYTE_ORDER, 10, UTF8);
-
-int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_procname_to_ctx(struct lttng_ust_ctx **ctx)
 {
-       struct lttng_ctx_field *field;
+       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_array_text(LTTNG_UST_ABI_PROCNAME_LEN);
+       if (!type)
                return -ENOMEM;
+       field = lttng_append_context(ctx);
+       if (!field) {
+               ret = -ENOMEM;
+               goto error_context;
+       }
        if (lttng_find_context(*ctx, "procname")) {
-               lttng_remove_context_field(ctx, field);
-               return -EEXIST;
+               ret = -EEXIST;
+               goto error_find_context;
+       }
+       field->event_field->name = strdup("procname");
+       if (!field->event_field->name) {
+               ret = -ENOMEM;
+               goto error_name;
        }
-       field->event_field.name = "procname";
-       field->event_field.type.atype = atype_array_nestable;
-       field->event_field.type.u.array_nestable.elem_type =
-               &procname_array_elem_type;
-       field->event_field.type.u.array_nestable.length = LTTNG_UST_ABI_PROCNAME_LEN;
+       field->event_field->type = type;
        field->get_size = procname_get_size;
        field->record = procname_record;
        field->get_value = procname_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;
 }
 
 /*