X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-procname.c;h=9e24cb0630d92b0cac74d2e64f88934f7b96f95f;hb=dc177d114989d85bc9d0c9f561632b9ea3a19908;hp=238ec10a5ccbf66077e65411f8e81cd32e02b8e3;hpb=0db3d6ee9be2906d02955fedee802338bcfaef3a;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c
index 238ec10a..9e24cb06 100644
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -1,23 +1,9 @@
 /*
- * 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
@@ -29,6 +15,8 @@
 #include <assert.h>
 #include "compat.h"
 
+#include "context-internal.h"
+
 /* Maximum number of nesting levels for the procname cache. */
 #define PROCNAME_NESTING_MAX	2
 
@@ -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,13 +65,13 @@ 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_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)
 {
@@ -94,8 +82,8 @@ void procname_record(struct lttng_ctx_field *field,
 }
 
 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();
 }
@@ -103,9 +91,9 @@ void procname_get_value(struct lttng_ctx_field *field,
 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;
 
 	field = lttng_append_context(ctx);
 	if (!field)
@@ -114,11 +102,11 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
 		lttng_remove_context_field(ctx, field);
 		return -EEXIST;
 	}
-	field->event_field.name = "procname";
-	field->event_field.type.atype = atype_array_nestable;
-	field->event_field.type.u.array_nestable.elem_type =
+	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_ABI_PROCNAME_LEN;
+	field->event_field->type.u.array_nestable.length = LTTNG_UST_ABI_PROCNAME_LEN;
 	field->get_size = procname_get_size;
 	field->record = procname_record;
 	field->get_value = procname_get_value;