X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-pthread-id.c;h=da02d1a862b1d58a52d09f999cfde1c9fa6f479b;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=62eda808786d01b1cf7eb165d4915a0e909b6a40;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-pthread-id.c b/liblttng-ust/lttng-context-pthread-id.c
index 62eda808..da02d1a8 100644
--- a/liblttng-ust/lttng-context-pthread-id.c
+++ b/liblttng-ust/lttng-context-pthread-id.c
@@ -1,59 +1,75 @@
 /*
- * (C) Copyright	2009-2011 -
- * 		Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * LTTng UST pthread_id context.
+ * Copyright (C) 2009-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * LTTng UST pthread_id context.
  */
 
+#define _LGPL_SOURCE
+#include <limits.h>
+#include <stddef.h>
 #include <pthread.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+
+#include "context-internal.h"
 
 static
-size_t pthread_id_get_size(size_t offset)
+size_t pthread_id_get_size(void *priv __attribute__((unused)),
+		size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(unsigned long));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(unsigned long));
 	size += sizeof(unsigned long);
 	return size;
 }
 
 static
-void pthread_id_record(struct lttng_ctx_field *field,
+void pthread_id_record(void *priv __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct ltt_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	unsigned long pthread_id;
 
 	pthread_id = (unsigned long) pthread_self();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(pthread_id));
-	chan->ops->event_write(ctx, &pthread_id, sizeof(pthread_id));
+	chan->ops->event_write(ctx, &pthread_id, sizeof(pthread_id), lttng_ust_rb_alignof(pthread_id));
+}
+
+static
+void pthread_id_get_value(void *priv __attribute__((unused)),
+		struct lttng_ust_ctx_value *value)
+{
+	value->u.s64 = (unsigned long) pthread_self();
 }
 
-int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx)
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+	lttng_ust_static_event_field("pthread_id",
+		lttng_ust_static_type_integer(sizeof(unsigned long) * CHAR_BIT,
+				lttng_ust_rb_alignof(unsigned long) * CHAR_BIT,
+				lttng_ust_is_signed_type(unsigned long),
+				BYTE_ORDER, 10),
+		false, false),
+	pthread_id_get_size,
+	pthread_id_record,
+	pthread_id_get_value,
+	NULL, NULL);
+
+int lttng_add_pthread_id_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
-
-	field = lttng_append_context(ctx);
-	if (!field)
-		return -ENOMEM;
-	if (lttng_find_context(*ctx, "pthread_id")) {
-		lttng_remove_context_field(ctx, field);
-		return -EEXIST;
+	int ret;
+
+	if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
+		ret = -EEXIST;
+		goto error_find_context;
 	}
-	field->event_field.name = "pthread_id";
-	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
-	field->get_size = pthread_id_get_size;
-	field->record = pthread_id_record;
+	ret = lttng_ust_context_append(ctx, ctx_field);
+	if (ret)
+		return ret;
 	return 0;
+
+error_find_context:
+	return ret;
 }