Fix: event-notifier: not propagating error counter indexes

[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 c6d02cf60d3b0692dd449e5f12f08a32b08307bf..238ec10a5ccbf66077e65411f8e81cd32e02b8e3 100644 (file)
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -21,6 +21,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <stddef.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ringbuffer-config.h>
@@ -57,8 +58,8 @@ char *wrapper_getprocname(void)
                CMM_STORE_SHARED(URCU_TLS(procname_nesting), nesting + 1);
                /* Increment nesting before updating cache. */
                cmm_barrier();
-               lttng_ust_getprocname(URCU_TLS(cached_procname)[nesting]);
-               URCU_TLS(cached_procname)[nesting][LTTNG_UST_PROCNAME_LEN - 1] = '\0';
+               lttng_pthread_getname_np(URCU_TLS(cached_procname)[nesting], LTTNG_UST_ABI_PROCNAME_LEN);
+               URCU_TLS(cached_procname)[nesting][LTTNG_UST_ABI_PROCNAME_LEN - 1] = '\0';
                /* Decrement nesting after updating cache. */
                cmm_barrier();
                CMM_STORE_SHARED(URCU_TLS(procname_nesting), nesting);
@@ -78,7 +79,7 @@ void lttng_context_procname_reset(void)
 static
 size_t procname_get_size(struct lttng_ctx_field *field, size_t offset)
 {
-       return LTTNG_UST_PROCNAME_LEN;
+       return LTTNG_UST_ABI_PROCNAME_LEN;
 }
 
 static
@@ -89,7 +90,7 @@ void procname_record(struct lttng_ctx_field *field,
        char *procname;
 
        procname = wrapper_getprocname();
-       chan->ops->event_write(ctx, procname, LTTNG_UST_PROCNAME_LEN);
+       chan->ops->event_write(ctx, procname, LTTNG_UST_ABI_PROCNAME_LEN);
 }
 
 static
@@ -99,6 +100,9 @@ void procname_get_value(struct lttng_ctx_field *field,
        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)
 {
        struct lttng_ctx_field *field;
@@ -111,15 +115,10 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
                return -EEXIST;
        }
        field->event_field.name = "procname";
-       field->event_field.type.atype = atype_array;
-       field->event_field.type.u.array.elem_type.atype = atype_integer;
-       field->event_field.type.u.array.elem_type.u.basic.integer.size = sizeof(char) * CHAR_BIT;
-       field->event_field.type.u.array.elem_type.u.basic.integer.alignment = lttng_alignof(char) * CHAR_BIT;
-       field->event_field.type.u.array.elem_type.u.basic.integer.signedness = lttng_is_signed_type(char);
-       field->event_field.type.u.array.elem_type.u.basic.integer.reverse_byte_order = 0;
-       field->event_field.type.u.array.elem_type.u.basic.integer.base = 10;
-       field->event_field.type.u.array.elem_type.u.basic.integer.encoding = lttng_encode_UTF8;
-       field->event_field.type.u.array.length = LTTNG_UST_PROCNAME_LEN;
+       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->get_size = procname_get_size;
        field->record = procname_record;
        field->get_value = procname_get_value;