X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vpid.c;h=ddcfb8ad3bcf25ed98f15557945d65c4a73c14f2;hb=a880bae51b3d8e927f68ceae2804636976bd62d8;hp=aa2586ef6009c9deda9d30ca12aa8987ad132c31;hpb=b4051ad8c170901d5297e1b3005b24e63cb0ab1e;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vpid.c b/liblttng-ust/lttng-context-vpid.c
index aa2586ef..ddcfb8ad 100644
--- a/liblttng-ust/lttng-context-vpid.c
+++ b/liblttng-ust/lttng-context-vpid.c
@@ -1,23 +1,9 @@
 /*
- * lttng-context-vpid.c
- *
- * LTTng UST vpid 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 vpid context.
  */
 
 #define _LGPL_SOURCE
@@ -28,6 +14,8 @@
 #include <lttng/ust-tracer.h>
 #include <lttng/ringbuffer-config.h>
 
+#include "context-internal.h"
+
 /*
  * We cache the result to ensure we don't trigger a system call for
  * each event.
@@ -57,7 +45,7 @@ void lttng_context_vpid_reset(void)
 }
 
 static
-size_t vpid_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t vpid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -67,7 +55,7 @@ size_t vpid_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void vpid_record(struct lttng_ctx_field *field,
+void vpid_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -78,15 +66,15 @@ void vpid_record(struct lttng_ctx_field *field,
 }
 
 static
-void vpid_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void vpid_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = wrapper_getvpid();
 }
 
-int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_vpid_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)
@@ -95,14 +83,14 @@ int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
 		lttng_remove_context_field(ctx, field);
 		return -EEXIST;
 	}
-	field->event_field.name = "vpid";
-	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(pid_t);
-	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 = "vpid";
+	field->event_field->type.atype = atype_integer;
+	field->event_field->type.u.integer.size = sizeof(pid_t) * CHAR_BIT;
+	field->event_field->type.u.integer.alignment = lttng_alignof(pid_t) * CHAR_BIT;
+	field->event_field->type.u.integer.signedness = lttng_is_signed_type(pid_t);
+	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 = vpid_get_size;
 	field->record = vpid_record;
 	field->get_value = vpid_get_value;