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

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index cddfee900e5a039d202f69e2e2ac921e4ce10af2..ea0a12483940def937212bc152f518cef90e9c81 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -322,7 +322,7 @@ 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;
 
@@ -502,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;
@@ -512,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);
        }