Fix: pass private data to context callbacks

[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 1221298ec24eb6efe41e447fefb471f0493d7567..96a1b2ca2c36083b9d921220f1173f551256025d 100644 (file)
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -14,6 +14,7 @@
 #include <urcu/tls-compat.h>
 #include <assert.h>
 #include "compat.h"
+#include "lttng-tracer-core.h"
 
 #include "context-internal.h"
 
@@ -36,7 +37,7 @@ static DEFINE_URCU_TLS(procname_array, cached_procname);
 static DEFINE_URCU_TLS(int, procname_nesting);
 
 static inline
-char *wrapper_getprocname(void)
+const char *wrapper_getprocname(void)
 {
        int nesting = CMM_LOAD_SHARED(URCU_TLS(procname_nesting));
 
@@ -65,64 +66,53 @@ void lttng_ust_context_procname_reset(void)
 }
 
 static
-size_t procname_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t procname_get_size(void *priv __attribute__((unused)),
+               size_t offset __attribute__((unused)))
 {
        return LTTNG_UST_ABI_PROCNAME_LEN;
 }
 
 static
-void procname_record(struct lttng_ust_ctx_field *field,
+void procname_record(void *priv __attribute__((unused)),
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+                struct lttng_ust_channel_buffer *chan)
 {
-       char *procname;
+       const char *procname;
 
        procname = wrapper_getprocname();
-       chan->ops->event_write(ctx, procname, LTTNG_UST_ABI_PROCNAME_LEN);
+       chan->ops->event_write(ctx, procname, LTTNG_UST_ABI_PROCNAME_LEN, 1);
 }
 
 static
-void procname_get_value(struct lttng_ust_ctx_field *field,
+void procname_get_value(void *priv __attribute__((unused)),
                struct lttng_ust_ctx_value *value)
 {
        value->u.str = wrapper_getprocname();
 }
 
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+       lttng_ust_static_event_field("procname",
+               lttng_ust_static_type_array_text(LTTNG_UST_ABI_PROCNAME_LEN),
+               false, false),
+       procname_get_size,
+       procname_record,
+       procname_get_value,
+       NULL, NULL);
+
 int lttng_add_procname_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_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")) {
+       if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
                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->type = type;
-       field->get_size = procname_get_size;
-       field->record = procname_record;
-       field->get_value = procname_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;
 }