Refactoring: remove struct_size from struct lttng_ust_ctx_value

[lttng-ust.git] / liblttng-ust / lttng-context-mnt-ns.c

diff --git a/liblttng-ust/lttng-context-mnt-ns.c b/liblttng-ust/lttng-context-mnt-ns.c
index 4bbf48c343eadfb90c708ba4c9bea683caadd1d6..930bd61849a257d0002962ac887ecd15730f0eef 100644 (file)
--- a/liblttng-ust/lttng-context-mnt-ns.c
+++ b/liblttng-ust/lttng-context-mnt-ns.c
@@ -1,24 +1,10 @@
 /*
- * lttng-context-mnt-ns.c
- *
- * LTTng UST mnt namespace context.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *               2019 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) 2019 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 mnt namespace context.
  */
 
 #define _LGPL_SOURCE
@@ -30,6 +16,7 @@
 #include <lttng/ust-tracer.h>
 #include <lttng/ringbuffer-config.h>
 
+#include "context-internal.h"
 #include "ns.h"
 
 /*
@@ -85,7 +72,7 @@ void lttng_context_mnt_ns_reset(void)
 }
 
 static
-size_t mnt_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t mnt_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -95,7 +82,7 @@ size_t mnt_ns_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void mnt_ns_record(struct lttng_ctx_field *field,
+void mnt_ns_record(struct lttng_ust_ctx_field *field,
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
@@ -107,15 +94,15 @@ void mnt_ns_record(struct lttng_ctx_field *field,
 }
 
 static
-void mnt_ns_get_value(struct lttng_ctx_field *field,
-               struct lttng_ctx_value *value)
+void mnt_ns_get_value(struct lttng_ust_ctx_field *field,
+               struct lttng_ust_ctx_value *value)
 {
        value->u.s64 = get_mnt_ns();
 }
 
-int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_mnt_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)
@@ -124,14 +111,14 @@ int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx)
                lttng_remove_context_field(ctx, field);
                return -EEXIST;
        }
-       field->event_field.name = "mnt_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 = "mnt_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 = mnt_ns_get_size;
        field->record = mnt_ns_record;
        field->get_value = mnt_ns_get_value;