Hide new 'lttng_ust_compat_futex_*' private symbols

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

diff --git a/liblttng-ust/lttng-context.c b/liblttng-ust/lttng-context.c
index 5637028bed1bdd35d38715ad68afc33673652c50..e441d4ae2060561a44b9d980ef3e6d73800b1a26 100644 (file)
--- a/liblttng-ust/lttng-context.c
+++ b/liblttng-ust/lttng-context.c
@@ -24,12 +24,15 @@
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ust-context-provider.h>
-#include <urcu-pointer.h>
+#include <lttng/urcu/pointer.h>
 #include <usterr-signal-safe.h>
 #include <helper.h>
 #include <stddef.h>
 #include <string.h>
 #include <assert.h>
+#include "tracepoint-internal.h"
+
+#include "context-internal.h"
 
 /*
  * The filter implementation requires that two consecutive "get" for the
@@ -155,8 +158,8 @@ int lttng_context_add_rcu(struct lttng_ctx **ctx_p,
        }
        *nf = *f;
        lttng_context_update(new_ctx);
-       rcu_assign_pointer(*ctx_p, new_ctx);
-       synchronize_trace();
+       lttng_ust_rcu_assign_pointer(*ctx_p, new_ctx);
+       lttng_ust_synchronize_trace();
        if (old_ctx) {
                free(old_ctx->fields);
                free(old_ctx);
@@ -389,8 +392,8 @@ int lttng_ust_context_set_provider_rcu(struct lttng_ctx **_ctx,
                new_fields[i].get_value = get_value;
        }
        new_ctx->fields = new_fields;
-       rcu_assign_pointer(*_ctx, new_ctx);
-       synchronize_trace();
+       lttng_ust_rcu_assign_pointer(*_ctx, new_ctx);
+       lttng_ust_synchronize_trace();
        free(ctx->fields);
        free(ctx);
        return 0;
@@ -400,7 +403,7 @@ field_error:
        return ret;
 }
 
-int lttng_session_context_init(struct lttng_ctx **ctx)
+int lttng_context_init_all(struct lttng_ctx **ctx)
 {
        int ret;
 
@@ -454,6 +457,11 @@ int lttng_session_context_init(struct lttng_ctx **ctx)
                WARN("Cannot add context lttng_add_pid_ns_to_ctx");
                goto error;
        }
+       ret = lttng_add_time_ns_to_ctx(ctx);
+       if (ret) {
+               WARN("Cannot add context lttng_add_time_ns_to_ctx");
+               goto error;
+       }
        ret = lttng_add_user_ns_to_ctx(ctx);
        if (ret) {
                WARN("Cannot add context lttng_add_user_ns_to_ctx");
@@ -501,14 +509,3 @@ error:
        lttng_destroy_context(*ctx);
        return ret;
 }
-
-/* For backward compatibility. Leave those exported symbols in place. */
-struct lttng_ctx *lttng_static_ctx;
-
-void lttng_context_init(void)
-{
-}
-
-void lttng_context_exit(void)
-{
-}