lib: add bt_{graph,query_executor}_add_interrupter()

[babeltrace.git] / src / plugins / ctf / lttng-live / metadata.c

diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index f4d69ffc9398a2a2434386d756c03dd405a12c5c..b31cd96adbabfcdd2d254ae7988eb58a8b28a9ab 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -39,6 +39,7 @@
 
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
+#include "../common/metadata/ctf-meta-configure-ir-trace.h"
 
 #define TSDL_MAGIC     0x75d11d57
 
@@ -119,8 +120,6 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 {
        struct lttng_live_session *session = trace->session;
        struct lttng_live_metadata *metadata = trace->metadata;
-       struct lttng_live_component *lttng_live =
-               session->lttng_live_msg_iter->lttng_live_comp;
        ssize_t ret = 0;
        size_t size, len_read = 0;
        char *metadata_buf = NULL;
@@ -187,7 +186,8 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                        metadata->trace = NULL;
                }
                if (errno == EINTR) {
-                       if (lttng_live_graph_is_canceled(lttng_live)) {
+                       if (lttng_live_graph_is_canceled(
+                                       session->lttng_live_msg_iter)) {
                                status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
                                goto end;
                        }
@@ -224,10 +224,21 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
        switch (decoder_status) {
        case CTF_METADATA_DECODER_STATUS_OK:
                if (!trace->trace_class) {
+                       struct ctf_trace_class *tc =
+                               ctf_metadata_decoder_borrow_ctf_trace_class(
+                                       metadata->decoder);
+
                        trace->trace_class =
                                ctf_metadata_decoder_get_ir_trace_class(
                                                metadata->decoder);
                        trace->trace = bt_trace_create(trace->trace_class);
+                       if (!trace->trace) {
+                               goto error;
+                       }
+                       if (ctf_trace_class_configure_ir_trace(tc,
+                                       trace->trace)) {
+                               goto error;
+                       }
                        if (!stream_classes_all_have_default_clock_class(
                                        trace->trace_class, log_level,
                                        self_comp)) {