cleanup: Namespace public utils macros

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

diff --git a/liblttng-ust/lttng-context-cgroup-ns.c b/liblttng-ust/lttng-context-cgroup-ns.c
index 191fa9a74177165d9cd375bbd81a509c5afaef26..623689cc12dfa1632f17318c7453152825c8f85f 100644 (file)
--- a/liblttng-ust/lttng-context-cgroup-ns.c
+++ b/liblttng-ust/lttng-context-cgroup-ns.c
@@ -14,9 +14,11 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
 #include <ust-tid.h>
 #include <urcu/tls-compat.h>
+#include <lttng/ringbuffer-context.h>
+
+#include "context-internal.h"
 #include "lttng-tracer-core.h"
 #include "ns.h"
 
@@ -88,7 +90,7 @@ void lttng_context_cgroup_ns_reset(void)
 }
 
 static
-size_t cgroup_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t cgroup_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
@@ -98,9 +100,9 @@ size_t cgroup_ns_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void cgroup_ns_record(struct lttng_ctx_field *field,
+void cgroup_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 cgroup_ns;
 
@@ -110,36 +112,51 @@ void cgroup_ns_record(struct lttng_ctx_field *field,
 }
 
 static
-void cgroup_ns_get_value(struct lttng_ctx_field *field,
-               struct lttng_ctx_value *value)
+void cgroup_ns_get_value(struct lttng_ust_ctx_field *field,
+               struct lttng_ust_ctx_value *value)
 {
        value->u.s64 = get_cgroup_ns();
 }
 
-int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_cgroup_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_ust_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, "cgroup_ns")) {
-               lttng_remove_context_field(ctx, field);
-               return -EEXIST;
+               ret = -EEXIST;
+               goto error_find_context;
+       }
+       field->event_field->name = strdup("cgroup_ns");
+       if (!field->event_field->name) {
+               ret = -ENOMEM;
+               goto error_name;
        }
-       field->event_field.name = "cgroup_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->type = type;
        field->get_size = cgroup_ns_get_size;
        field->record = cgroup_ns_record;
        field->get_value = cgroup_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;
 }
 
 /*