X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-procname.c;h=c76d8ba397b1c2abdb758ca5bbd8033b82d24bdc;hb=3ae776d848830ec03db468e68e243e8a4ee401b0;hp=96cd1ee2c8f4979f7c7fbaf7c9367c2d9b59061b;hpb=009745db8ca05f7a3abbb37558b08eae0107f7e1;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c
index 96cd1ee2..c76d8ba3 100644
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -23,6 +23,7 @@
 #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,21 +36,22 @@
  * 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
@@ -64,7 +66,7 @@ size_t procname_get_size(size_t offset)
 static
 void procname_record(struct lttng_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct ltt_channel *chan)
+		 struct lttng_channel *chan)
 {
 	char *procname;
 
@@ -72,6 +74,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,
+		union lttng_ctx_value *value)
+{
+	char *procname;
+
+	procname = wrapper_getprocname();
+	value->str = procname;
+}
+
 int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
 {
 	struct lttng_ctx_field *field;
@@ -95,6 +107,7 @@ 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;
 	return 0;
 }
 
@@ -103,5 +116,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]));
 }