configure: regroup C header checks

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

diff --git a/liblttng-ust/lttng-context-uts-ns.c b/liblttng-ust/lttng-context-uts-ns.c
index 43faad0dc32b6bbaae76789c4bc84f600aeba46a..3037d084b52d285a6aa75b32e2aa8afb69826820 100644 (file)
--- a/liblttng-ust/lttng-context-uts-ns.c
+++ b/liblttng-ust/lttng-context-uts-ns.c
@@ -1,24 +1,10 @@
 /*
- * lttng-context-uts-ns.c
- *
- * LTTng UST uts 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 uts namespace context.
  */
 
 #define _LGPL_SOURCE
@@ -28,9 +14,11 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
-#include <lttng/ust-tid.h>
+#include <lttng/ringbuffer-context.h>
+#include <ust-tid.h>
 #include <urcu/tls-compat.h>
+
+#include "context-internal.h"
 #include "lttng-tracer-core.h"
 #include "ns.h"
 
@@ -39,7 +27,7 @@
  * We cache the result to ensure we don't stat(2) the proc filesystem on
  * each event.
  */
-static DEFINE_URCU_TLS(ino_t, cached_uts_ns) = NS_INO_UNINITIALIZED;
+static DEFINE_URCU_TLS_INIT(ino_t, cached_uts_ns, NS_INO_UNINITIALIZED);
 
 static
 ino_t get_uts_ns(void)
@@ -102,7 +90,7 @@ void lttng_context_uts_ns_reset(void)
 }
 
 static
-size_t uts_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t uts_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -112,9 +100,9 @@ size_t uts_ns_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void uts_ns_record(struct lttng_ctx_field *field,
+void uts_ns_record(struct lttng_ust_ctx_field *field,
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+                struct lttng_ust_channel_buffer *chan)
 {
        ino_t uts_ns;
 
@@ -124,36 +112,51 @@ void uts_ns_record(struct lttng_ctx_field *field,
 }
 
 static
-void uts_ns_get_value(struct lttng_ctx_field *field,
-               struct lttng_ctx_value *value)
+void uts_ns_get_value(struct lttng_ust_ctx_field *field,
+               struct lttng_ust_ctx_value *value)
 {
        value->u.s64 = get_uts_ns();
 }
 
-int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_uts_ns_to_ctx(struct lttng_ust_ctx **ctx)
 {
-       struct lttng_ctx_field *field;
-
-       field = lttng_append_context(ctx);
-       if (!field)
+       struct lttng_ust_ctx_field *field;
+       struct lttng_ust_type_common *type;
+       int ret;
+
+       type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
+                       lttng_alignof(ino_t) * CHAR_BIT,
+                       lttng_is_signed_type(ino_t),
+                       BYTE_ORDER, 10);
+       if (!type)
                return -ENOMEM;
+       field = lttng_append_context(ctx);
+       if (!field) {
+               ret = -ENOMEM;
+               goto error_context;
+       }
        if (lttng_find_context(*ctx, "uts_ns")) {
-               lttng_remove_context_field(ctx, field);
-               return -EEXIST;
+               ret = -EEXIST;
+               goto error_find_context;
+       }
+       field->event_field->name = strdup("uts_ns");
+       if (!field->event_field->name) {
+               ret = -ENOMEM;
+               goto error_name;
        }
-       field->event_field.name = "uts_ns";
-       field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.basic.integer.size = sizeof(ino_t) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(ino_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->type = type;
        field->get_size = uts_ns_get_size;
        field->record = uts_ns_record;
        field->get_value = uts_ns_get_value;
        lttng_context_update(*ctx);
        return 0;
+
+error_name:
+error_find_context:
+       lttng_remove_context_field(ctx, field);
+error_context:
+       lttng_ust_destroy_type(type);
+       return ret;
 }
 
 /*