X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-procname.c;h=00a79355a577ce234b4ec1d5c9a11b9f576cdd88;hb=e7bc0ef6c86ae97886cf5f8b28854cf281d4962b;hp=c6660e3c02319334989c44d277fdef6179ed297f;hpb=218deb69baab57ee2f6728eef18e84697f21197b;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c
index c6660e3c..00a79355 100644
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -1,34 +1,22 @@
 /*
- * lttng-context-procname.c
- *
- * LTTng UST procname context.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * LTTng UST procname context.
  */
 
 #define _LGPL_SOURCE
 #include <stddef.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 #include <urcu/tls-compat.h>
 #include <assert.h>
 #include "compat.h"
 
+#include "context-internal.h"
+
 /* Maximum number of nesting levels for the procname cache. */
 #define PROCNAME_NESTING_MAX	2
 
@@ -58,8 +46,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);
@@ -68,7 +56,7 @@ char *wrapper_getprocname(void)
 }
 
 /* Reset should not be called from a signal handler. */
-void lttng_context_procname_reset(void)
+void lttng_ust_context_procname_reset(void)
 {
 	CMM_STORE_SHARED(URCU_TLS(cached_procname)[1][0], '\0');
 	CMM_STORE_SHARED(URCU_TLS(procname_nesting), 1);
@@ -77,53 +65,65 @@ void lttng_context_procname_reset(void)
 }
 
 static
-size_t procname_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t procname_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
-	return LTTNG_UST_PROCNAME_LEN;
+	return LTTNG_UST_ABI_PROCNAME_LEN;
 }
 
 static
-void procname_record(struct lttng_ctx_field *field,
+void procname_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	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
-void procname_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void procname_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	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)
+int lttng_add_procname_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
+	struct lttng_ust_ctx_field *field;
+	struct lttng_ust_type_common *type;
+	int ret;
 
-	field = lttng_append_context(ctx);
-	if (!field)
+	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")) {
-		lttng_remove_context_field(ctx, field);
-		return -EEXIST;
+		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.name = "procname";
-	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->event_field->type = type;
 	field->get_size = procname_get_size;
 	field->record = procname_record;
 	field->get_value = procname_get_value;
 	lttng_context_update(*ctx);
 	return 0;
+
+error_name:
+error_find_context:
+	lttng_remove_context_field(ctx, field);
+error_context:
+	lttng_ust_destroy_type(type);
+	return ret;
 }
 
 /*