X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-procname.c;h=00a79355a577ce234b4ec1d5c9a11b9f576cdd88;hb=7ae0a9445db9a97a43f0054bd38144bfddb00ce0;hp=9e24cb0630d92b0cac74d2e64f88934f7b96f95f;hpb=daacdbfc04fe07ecff0a0d1878b4f48d38912c78;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c
index 9e24cb06..00a79355 100644
--- a/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@ -10,7 +10,7 @@
 #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"
@@ -73,7 +73,7 @@ size_t procname_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 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;
 
@@ -88,30 +88,42 @@ void procname_get_value(struct lttng_ust_ctx_field *field,
 	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_ust_ctx **ctx)
 {
 	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_ABI_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;
 }
 
 /*