X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cpu-id.c;h=1221bf6cf687db73f56256201eeff026b5b26f24;hb=daacdbfc04fe07ecff0a0d1878b4f48d38912c78;hp=c94ef7145fbbeb8e7a6a4c59501e98c2d16f6da0;hpb=b4051ad8c170901d5297e1b3005b24e63cb0ab1e;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index c94ef714..1221bf6c 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,25 +10,8 @@
  * 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>
@@ -36,8 +21,10 @@
 #include <lttng/ringbuffer-config.h>
 #include "../libringbuffer/getcpu.h"
 
+#include "context-internal.h"
+
 static
-size_t cpu_id_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t cpu_id_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -47,7 +34,7 @@ size_t cpu_id_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void cpu_id_record(struct lttng_ctx_field *field,
+void cpu_id_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -59,15 +46,15 @@ void cpu_id_record(struct lttng_ctx_field *field,
 }
 
 static
-void cpu_id_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void cpu_id_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = lttng_ust_get_cpu();
 }
 
-int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_cpu_id_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)
@@ -76,14 +63,14 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
 		lttng_remove_context_field(ctx, field);
 		return -EEXIST;
 	}
-	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->event_field->name = "cpu_id";
+	field->event_field->type.atype = atype_integer;
+	field->event_field->type.u.integer.size = sizeof(int) * CHAR_BIT;
+	field->event_field->type.u.integer.alignment = lttng_alignof(int) * CHAR_BIT;
+	field->event_field->type.u.integer.signedness = lttng_is_signed_type(int);
+	field->event_field->type.u.integer.reverse_byte_order = 0;
+	field->event_field->type.u.integer.base = 10;
+	field->event_field->type.u.integer.encoding = lttng_encode_none;
 	field->get_size = cpu_id_get_size;
 	field->record = cpu_id_record;
 	field->get_value = cpu_id_get_value;