X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-time-ns.c;h=8edc1fae4462a844ca7705b47e83b8a09bb44ed7;hb=68f882666d2a83f061d702d154983a61987e25e2;hp=dda8fb37d3ab9481ce94e879650cb44e22c51c63;hpb=cefef7a70a723c31ab6a0746c7611f145337dabe;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-time-ns.c b/liblttng-ust/lttng-context-time-ns.c
index dda8fb37..8edc1fae 100644
--- a/liblttng-ust/lttng-context-time-ns.c
+++ b/liblttng-ust/lttng-context-time-ns.c
@@ -1,24 +1,10 @@
 /*
- * lttng-context-time-ns.c
- *
- * LTTng UST time namespace context.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *               2020 Michael Jeanson <mjeanson@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.
+ * Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
  *
- * 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 time namespace context.
  */
 
 #define _LGPL_SOURCE
@@ -29,10 +15,11 @@
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ringbuffer-config.h>
-#include <lttng/ust-tid.h>
+#include <ust-tid.h>
 #include <urcu/tls-compat.h>
 #include "lttng-tracer-core.h"
 #include "ns.h"
+#include "context-internal.h"
 
 
 /*
@@ -101,7 +88,7 @@ void lttng_context_time_ns_reset(void)
 }
 
 static
-size_t time_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t time_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -111,7 +98,7 @@ size_t time_ns_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void time_ns_record(struct lttng_ctx_field *field,
+void time_ns_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -123,15 +110,15 @@ void time_ns_record(struct lttng_ctx_field *field,
 }
 
 static
-void time_ns_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void time_ns_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_time_ns();
 }
 
-int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_time_ns_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)
@@ -140,14 +127,14 @@ int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx)
 		lttng_remove_context_field(ctx, field);
 		return -EEXIST;
 	}
-	field->event_field.name = "time_ns";
-	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.integer.size = sizeof(ino_t) * CHAR_BIT;
-	field->event_field.type.u.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
-	field->event_field.type.u.integer.signedness = lttng_is_signed_type(ino_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->event_field->name = "time_ns";
+	field->event_field->type.atype = atype_integer;
+	field->event_field->type.u.integer.size = sizeof(ino_t) * CHAR_BIT;
+	field->event_field->type.u.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
+	field->event_field->type.u.integer.signedness = lttng_is_signed_type(ino_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 = time_ns_get_size;
 	field->record = time_ns_record;
 	field->get_value = time_ns_get_value;