X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-procname.c;h=c6660e3c02319334989c44d277fdef6179ed297f;hb=de713d8a77cbd77e60f58537b0fc222f98fde395;hp=95d5f28dbe20b9a2e21decd18e7b2db04ccb0efa;hpb=74011e88983b12958dacd6621d60c18f6a84f59b;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c
index 95d5f28d..c6660e3c 100644
--- 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>
@@ -49,34 +50,36 @@ static DEFINE_URCU_TLS(int, procname_nesting);
 static inline
 char *wrapper_getprocname(void)
 {
-	int nesting = URCU_TLS(procname_nesting);
+	int nesting = CMM_LOAD_SHARED(URCU_TLS(procname_nesting));
 
 	if (caa_unlikely(nesting >= PROCNAME_NESTING_MAX))
 		return "<unknown>";
 	if (caa_unlikely(!URCU_TLS(cached_procname)[nesting][0])) {
 		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';
+		/* Decrement nesting after updating cache. */
+		cmm_barrier();
 		CMM_STORE_SHARED(URCU_TLS(procname_nesting), nesting);
 	}
 	return URCU_TLS(cached_procname)[nesting];
 }
 
+/* Reset should not be called from a signal handler. */
 void lttng_context_procname_reset(void)
 {
-	URCU_TLS(cached_procname)[1][0] = '\0';
+	CMM_STORE_SHARED(URCU_TLS(cached_procname)[1][0], '\0');
 	CMM_STORE_SHARED(URCU_TLS(procname_nesting), 1);
-	URCU_TLS(cached_procname)[0][0] = '\0';
+	CMM_STORE_SHARED(URCU_TLS(cached_procname)[0][0], '\0');
 	CMM_STORE_SHARED(URCU_TLS(procname_nesting), 0);
 }
 
 static
 size_t procname_get_size(struct lttng_ctx_field *field, size_t offset)
 {
-	size_t size = 0;
-
-	size += LTTNG_UST_PROCNAME_LEN;
-	return size;
+	return LTTNG_UST_PROCNAME_LEN;
 }
 
 static
@@ -94,12 +97,12 @@ static
 void procname_get_value(struct lttng_ctx_field *field,
 		struct lttng_ctx_value *value)
 {
-	char *procname;
-
-	procname = wrapper_getprocname();
-	value->u.str = procname;
+	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;
@@ -112,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_PROCNAME_LEN;
 	field->get_size = procname_get_size;
 	field->record = procname_record;
 	field->get_value = procname_get_value;