X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cpu-id.c;h=358dff98e38ec28ebd33c15857ede451b5286672;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=fb6e407cfb9c1c82bdd9a2eb741e42bb0a8e7b02;hpb=c7ea8487b97b4552a9fcf214a45e104c5f771c85;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index fb6e407c..358dff98 100644
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -1,5 +1,7 @@
 /*
- * lttng-context-cpu-id.c
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ * Copyright (C) 2009-2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng UST CPU id context.
  *
@@ -8,86 +10,74 @@
  * statistical. For instance, even though a user might select a
  * cpu_id==1 filter, there may be few events recorded into the channel
  * appearing from other CPUs, due to migration.
- *
- * Copyright (C) 2009-2015 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
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
+#include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <limits.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
 #include "../libringbuffer/getcpu.h"
+#include <lttng/ringbuffer-context.h>
+
+#include "context-internal.h"
 
 static
-size_t cpu_id_get_size(size_t offset)
+size_t cpu_id_get_size(void *priv __attribute__((unused)),
+		size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(int));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(int));
 	size += sizeof(int);
 	return size;
 }
 
 static
-void cpu_id_record(struct lttng_ctx_field *field,
+void cpu_id_record(void *priv __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	int cpu;
 
 	cpu = lttng_ust_get_cpu();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(cpu));
-	chan->ops->event_write(ctx, &cpu, sizeof(cpu));
+	chan->ops->event_write(ctx, &cpu, sizeof(cpu), lttng_ust_rb_alignof(cpu));
 }
 
 static
-void cpu_id_get_value(struct lttng_ctx_field *field,
-		union lttng_ctx_value *value)
+void cpu_id_get_value(void *priv __attribute__((unused)),
+		struct lttng_ust_ctx_value *value)
 {
-	int cpu;
-
-	cpu = lttng_ust_get_cpu();
-	value->s64 = cpu;
+	value->u.s64 = lttng_ust_get_cpu();
 }
 
-int lttng_add_cpu_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("cpu_id",
+		lttng_ust_static_type_integer(sizeof(int) * CHAR_BIT,
+				lttng_ust_rb_alignof(int) * CHAR_BIT,
+				lttng_ust_is_signed_type(int),
+				BYTE_ORDER, 10),
+		false, false),
+	cpu_id_get_size,
+	cpu_id_record,
+	cpu_id_get_value,
+	NULL, NULL);
+
+int lttng_add_cpu_id_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
+	int ret;
 
-	field = lttng_append_context(ctx);
-	if (!field)
-		return -ENOMEM;
-	if (lttng_find_context(*ctx, "cpu_id")) {
-		lttng_remove_context_field(ctx, field);
-		return -EEXIST;
+	if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
+		ret = -EEXIST;
+		goto error_find_context;
 	}
-	field->event_field.name = "cpu_id";
-	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(int);
-	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 = cpu_id_get_size;
-	field->record = cpu_id_record;
-	field->get_value = cpu_id_get_value;
-	lttng_context_update(*ctx);
+	ret = lttng_ust_context_append(ctx, ctx_field);
+	if (ret)
+		return ret;
 	return 0;
+
+error_find_context:
+	return ret;
 }