Merge branch 'master' of git.lttng.org:/home/git/lttng-ust

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

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index ccdfcfad83bb8f5ab3f7c611bb6178ed63ff179a..ea0a12483940def937212bc152f518cef90e9c81 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -322,10 +322,9 @@ void lttng_metadata_create_events(int channel_objd)
        struct ltt_channel *channel = objd_private(channel_objd);
        static struct lttng_ust_event metadata_params = {
                .instrumentation = LTTNG_UST_TRACEPOINT,
-               .name = "lttng_metadata",
+               .name = "lttng:metadata",
        };
        struct ltt_event *event;
-       int ret;
 
        /*
         * We tolerate no failure path after event creation. It will stay
@@ -333,7 +332,6 @@ void lttng_metadata_create_events(int channel_objd)
         */
        event = ltt_event_create(channel, &metadata_params, NULL);
        if (!event) {
-               ret = -EINVAL;
                goto create_error;
        }
        return;
@@ -355,11 +353,6 @@ int lttng_abi_create_channel(int session_objd,
        int ret = 0;
        struct ltt_channel chan_priv_init;
 
-       chan_objd = objd_alloc(NULL, &lttng_channel_ops);
-       if (chan_objd < 0) {
-               ret = chan_objd;
-               goto objd_error;
-       }
        switch (channel_type) {
        case PER_CPU_CHANNEL:
                if (chan_param->output == LTTNG_UST_MMAP) {
@@ -379,7 +372,12 @@ int lttng_abi_create_channel(int session_objd,
                break;
        default:
                transport_name = "<unknown>";
-               break;
+               return -EINVAL;
+       }
+       chan_objd = objd_alloc(NULL, ops);
+       if (chan_objd < 0) {
+               ret = chan_objd;
+               goto objd_error;
        }
        memset(&chan_priv_init, 0, sizeof(chan_priv_init));
        /* Copy of session UUID for consumer (availability through shm) */
@@ -504,6 +502,7 @@ static
 void ltt_tracepoint_list_get(struct ltt_tracepoint_list *list,
                char *tp_list_entry)
 {
+next:
        if (!list->got_first) {
                tracepoint_iter_start(&list->iter);
                list->got_first = 1;
@@ -514,6 +513,8 @@ copy:
        if (!list->iter.tracepoint) {
                tp_list_entry[0] = '\0';        /* end of list */
        } else {
+               if (!strcmp((*list->iter.tracepoint)->name, "lttng:metadata"))
+                       goto next;
                memcpy(tp_list_entry, (*list->iter.tracepoint)->name,
                        LTTNG_UST_SYM_NAME_LEN);
        }