Tracepoint API namespacing '__lttng_ust_events_exit'

[lttng-ust.git] / src / lib / lttng-ust / lttng-events.c

diff --git a/src/lib/lttng-ust/lttng-events.c b/src/lib/lttng-ust/lttng-events.c
index 445a3c398b279c0271f25af7869b1acda7c2559a..386106136bf4ca08c15ada7913c6c32179d5576b 100644 (file)
--- a/src/lib/lttng-ust/lttng-events.c
+++ b/src/lib/lttng-ust/lttng-events.c
@@ -120,23 +120,23 @@ int lttng_loglevel_match(int loglevel,
                int req_loglevel)
 {
        if (!has_loglevel)
-               loglevel = TRACE_DEFAULT;
+               loglevel = LTTNG_UST_TRACEPOINT_LOGLEVEL_DEFAULT;
        switch (req_type) {
        case LTTNG_UST_ABI_LOGLEVEL_RANGE:
                if (loglevel <= req_loglevel
-                               || (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
+                               || (req_loglevel == -1 && loglevel <= LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG))
                        return 1;
                else
                        return 0;
        case LTTNG_UST_ABI_LOGLEVEL_SINGLE:
                if (loglevel == req_loglevel
-                               || (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
+                               || (req_loglevel == -1 && loglevel <= LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG))
                        return 1;
                else
                        return 0;
        case LTTNG_UST_ABI_LOGLEVEL_ALL:
        default:
-               if (loglevel <= TRACE_DEBUG)
+               if (loglevel <= LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG)
                        return 1;
                else
                        return 0;
@@ -266,12 +266,11 @@ void register_event(struct lttng_ust_event_common *event)
 {
        int ret;
        const struct lttng_ust_event_desc *desc;
-       char name[LTTNG_UST_ABI_SYM_NAME_LEN];
 
        assert(event->priv->registered == 0);
        desc = event->priv->desc;
-       lttng_ust_format_event_name(desc, name);
-       ret = lttng_ust_tp_probe_register_queue_release(name,
+       ret = lttng_ust_tp_probe_register_queue_release(desc->probe_desc->provider_name,
+                       desc->event_name,
                        desc->probe_callback,
                        event, desc->signature);
        WARN_ON_ONCE(ret);
@@ -284,12 +283,11 @@ void unregister_event(struct lttng_ust_event_common *event)
 {
        int ret;
        const struct lttng_ust_event_desc *desc;
-       char name[LTTNG_UST_ABI_SYM_NAME_LEN];
 
        assert(event->priv->registered == 1);
        desc = event->priv->desc;
-       lttng_ust_format_event_name(desc, name);
-       ret = lttng_ust_tp_probe_unregister_queue_release(name,
+       ret = lttng_ust_tp_probe_unregister_queue_release(desc->probe_desc->provider_name,
+                       desc->event_name,
                        desc->probe_callback,
                        event);
        WARN_ON_ONCE(ret);
@@ -781,7 +779,7 @@ int lttng_event_recorder_create(const struct lttng_ust_event_desc *desc,
        if (desc->loglevel)
                loglevel = *(*desc->loglevel);
        else
-               loglevel = TRACE_DEFAULT;
+               loglevel = LTTNG_UST_TRACEPOINT_LOGLEVEL_DEFAULT;
        if (desc->model_emf_uri)
                uri = *(desc->model_emf_uri);
        else