Fix: muxer.c: compare_events(): initialize `ret` to 0

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

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.c b/src/plugins/ctf/lttng-live/viewer-connection.c
index 44e80cc0cfbf91d12707cf71754bf7c3e355256c..1ffba1cfc976f7b46e31ec3411c165f9f49f81b5 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.c
+++ b/src/plugins/ctf/lttng-live/viewer-connection.c
@@ -24,7 +24,7 @@
 #define BT_COMP_LOG_SELF_COMP (viewer_connection->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (viewer_connection->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/VIEWER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdint.h>
@@ -67,7 +67,7 @@ ssize_t lttng_live_recv(struct live_viewer_connection *viewer_connection,
                }
                if (ret == BT_SOCKET_ERROR && bt_socket_interrupted()) {
                        if (!viewer_connection->in_query &&
-                                       lttng_live_graph_is_canceled(lttng_live_msg_iter->lttng_live_comp)) {
+                                       lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
                                break;
                        } else {
                                continue;
@@ -93,7 +93,7 @@ ssize_t lttng_live_send(struct live_viewer_connection *viewer_connection,
                ret = bt_socket_send_nosigpipe(sock, buf, len);
                if (ret == BT_SOCKET_ERROR && bt_socket_interrupted()) {
                        if (!viewer_connection->in_query &&
-                                       lttng_live_graph_is_canceled(lttng_live_msg_iter->lttng_live_comp)) {
+                                       lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
                                break;
                        } else {
                                continue;
@@ -149,10 +149,10 @@ int parse_url(struct live_viewer_connection *viewer_connection)
                        "proto : %s",
                        viewer_connection->relay_hostname->str,
                        viewer_connection->port,
-                       viewer_connection->target_hostname == NULL ?
-                               "<none>" : viewer_connection->target_hostname->str,
-                       viewer_connection->session_name == NULL ?
-                               "<none>" : viewer_connection->session_name->str,
+                       !viewer_connection->target_hostname ?
+                       "<none>" : viewer_connection->target_hostname->str,
+                       !viewer_connection->session_name ?
+                       "<none>" : viewer_connection->session_name->str,
                        lttng_live_url_parts.proto->str);
        ret = 0;
 
@@ -573,10 +573,6 @@ bt_component_class_query_method_status live_viewer_connection_list_sessions(
        uint32_t i, sessions_count;
        ssize_t ret_len;
 
-       if (lttng_live_handshake(viewer_connection)) {
-               goto error;
-       }
-
        result = bt_value_array_create();
        if (!result) {
                BT_COMP_LOGE("Error creating array");
@@ -1125,8 +1121,6 @@ enum lttng_live_iterator_status lttng_live_get_next_index(
        struct lttng_live_trace *trace = stream->trace;
        const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
        char cmd_buf[cmd_buf_len];
-       struct lttng_live_component *lttng_live =
-               lttng_live_msg_iter->lttng_live_comp;
 
        cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
        cmd.data_size = htobe64((uint64_t) sizeof(rq));
@@ -1239,7 +1233,7 @@ end:
        return retstatus;
 
 error:
-       if (lttng_live_graph_is_canceled(lttng_live)) {
+       if (lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
                retstatus = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
        } else {
                retstatus = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
@@ -1264,8 +1258,6 @@ enum bt_msg_iter_medium_status lttng_live_get_stream_bytes(
        struct lttng_live_trace *trace = stream->trace;
        const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
        char cmd_buf[cmd_buf_len];
-       struct lttng_live_component *lttng_live =
-               lttng_live_msg_iter->lttng_live_comp;
 
        BT_COMP_LOGD("lttng_live_get_stream_bytes: offset=%" PRIu64 ", req_len=%" PRIu64,
                        offset, req_len);
@@ -1364,7 +1356,7 @@ end:
        return retstatus;
 
 error:
-       if (lttng_live_graph_is_canceled(lttng_live)) {
+       if (lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
                retstatus = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
        } else {
                retstatus = BT_MSG_ITER_MEDIUM_STATUS_ERROR;
@@ -1389,8 +1381,6 @@ enum lttng_live_iterator_status lttng_live_get_new_streams(
                session->lttng_live_msg_iter;
        struct live_viewer_connection *viewer_connection =
                lttng_live_msg_iter->viewer_connection;
-       struct lttng_live_component *lttng_live =
-               lttng_live_msg_iter->lttng_live_comp;
        uint32_t streams_count;
        const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
        char cmd_buf[cmd_buf_len];
@@ -1461,7 +1451,7 @@ end:
        return status;
 
 error:
-       if (lttng_live_graph_is_canceled(lttng_live)) {
+       if (lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
                status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
        } else {
                status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
@@ -1472,18 +1462,23 @@ error:
 BT_HIDDEN
 struct live_viewer_connection *live_viewer_connection_create(
                const char *url, bool in_query,
-               struct lttng_live_msg_iter *lttng_live_msg_iter)
+               struct lttng_live_msg_iter *lttng_live_msg_iter,
+               bt_logging_level log_level)
 {
        struct live_viewer_connection *viewer_connection;
 
        viewer_connection = g_new0(struct live_viewer_connection, 1);
 
-       if (bt_socket_init(lttng_live_msg_iter->log_level) != 0) {
+       if (bt_socket_init(log_level) != 0) {
                goto error;
        }
 
-       viewer_connection->log_level = lttng_live_msg_iter->log_level;
-       viewer_connection->self_comp = lttng_live_msg_iter->self_comp;
+       viewer_connection->log_level = log_level;
+
+       if (lttng_live_msg_iter) {
+               viewer_connection->self_comp = lttng_live_msg_iter->self_comp;
+       }
+
        bt_object_init_shared(&viewer_connection->obj, connection_release);
        viewer_connection->control_sock = BT_INVALID_SOCKET;
        viewer_connection->port = -1;