Fix: Java agent: close session daemon socket on error

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

diff --git a/liblttng-ust/lttng-context-net-ns.c b/liblttng-ust/lttng-context-net-ns.c
index 3da46d636f107334c0f0e44955d2ff8d5eb4ba9c..c97f6c29453c48be54ab4fc2fcd8df6bfff9beaa 100644 (file)
--- a/liblttng-ust/lttng-context-net-ns.c
+++ b/liblttng-ust/lttng-context-net-ns.c
@@ -34,12 +34,11 @@
 #include "lttng-tracer-core.h"
 #include "ns.h"
 
-
 /*
  * We cache the result to ensure we don't stat(2) the proc filesystem on
  * each event.
  */
-static DEFINE_URCU_TLS(ino_t, cached_net_ns) = NS_INO_UNINITIALIZED;
+static DEFINE_URCU_TLS_INIT(ino_t, cached_net_ns, NS_INO_UNINITIALIZED);
 
 static
 ino_t get_net_ns(void)
@@ -143,12 +142,12 @@ int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
        }
        field->event_field.name = "net_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.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 = net_ns_get_size;
        field->record = net_ns_record;
        field->get_value = net_ns_get_value;