Fix: src.ctf.lttng-live: checking `errno` value on all errors

[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 df75b15f5e9410d10fb1f9c28d1985adad683526..787fc0b322da0c39d68494b636c852a6e6ec8876 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -76,7 +76,8 @@ bool stream_classes_all_have_default_clock_class(bt_trace_class *tc,
                cc = bt_stream_class_borrow_default_clock_class_const(sc);
                if (!cc) {
                        ret = false;
-                       BT_COMP_LOGE("Stream class doesn't have a default clock class: "
+                       BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                               "Stream class doesn't have a default clock class: "
                                "sc-id=%" PRIu64 ", sc-name=\"%s\"",
                                bt_stream_class_get_id(sc),
                                bt_stream_class_get_name(sc));
@@ -153,8 +154,15 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
        /* Open for writing */
        fp = bt_open_memstream(&metadata_buf, &size);
        if (!fp) {
-               BT_COMP_LOGE("Metadata open_memstream: %s", strerror(errno));
-               goto error;
+               if (errno == EINTR &&
+                               lttng_live_graph_is_canceled(session->lttng_live_msg_iter)) {
+                       status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
+               } else {
+                       BT_COMP_LOGE_APPEND_CAUSE_ERRNO(self_comp,
+                               "Metadata open_memstream", ".");
+                       status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
+               }
+               goto end;
        }
 
        keep_receiving = true;
@@ -189,7 +197,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                case LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR:
                        goto error;
                default:
-                       abort();
+                       bt_common_abort();
                }
        }
 
@@ -203,7 +211,8 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
        }
 
        if (bt_close_memstream(&metadata_buf, &size, fp)) {
-               BT_COMP_LOGE("bt_close_memstream: %s", strerror(errno));
+               BT_COMP_LOGE_APPEND_CAUSE_ERRNO(self_comp,
+                       "Metadata bt_close_memstream", ".");
        }
 
        fp = NULL;
@@ -219,9 +228,15 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 
        fp = bt_fmemopen(metadata_buf, len_read, "rb");
        if (!fp) {
-               BT_COMP_LOGE("Cannot memory-open metadata buffer: %s",
-                       strerror(errno));
-               goto error;
+               if (errno == EINTR &&
+                               lttng_live_graph_is_canceled(session->lttng_live_msg_iter)) {
+                       status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
+               } else {
+                       BT_COMP_LOGE_APPEND_CAUSE_ERRNO(self_comp,
+                               "Cannot memory-open metadata buffer", ".");
+                       status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
+               }
+               goto end;
        }
 
        /*
@@ -242,10 +257,14 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                                                metadata->decoder);
                        trace->trace = bt_trace_create(trace->trace_class);
                        if (!trace->trace) {
+                               BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                                       "Failed to create bt_trace");
                                goto error;
                        }
                        if (ctf_trace_class_configure_ir_trace(tc,
                                        trace->trace)) {
+                               BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                                       "Failed to configure ctf trace class");
                                goto error;
                        }
                        if (!stream_classes_all_have_default_clock_class(
@@ -270,20 +289,15 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
        goto end;
 
 error:
-       if (errno == EINTR) {
-               if (lttng_live_graph_is_canceled(session->lttng_live_msg_iter)) {
-                       status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
-               }
-       } else {
-               status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
-       }
+       status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
 end:
        if (fp) {
                int closeret;
 
                closeret = fclose(fp);
                if (closeret) {
-                       BT_COMP_LOGE("Error on fclose");
+                       BT_COMP_LOGE_APPEND_CAUSE_ERRNO(self_comp,
+                               "Error on fclose", ".");
                }
        }
        free(metadata_buf);
@@ -295,6 +309,8 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session,
                uint64_t ctf_trace_id, uint64_t stream_id,
                const char *trace_name)
 {
+       bt_self_component *self_comp = session->self_comp;
+       bt_logging_level log_level = session->log_level;
        struct lttng_live_metadata *metadata = NULL;
        struct lttng_live_trace *trace;
        struct ctf_metadata_decoder_config cfg = {
@@ -315,10 +331,14 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session,
 
        metadata->decoder = ctf_metadata_decoder_create(&cfg);
        if (!metadata->decoder) {
+               BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                       "Failed to create CTF metadata decoder");
                goto error;
        }
        trace = lttng_live_borrow_trace(session, ctf_trace_id);
        if (!trace) {
+               BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                       "Failed to borrow trace");
                goto error;
        }
        metadata->trace = trace;