lib: add bt_{graph,query_executor}_add_interrupter()
[babeltrace.git] / src / plugins / ctf / lttng-live / lttng-live.c
index c15247d3a4c5b69702867d57253a5a80de538b9a..11b80f474d3c78c5986d21ab3c9cc89824bc7ccb 100644 (file)
  * SOFTWARE.
  */
 
+#define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE"
-#include "logging/log.h"
+#include "plugins/comp-logging.h"
 
 #include <glib.h>
 #include <inttypes.h>
@@ -52,7 +53,7 @@
 #define SESS_NOT_FOUND_ACTION_FAIL_STR     "fail"
 #define SESS_NOT_FOUND_ACTION_END_STR      "end"
 
-#define print_dbg(fmt, ...)    BT_LOGD(fmt, ## __VA_ARGS__)
+#define print_dbg(fmt, ...)    BT_COMP_LOGD(fmt, ## __VA_ARGS__)
 
 static
 const char *print_live_iterator_status(enum lttng_live_iterator_status status)
@@ -100,7 +101,7 @@ const char *print_state(struct lttng_live_stream_iterator *s)
 
 #define print_stream_state(live_stream_iter) \
        do { \
-               BT_LOGD("stream state %s last_inact_ts %" PRId64  \
+               BT_COMP_LOGD("stream state %s last_inact_ts %" PRId64  \
                        ", curr_inact_ts %" PRId64, \
                        print_state(live_stream_iter), \
                        live_stream_iter->last_inactivity_ts, \
@@ -108,21 +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_component_source_as_component_const(
-               bt_self_component_source_as_component_source(
-               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;
@@ -152,8 +149,9 @@ static
 void lttng_live_destroy_trace(struct lttng_live_trace *trace)
 {
        bt_logging_level log_level = trace->log_level;
+       bt_self_component *self_comp = trace->self_comp;
 
-       BT_LOGD("Destroy lttng_live_trace");
+       BT_COMP_LOGD("Destroy lttng_live_trace");
 
        BT_ASSERT(trace->stream_iterators);
        g_ptr_array_free(trace->stream_iterators, TRUE);
@@ -171,12 +169,14 @@ struct lttng_live_trace *lttng_live_create_trace(struct lttng_live_session *sess
 {
        struct lttng_live_trace *trace = NULL;
        bt_logging_level log_level = session->log_level;
+       bt_self_component *self_comp = session->self_comp;
 
        trace = g_new0(struct lttng_live_trace, 1);
        if (!trace) {
                goto error;
        }
        trace->log_level = session->log_level;
+       trace->self_comp = session->self_comp;
        trace->session = session;
        trace->id = trace_id;
        trace->trace_class = NULL;
@@ -187,7 +187,7 @@ struct lttng_live_trace *lttng_live_create_trace(struct lttng_live_session *sess
        trace->new_metadata_needed = true;
        g_ptr_array_add(session->traces, trace);
 
-       BT_LOGI("Create trace");
+       BT_COMP_LOGI("Create trace");
        goto end;
 error:
        g_free(trace);
@@ -222,6 +222,7 @@ int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
        int ret = 0;
        struct lttng_live_session *session;
        bt_logging_level log_level = lttng_live_msg_iter->log_level;
+       bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
 
        session = g_new0(struct lttng_live_session, 1);
        if (!session) {
@@ -229,6 +230,7 @@ int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
        }
 
        session->log_level = lttng_live_msg_iter->log_level;
+       session->self_comp = lttng_live_msg_iter->self_comp;
        session->id = session_id;
        session->traces = g_ptr_array_new_with_free_func(
                        (GDestroyNotify) lttng_live_destroy_trace);
@@ -241,12 +243,12 @@ int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
        session->session_name = g_string_new(session_name);
        BT_ASSERT(session->session_name);
 
-       BT_LOGI("Reading from session: %" PRIu64 " hostname: %s session_name: %s",
+       BT_COMP_LOGI("Reading from session: %" PRIu64 " hostname: %s session_name: %s",
                session->id, hostname, session_name);
        g_ptr_array_add(lttng_live_msg_iter->sessions, session);
        goto end;
 error:
-       BT_LOGE("Error adding session");
+       BT_COMP_LOGE("Error adding session");
        g_free(session);
        ret = -1;
 end:
@@ -256,22 +258,23 @@ 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;
 
        if (!session) {
                goto end;
        }
 
        log_level = session->log_level;
-       BT_LOGD("Destroy lttng live session");
+       self_comp = session->self_comp;
+       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_LOGD("Unable to detach lttng live session %" PRIu64,
+                               BT_COMP_LOGD("Unable to detach lttng live session %" PRIu64,
                                        session->id);
                        }
                }
@@ -336,6 +339,7 @@ enum lttng_live_iterator_status lttng_live_iterator_next_check_stream_state(
                struct lttng_live_stream_iterator *lttng_live_stream)
 {
        bt_logging_level log_level = lttng_live_stream->log_level;
+       bt_self_component *self_comp = lttng_live_stream->self_comp;
 
        switch (lttng_live_stream->state) {
        case LTTNG_LIVE_STREAM_QUIESCENT:
@@ -343,11 +347,11 @@ enum lttng_live_iterator_status lttng_live_iterator_next_check_stream_state(
                break;
        case LTTNG_LIVE_STREAM_ACTIVE_NO_DATA:
                /* Invalid state. */
-               BT_LOGF("Unexpected stream state \"ACTIVE_NO_DATA\"");
+               BT_COMP_LOGF("Unexpected stream state \"ACTIVE_NO_DATA\"");
                abort();
        case LTTNG_LIVE_STREAM_QUIESCENT_NO_DATA:
                /* Invalid state. */
-               BT_LOGF("Unexpected stream state \"QUIESCENT_NO_DATA\"");
+               BT_COMP_LOGF("Unexpected stream state \"QUIESCENT_NO_DATA\"");
                abort();
        case LTTNG_LIVE_STREAM_EOF:
                break;
@@ -369,6 +373,7 @@ enum lttng_live_iterator_status lttng_live_iterator_next_handle_one_no_data_stre
                struct lttng_live_stream_iterator *lttng_live_stream)
 {
        bt_logging_level log_level = lttng_live_msg_iter->log_level;
+       bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
        enum lttng_live_iterator_status ret =
                        LTTNG_LIVE_ITERATOR_STATUS_OK;
        struct packet_index index;
@@ -435,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;
@@ -626,13 +631,13 @@ int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter,
        const bt_clock_class *clock_class = NULL;
        const bt_clock_snapshot *clock_snapshot = NULL;
        int ret = 0;
-       bt_message_stream_activity_clock_snapshot_state sa_cs_state;
        bt_logging_level log_level = lttng_live_msg_iter->log_level;
+       bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
 
        BT_ASSERT(msg);
        BT_ASSERT(ts_ns);
 
-       BT_LOGD("Getting message's timestamp: iter-data-addr=%p, msg-addr=%p, "
+       BT_COMP_LOGD("Getting message's timestamp: iter-data-addr=%p, msg-addr=%p, "
                "last-msg-ts=%" PRId64, lttng_live_msg_iter, msg,
                last_msg_ts_ns);
 
@@ -682,32 +687,6 @@ int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter,
                clock_snapshot = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(
                        msg);
                break;
-       case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
-               clock_class =
-                       bt_message_stream_activity_beginning_borrow_stream_class_default_clock_class_const(
-                       msg);
-               BT_ASSERT(clock_class);
-
-               sa_cs_state = bt_message_stream_activity_beginning_borrow_default_clock_snapshot_const(
-                       msg, &clock_snapshot);
-               if (sa_cs_state != BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_KNOWN) {
-                       goto no_clock_snapshot;
-               }
-
-               break;
-       case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
-               clock_class =
-                       bt_message_stream_activity_end_borrow_stream_class_default_clock_class_const(
-                       msg);
-               BT_ASSERT(clock_class);
-
-               sa_cs_state = bt_message_stream_activity_end_borrow_default_clock_snapshot_const(
-                       msg, &clock_snapshot);
-               if (sa_cs_state != BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_KNOWN) {
-                       goto no_clock_snapshot;
-               }
-
-               break;
        case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
                clock_snapshot =
                        bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
@@ -715,7 +694,7 @@ int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter,
                break;
        default:
                /* All the other messages have a higher priority */
-               BT_LOGD_STR("Message has no timestamp: using the last message timestamp.");
+               BT_COMP_LOGD_STR("Message has no timestamp: using the last message timestamp.");
                *ts_ns = last_msg_ts_ns;
                goto end;
        }
@@ -725,25 +704,19 @@ int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter,
 
        ret = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, ts_ns);
        if (ret) {
-               BT_LOGE("Cannot get nanoseconds from Epoch of clock snapshot: "
+               BT_COMP_LOGE("Cannot get nanoseconds from Epoch of clock snapshot: "
                        "clock-snapshot-addr=%p", clock_snapshot);
                goto error;
        }
 
        goto end;
 
-no_clock_snapshot:
-       BT_LOGD_STR("Message's default clock snapshot is missing: "
-               "using the last message timestamp.");
-       *ts_ns = last_msg_ts_ns;
-       goto end;
-
 error:
        ret = -1;
 
 end:
        if (ret == 0) {
-               BT_LOGD("Found message's timestamp: "
+               BT_COMP_LOGD("Found message's timestamp: "
                        "iter-data-addr=%p, msg-addr=%p, "
                        "last-msg-ts=%" PRId64 ", ts=%" PRId64,
                        lttng_live_msg_iter, msg, last_msg_ts_ns, *ts_ns);
@@ -762,6 +735,7 @@ enum lttng_live_iterator_status lttng_live_iterator_next_handle_one_active_data_
        enum bt_msg_iter_status status;
        uint64_t session_idx, trace_idx;
        bt_logging_level log_level = lttng_live_msg_iter->log_level;
+       bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
 
        for (session_idx = 0; session_idx < lttng_live_msg_iter->sessions->len;
                        session_idx++) {
@@ -810,7 +784,7 @@ enum lttng_live_iterator_status lttng_live_iterator_next_handle_one_active_data_
        case BT_MSG_ITER_STATUS_ERROR:
        default:
                ret = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
-               BT_LOGW("CTF msg iterator return an error or failed msg_iter=%p",
+               BT_COMP_LOGW("CTF msg iterator return an error or failed msg_iter=%p",
                        lttng_live_stream->msg_iter);
                break;
        }
@@ -874,6 +848,7 @@ enum lttng_live_iterator_status lttng_live_iterator_next_on_stream(
                bt_message **curr_msg)
 {
        bt_logging_level log_level = lttng_live_msg_iter->log_level;
+       bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
        enum lttng_live_iterator_status live_status;
 
 retry:
@@ -891,7 +866,7 @@ retry:
        live_status = lttng_live_iterator_next_handle_one_quiescent_stream(
                        lttng_live_msg_iter, stream_iter, curr_msg);
        if (live_status != LTTNG_LIVE_ITERATOR_STATUS_OK) {
-               BT_ASSERT(*curr_msg == NULL);
+               BT_ASSERT(!*curr_msg);
                goto end;
        }
        if (*curr_msg) {
@@ -900,7 +875,7 @@ retry:
        live_status = lttng_live_iterator_next_handle_one_active_data_stream(
                        lttng_live_msg_iter, stream_iter, curr_msg);
        if (live_status != LTTNG_LIVE_ITERATOR_STATUS_OK) {
-               BT_ASSERT(*curr_msg == NULL);
+               BT_ASSERT(!*curr_msg);
        }
 
 end:
@@ -922,6 +897,7 @@ enum lttng_live_iterator_status next_stream_iterator_for_trace(
        int64_t curr_candidate_msg_ts = INT64_MAX;
        uint64_t stream_iter_idx;
        bt_logging_level log_level = lttng_live_msg_iter->log_level;
+       bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
 
        BT_ASSERT(live_trace);
        BT_ASSERT(live_trace->stream_iterators);
@@ -948,7 +924,7 @@ enum lttng_live_iterator_status next_stream_iterator_for_trace(
                        stream_iter_status = lttng_live_iterator_next_on_stream(
                                        lttng_live_msg_iter, stream_iter, &msg);
 
-                       BT_LOGD("live stream iterator returned status :%s",
+                       BT_COMP_LOGD("live stream iterator returned status :%s",
                                        print_live_iterator_status(stream_iter_status));
                        if (stream_iter_status == LTTNG_LIVE_ITERATOR_STATUS_END) {
                                stream_iter_is_ended = true;
@@ -983,7 +959,7 @@ enum lttng_live_iterator_status next_stream_iterator_for_trace(
                                 * We received a message in the past. To ensure
                                 * monotonicity, we can't send it forward.
                                 */
-                               BT_LOGE("Message's timestamp is less than "
+                               BT_COMP_LOGE("Message's timestamp is less than "
                                        "lttng-live's message iterator's last "
                                        "returned timestamp: "
                                        "lttng-live-msg-iter-addr=%p, ts=%" PRId64 ", "
@@ -1128,12 +1104,12 @@ void put_messages(bt_message_array_const msgs, uint64_t count)
 }
 
 BT_HIDDEN
-bt_self_message_iterator_status lttng_live_msg_iter_next(
+bt_component_class_message_iterator_next_method_status lttng_live_msg_iter_next(
                bt_self_message_iterator *self_msg_it,
                bt_message_array_const msgs, uint64_t capacity,
                uint64_t *count)
 {
-       bt_self_message_iterator_status status;
+       bt_component_class_message_iterator_next_method_status status;
        struct lttng_live_msg_iter *lttng_live_msg_iter =
                bt_self_message_iterator_get_data(self_msg_it);
        struct lttng_live_component *lttng_live =
@@ -1159,7 +1135,7 @@ bt_self_message_iterator_status lttng_live_msg_iter_next(
        if (lttng_live_msg_iter->sessions->len == 0) {
                if (lttng_live->params.sess_not_found_act !=
                                SESSION_NOT_FOUND_ACTION_CONTINUE) {
-                       status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
+                       status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
                        goto no_session;
                } else {
                        /*
@@ -1168,7 +1144,7 @@ bt_self_message_iterator_status lttng_live_msg_iter_next(
                         * requested session name.
                         */
                        if (lttng_live_create_viewer_session(lttng_live_msg_iter)) {
-                               status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+                               status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
                                goto no_session;
                        }
                }
@@ -1292,21 +1268,21 @@ end:
                         * now. On the next call we return again if there are
                         * still no new message to send.
                         */
-                       status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+                       status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
                } else {
-                       status = BT_SELF_MESSAGE_ITERATOR_STATUS_AGAIN;
+                       status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_AGAIN;
                }
                break;
        case LTTNG_LIVE_ITERATOR_STATUS_END:
-               status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
+               status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
                break;
        case LTTNG_LIVE_ITERATOR_STATUS_NOMEM:
-               status = BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM;
+               status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_MEMORY_ERROR;
                break;
        case LTTNG_LIVE_ITERATOR_STATUS_ERROR:
        case LTTNG_LIVE_ITERATOR_STATUS_INVAL:
        case LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED:
-               status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+               status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
                /* Put all existing messages on error. */
                put_messages(msgs, *count);
                break;
@@ -1319,15 +1295,15 @@ no_session:
 }
 
 BT_HIDDEN
-bt_self_message_iterator_status lttng_live_msg_iter_init(
+bt_component_class_message_iterator_init_method_status lttng_live_msg_iter_init(
                bt_self_message_iterator *self_msg_it,
                bt_self_component_source *self_comp_src,
                bt_self_component_port_output *self_port)
 {
-       bt_self_message_iterator_status ret =
-                       BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+       bt_component_class_message_iterator_init_method_status ret =
+               BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
        bt_self_component *self_comp =
-                       bt_self_component_source_as_self_component(self_comp_src);
+               bt_self_component_source_as_self_component(self_comp_src);
        struct lttng_live_component *lttng_live;
        struct lttng_live_msg_iter *lttng_live_msg_iter;
        bt_logging_level log_level;
@@ -1336,6 +1312,7 @@ bt_self_message_iterator_status lttng_live_msg_iter_init(
 
        lttng_live = bt_self_component_get_data(self_comp);
        log_level = lttng_live->log_level;
+       self_comp = lttng_live->self_comp;
 
        /* There can be only one downstream iterator at the same time. */
        BT_ASSERT(!lttng_live->has_msg_iter);
@@ -1343,11 +1320,12 @@ bt_self_message_iterator_status lttng_live_msg_iter_init(
 
        lttng_live_msg_iter = g_new0(struct lttng_live_msg_iter, 1);
        if (!lttng_live_msg_iter) {
-               ret = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+               ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
                goto end;
        }
 
        lttng_live_msg_iter->log_level = lttng_live->log_level;
+       lttng_live_msg_iter->self_comp = lttng_live->self_comp;
        lttng_live_msg_iter->lttng_live_comp = lttng_live;
        lttng_live_msg_iter->self_msg_iter = self_msg_it;
 
@@ -1370,7 +1348,7 @@ bt_self_message_iterator_status lttng_live_msg_iter_init(
        if (lttng_live_msg_iter->sessions->len == 0) {
                switch (lttng_live->params.sess_not_found_act) {
                case SESSION_NOT_FOUND_ACTION_CONTINUE:
-                       BT_LOGI("Unable to connect to the requested live viewer "
+                       BT_COMP_LOGI("Unable to connect to the requested live viewer "
                                "session. Keep trying to connect because of "
                                "%s=\"%s\" component parameter: url=\"%s\"",
                                SESS_NOT_FOUND_ACTION_PARAM,
@@ -1378,7 +1356,7 @@ bt_self_message_iterator_status lttng_live_msg_iter_init(
                                lttng_live->params.url->str);
                        break;
                case SESSION_NOT_FOUND_ACTION_FAIL:
-                       BT_LOGE("Unable to connect to the requested live viewer "
+                       BT_COMP_LOGE("Unable to connect to the requested live viewer "
                                "session. Fail the message iterator"
                                "initialization because of %s=\"%s\" "
                                "component parameter: url =\"%s\"",
@@ -1387,7 +1365,7 @@ bt_self_message_iterator_status lttng_live_msg_iter_init(
                                lttng_live->params.url->str);
                        goto error;
                case SESSION_NOT_FOUND_ACTION_END:
-                       BT_LOGI("Unable to connect to the requested live viewer "
+                       BT_COMP_LOGI("Unable to connect to the requested live viewer "
                                "session. End gracefully at the first _next() "
                                "call because of %s=\"%s\" component parameter: "
                                "url=\"%s\"", SESS_NOT_FOUND_ACTION_PARAM,
@@ -1401,32 +1379,35 @@ bt_self_message_iterator_status lttng_live_msg_iter_init(
 
        goto end;
 error:
-       ret = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+       ret = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
        lttng_live_msg_iter_destroy(lttng_live_msg_iter);
 end:
        return ret;
 }
 
 static
-bt_query_status lttng_live_query_list_sessions(const bt_value *params,
-               const bt_value **result, bt_logging_level log_level)
+bt_component_class_query_method_status lttng_live_query_list_sessions(
+               const bt_value *params, const bt_value **result,
+               bt_logging_level log_level)
 {
-       bt_query_status status = BT_QUERY_STATUS_OK;
+       bt_component_class_query_method_status status =
+               BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
        const bt_value *url_value = NULL;
        const char *url;
        struct live_viewer_connection *viewer_connection = NULL;
+       bt_self_component *self_comp = NULL;
 
        url_value = bt_value_map_borrow_entry_value_const(params, URL_PARAM);
        if (!url_value) {
-               BT_LOGW("Mandatory `%s` parameter missing", URL_PARAM);
-               status = BT_QUERY_STATUS_INVALID_PARAMS;
+               BT_COMP_LOGW("Mandatory `%s` parameter missing", URL_PARAM);
+               status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_INVALID_PARAMS;
                goto error;
        }
 
        if (!bt_value_is_string(url_value)) {
-               BT_LOGW("`%s` parameter is required to be a string value",
+               BT_COMP_LOGW("`%s` parameter is required to be a string value",
                        URL_PARAM);
-               status = BT_QUERY_STATUS_INVALID_PARAMS;
+               status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_INVALID_PARAMS;
                goto error;
        }
 
@@ -1439,7 +1420,7 @@ bt_query_status lttng_live_query_list_sessions(const bt_value *params,
 
        status = live_viewer_connection_list_sessions(viewer_connection,
                        result);
-       if (status != BT_QUERY_STATUS_OK) {
+       if (status != BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK) {
                goto error;
        }
 
@@ -1449,7 +1430,7 @@ error:
        BT_VALUE_PUT_REF_AND_RESET(*result);
 
        if (status >= 0) {
-               status = BT_QUERY_STATUS_ERROR;
+               status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
        }
 
 end:
@@ -1460,19 +1441,22 @@ end:
 }
 
 BT_HIDDEN
-bt_query_status lttng_live_query(bt_self_component_class_source *comp_class,
+bt_component_class_query_method_status lttng_live_query(
+               bt_self_component_class_source *comp_class,
                const bt_query_executor *query_exec,
                const char *object, const bt_value *params,
                bt_logging_level log_level, const bt_value **result)
 {
-       bt_query_status status = BT_QUERY_STATUS_OK;
+       bt_component_class_query_method_status status =
+               BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
+       bt_self_component *self_comp = NULL;
 
        if (strcmp(object, "sessions") == 0) {
                status = lttng_live_query_list_sessions(params, result,
                        log_level);
        } else {
-               BT_LOGW("Unknown query object `%s`", object);
-               status = BT_QUERY_STATUS_INVALID_OBJECT;
+               BT_COMP_LOGI("Unknown query object `%s`", object);
+               status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_INVALID_OBJECT;
                goto end;
        }
 
@@ -1525,7 +1509,7 @@ enum session_not_found_action parse_session_not_found_action_param(
 }
 
 struct lttng_live_component *lttng_live_component_create(const bt_value *params,
-               bt_logging_level log_level)
+               bt_logging_level log_level, bt_self_component *self_comp)
 {
        struct lttng_live_component *lttng_live;
        const bt_value *value = NULL;
@@ -1536,12 +1520,13 @@ struct lttng_live_component *lttng_live_component_create(const bt_value *params,
                goto end;
        }
        lttng_live->log_level = log_level;
+       lttng_live->self_comp = self_comp;
        lttng_live->max_query_size = MAX_QUERY_SIZE;
        lttng_live->has_msg_iter = false;
 
        value = bt_value_map_borrow_entry_value_const(params, URL_PARAM);
        if (!value || !bt_value_is_string(value)) {
-               BT_LOGW("Mandatory `%s` parameter missing or not a string",
+               BT_COMP_LOGW("Mandatory `%s` parameter missing or not a string",
                        URL_PARAM);
                goto error;
        }
@@ -1558,13 +1543,13 @@ struct lttng_live_component *lttng_live_component_create(const bt_value *params,
                lttng_live->params.sess_not_found_act =
                        parse_session_not_found_action_param(value);
                if (lttng_live->params.sess_not_found_act == -1) {
-                       BT_LOGE("Unexpected value for `%s` parameter: "
+                       BT_COMP_LOGE("Unexpected value for `%s` parameter: "
                                "value=\"%s\"", SESS_NOT_FOUND_ACTION_PARAM,
                                bt_value_string_get(value));
                        goto error;
                }
        } else {
-               BT_LOGW("Optional `%s` parameter is missing or "
+               BT_COMP_LOGW("Optional `%s` parameter is missing or "
                        "not a string value. Defaulting to %s=\"%s\".",
                        SESS_NOT_FOUND_ACTION_PARAM,
                        SESS_NOT_FOUND_ACTION_PARAM,
@@ -1583,34 +1568,36 @@ end:
 }
 
 BT_HIDDEN
-bt_self_component_status lttng_live_component_init(
+bt_component_class_init_method_status lttng_live_component_init(
                bt_self_component_source *self_comp_src,
                const bt_value *params, __attribute__((unused)) void *init_method_data)
 {
        struct lttng_live_component *lttng_live;
-       bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
+       bt_component_class_init_method_status ret =
+               BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
        bt_self_component *self_comp =
                bt_self_component_source_as_self_component(self_comp_src);
        bt_logging_level log_level = bt_component_get_logging_level(
                bt_self_component_as_component(self_comp));
+       bt_self_component_add_port_status add_port_status;
 
-       lttng_live = lttng_live_component_create(params, log_level);
+       lttng_live = lttng_live_component_create(params, log_level, self_comp);
        if (!lttng_live) {
-               ret = BT_SELF_COMPONENT_STATUS_NOMEM;
+               ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
                goto error;
        }
-       lttng_live->self_comp = self_comp_src;
 
-       if (lttng_live_graph_is_canceled(lttng_live)) {
-               ret = BT_SELF_COMPONENT_STATUS_END;
+       add_port_status = bt_self_component_source_add_output_port(
+               self_comp_src, "out", NULL, NULL);
+       switch (add_port_status) {
+       case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR:
+               ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
                goto error;
-       }
-
-       ret = bt_self_component_source_add_output_port(
-                               lttng_live->self_comp, "out",
-                               NULL, NULL);
-       if (ret != BT_SELF_COMPONENT_STATUS_OK) {
+       case BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR:
+               ret = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
                goto error;
+       default:
+               break;
        }
 
        bt_self_component_set_data(self_comp, lttng_live);
This page took 0.032931 seconds and 4 git commands to generate.