Refactoring: context structures

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

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 762395d657330b0aca25959661d8d2ebe587bb53..035548947ad381af2338fc371040ab1608d93703 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -232,7 +232,7 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
 static
 void _lttng_channel_unmap(struct lttng_channel *lttng_chan)
 {
-       struct channel *chan;
+       struct lttng_ust_lib_ring_buffer_channel *chan;
        struct lttng_ust_shm_handle *handle;
 
        cds_list_del(&lttng_chan->node);
@@ -254,7 +254,7 @@ void register_event(struct lttng_ust_event_common *event)
 
        assert(event->priv->registered == 0);
        desc = event->priv->desc;
-       ret = __tracepoint_probe_register_queue_release(desc->name,
+       ret = lttng_ust_tp_probe_register_queue_release(desc->name,
                        desc->probe_callback,
                        event, desc->signature);
        WARN_ON_ONCE(ret);
@@ -270,7 +270,7 @@ void unregister_event(struct lttng_ust_event_common *event)
 
        assert(event->priv->registered == 1);
        desc = event->priv->desc;
-       ret = __tracepoint_probe_unregister_queue_release(desc->name,
+       ret = lttng_ust_tp_probe_unregister_queue_release(desc->name,
                        desc->probe_callback,
                        event);
        WARN_ON_ONCE(ret);
@@ -297,7 +297,7 @@ void lttng_session_destroy(struct lttng_session *session)
                _lttng_event_unregister(event_recorder_priv->parent.pub);
        }
        lttng_ust_urcu_synchronize_rcu();       /* Wait for in-flight events to complete */
-       __tracepoint_probe_prune_release_queue();
+       lttng_ust_tp_probe_prune_release_queue();
        cds_list_for_each_entry_safe(event_enabler, event_tmpenabler,
                        &session->priv->enablers_head, node)
                lttng_event_enabler_destroy(event_enabler);
@@ -516,7 +516,7 @@ int lttng_create_all_event_enums(size_t nr_fields,
 
 static
 int lttng_create_all_ctx_enums(size_t nr_fields,
-               const struct lttng_ctx_field *ctx_fields,
+               struct lttng_ust_ctx_field **ctx_fields,
                struct lttng_session *session)
 {
        size_t i;
@@ -524,7 +524,7 @@ int lttng_create_all_ctx_enums(size_t nr_fields,
 
        /* For each field, ensure enum is part of the session. */
        for (i = 0; i < nr_fields; i++) {
-               const struct lttng_type *type = &ctx_fields[i].event_field.type;
+               const struct lttng_type *type = &ctx_fields[i]->event_field->type;
 
                ret = lttng_create_enum_check(type, session);
                if (ret)
@@ -570,8 +570,8 @@ int lttng_session_enable(struct lttng_session *session)
         * we need to use.
         */
        cds_list_for_each_entry(chan, &session->priv->chan_head, node) {
-               const struct lttng_ctx *ctx;
-               const struct lttng_ctx_field *fields = NULL;
+               const struct lttng_ust_ctx *ctx;
+               struct lttng_ust_ctx_field **fields = NULL;
                size_t nr_fields = 0;
                uint32_t chan_id;
 
@@ -1186,7 +1186,7 @@ void lttng_probe_provider_unregister_events(
        /* Wait for grace period. */
        lttng_ust_urcu_synchronize_rcu();
        /* Prune the unregistration queue. */
-       __tracepoint_probe_prune_release_queue();
+       lttng_ust_tp_probe_prune_release_queue();
 
        /*
         * It is now safe to destroy the events and remove them from the event list
@@ -1546,7 +1546,7 @@ int lttng_event_notifier_enabler_attach_exclusion(
 
 int lttng_attach_context(struct lttng_ust_abi_context *context_param,
                union lttng_ust_abi_args *uargs,
-               struct lttng_ctx **ctx, struct lttng_session *session)
+               struct lttng_ust_ctx **ctx, struct lttng_session *session)
 {
        /*
         * We cannot attach a context after trace has been started for a
@@ -1654,7 +1654,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
         */
        cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
                struct lttng_enabler_ref *enabler_ref;
-               struct lttng_bytecode_runtime *runtime;
+               struct lttng_ust_bytecode_runtime *runtime;
                int enabled = 0, has_enablers_without_bytecode = 0;
 
                /* Enable events */
@@ -1703,7 +1703,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
                        lttng_bytecode_filter_sync_state(runtime);
                }
        }
-       __tracepoint_probe_prune_release_queue();
+       lttng_ust_tp_probe_prune_release_queue();
 }
 
 /* Support for event notifier is introduced by probe provider major version 2. */
@@ -1872,7 +1872,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
         */
        cds_list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
                struct lttng_enabler_ref *enabler_ref;
-               struct lttng_bytecode_runtime *runtime;
+               struct lttng_ust_bytecode_runtime *runtime;
                int enabled = 0, has_enablers_without_bytecode = 0;
 
                /* Enable event_notifiers */
@@ -1921,7 +1921,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
                        lttng_bytecode_capture_sync_state(runtime);
                }
        }
-       __tracepoint_probe_prune_release_queue();
+       lttng_ust_tp_probe_prune_release_queue();
 }
 
 /*
@@ -1947,12 +1947,12 @@ void lttng_session_lazy_sync_event_enablers(struct lttng_session *session)
  * context (either app context callbacks, or dummy callbacks).
  */
 void lttng_ust_context_set_session_provider(const char *name,
-               size_t (*get_size)(struct lttng_ctx_field *field, size_t offset),
-               void (*record)(struct lttng_ctx_field *field,
+               size_t (*get_size)(struct lttng_ust_ctx_field *field, size_t offset),
+               void (*record)(struct lttng_ust_ctx_field *field,
                        struct lttng_ust_lib_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan),
-               void (*get_value)(struct lttng_ctx_field *field,
-                       struct lttng_ctx_value *value))
+               void (*get_value)(struct lttng_ust_ctx_field *field,
+                       struct lttng_ust_ctx_value *value))
 {
        struct lttng_ust_session_private *session_priv;
 
@@ -1988,12 +1988,12 @@ void lttng_ust_context_set_session_provider(const char *name,
  * context (either app context callbacks, or dummy callbacks).
  */
 void lttng_ust_context_set_event_notifier_group_provider(const char *name,
-               size_t (*get_size)(struct lttng_ctx_field *field, size_t offset),
-               void (*record)(struct lttng_ctx_field *field,
+               size_t (*get_size)(struct lttng_ust_ctx_field *field, size_t offset),
+               void (*record)(struct lttng_ust_ctx_field *field,
                        struct lttng_ust_lib_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan),
-               void (*get_value)(struct lttng_ctx_field *field,
-                       struct lttng_ctx_value *value))
+               void (*get_value)(struct lttng_ust_ctx_field *field,
+                       struct lttng_ust_ctx_value *value))
 {
        struct lttng_event_notifier_group *event_notifier_group;