Remove duplicate provider name checks

[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 0d42be9191958fc0042a74840cc97931cf1fb9f5..b6e69501d81c08bc79c5f82d9ff5b85d1d22230a 100644 (file)
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _LGPL_SOURCE
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ringbuffer-config.h>
+#include <urcu/tls-compat.h>
 #include <assert.h>
 #include "compat.h"
 
@@ -35,25 +37,26 @@
  * be set for a thread before the first event is logged within this
  * thread.
  */
-static __thread char cached_procname[17];
+typedef char procname_array[17];
+static DEFINE_URCU_TLS(procname_array, cached_procname);
 
 static inline
 char *wrapper_getprocname(void)
 {
-       if (caa_unlikely(!cached_procname[0])) {
-               lttng_ust_getprocname(cached_procname);
-               cached_procname[LTTNG_UST_PROCNAME_LEN - 1] = '\0';
+       if (caa_unlikely(!URCU_TLS(cached_procname)[0])) {
+               lttng_ust_getprocname(URCU_TLS(cached_procname));
+               URCU_TLS(cached_procname)[LTTNG_UST_PROCNAME_LEN - 1] = '\0';
        }
-       return cached_procname;
+       return URCU_TLS(cached_procname);
 }
 
 void lttng_context_procname_reset(void)
 {
-       cached_procname[0] = '\0';
+       URCU_TLS(cached_procname)[0] = '\0';
 }
 
 static
-size_t procname_get_size(size_t offset)
+size_t procname_get_size(struct lttng_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -72,6 +75,16 @@ void procname_record(struct lttng_ctx_field *field,
        chan->ops->event_write(ctx, procname, LTTNG_UST_PROCNAME_LEN);
 }
 
+static
+void procname_get_value(struct lttng_ctx_field *field,
+               struct lttng_ctx_value *value)
+{
+       char *procname;
+
+       procname = wrapper_getprocname();
+       value->u.str = procname;
+}
+
 int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
 {
        struct lttng_ctx_field *field;
@@ -95,6 +108,8 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.array.length = LTTNG_UST_PROCNAME_LEN;
        field->get_size = procname_get_size;
        field->record = procname_record;
+       field->get_value = procname_get_value;
+       lttng_context_update(*ctx);
        return 0;
 }
 
@@ -103,5 +118,5 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
  */
 void lttng_fixup_procname_tls(void)
 {
-       asm volatile ("" : : "m" (cached_procname[0]));
+       asm volatile ("" : : "m" (URCU_TLS(cached_procname)[0]));
 }