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

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

diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c
index 0cabf25d01751e9298c5a95726dac6e4f7ed7ce0..11b80f474d3c78c5986d21ab3c9cc89824bc7ccb 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.c
+++ b/src/plugins/ctf/lttng-live/lttng-live.c
@@ -109,18 +109,17 @@ const char *print_state(struct lttng_live_stream_iterator *s)
        } while (0);
 
 BT_HIDDEN
-bool lttng_live_graph_is_canceled(struct lttng_live_component *lttng_live)
+bool lttng_live_graph_is_canceled(struct lttng_live_msg_iter *msg_iter)
 {
-       const bt_component *component;
        bool ret;
 
-       if (!lttng_live) {
+       if (!msg_iter) {
                ret = false;
                goto end;
        }
 
-       component = bt_self_component_as_component(lttng_live->self_comp);
-       ret = bt_component_graph_is_canceled(component);
+       ret = bt_self_message_iterator_is_interrupted(
+               msg_iter->self_msg_iter);
 
 end:
        return ret;
@@ -259,7 +258,6 @@ end:
 static
 void lttng_live_destroy_session(struct lttng_live_session *session)
 {
-       struct lttng_live_component *live_comp;
        bt_logging_level log_level;
        bt_self_component *self_comp;
 
@@ -272,9 +270,9 @@ void lttng_live_destroy_session(struct lttng_live_session *session)
        BT_COMP_LOGD("Destroy lttng live session");
        if (session->id != -1ULL) {
                if (lttng_live_detach_session(session)) {
-                       live_comp = session->lttng_live_msg_iter->lttng_live_comp;
                        if (session->lttng_live_msg_iter &&
-                                       !lttng_live_graph_is_canceled(live_comp)) {
+                                       !lttng_live_graph_is_canceled(
+                                               session->lttng_live_msg_iter)) {
                                /* Old relayd cannot detach sessions. */
                                BT_COMP_LOGD("Unable to detach lttng live session %" PRIu64,
                                        session->id);
@@ -442,7 +440,7 @@ enum lttng_live_iterator_status lttng_live_get_session(
                ret = lttng_live_attach_session(session);
                if (ret) {
                        if (lttng_live_msg_iter && lttng_live_graph_is_canceled(
-                                               lttng_live_msg_iter->lttng_live_comp)) {
+                                       lttng_live_msg_iter)) {
                                status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
                        } else {
                                status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
@@ -1589,11 +1587,6 @@ bt_component_class_init_method_status lttng_live_component_init(
                goto error;
        }
 
-       if (lttng_live_graph_is_canceled(lttng_live)) {
-               ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
-               goto error;
-       }
-
        add_port_status = bt_self_component_source_add_output_port(
                self_comp_src, "out", NULL, NULL);
        switch (add_port_status) {