Test fix: handle timestamps order in test_trace_copy

[babeltrace.git] / cli / babeltrace.c

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index 6920aabc6e697a2c07e03071ac4971e658afea60..8c0c50de54b1c65f5a5d29c6812255374d755c64 100644 (file)
--- a/cli/babeltrace.c
+++ b/cli/babeltrace.c
@@ -1591,23 +1591,24 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component(
                        }
                        ctx->connect_ports = true;
                }
-               goto end;
-       }
 
-       if (status != BT_GRAPH_STATUS_OK) {
-               BT_LOGE("Cannot create connection: cannot find a matching downstream port for upstream port: "
-                       "upstream-port-addr=%p, upstream-port-name=\"%s\", "
-                       "downstream-comp-name=\"%s\", conn-arg=\"%s\"",
-                       upstream_port, bt_port_get_name(upstream_port),
-                       cfg_conn->downstream_comp_name->str,
-                       cfg_conn->arg->str);
-               fprintf(stderr,
-                       "Cannot create connection: cannot find a matching downstream port for upstream port `%s`: %s\n",
-                       bt_port_get_name(upstream_port), cfg_conn->arg->str);
-               goto error;
+               /*
+                * We found a matching downstream port: the search is
+                * over.
+                */
+               goto end;
        }
 
-       goto end;
+       /* No downstream port found */
+       BT_LOGE("Cannot create connection: cannot find a matching downstream port for upstream port: "
+               "upstream-port-addr=%p, upstream-port-name=\"%s\", "
+               "downstream-comp-name=\"%s\", conn-arg=\"%s\"",
+               upstream_port, bt_port_get_name(upstream_port),
+               cfg_conn->downstream_comp_name->str,
+               cfg_conn->arg->str);
+       fprintf(stderr,
+               "Cannot create connection: cannot find a matching downstream port for upstream port `%s`: %s\n",
+               bt_port_get_name(upstream_port), cfg_conn->arg->str);
 
 error:
        ret = -1;
@@ -1840,28 +1841,28 @@ int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg)
 
        the_graph = ctx->graph;
        ret = bt_graph_add_port_added_listener(ctx->graph,
-               graph_port_added_listener, ctx);
+               graph_port_added_listener, NULL, ctx);
        if (ret < 0) {
                BT_LOGE_STR("Cannot add \"port added\" listener to graph.");
                goto error;
        }
 
        ret = bt_graph_add_port_removed_listener(ctx->graph,
-               graph_port_removed_listener, ctx);
+               graph_port_removed_listener, NULL, ctx);
        if (ret < 0) {
                BT_LOGE_STR("Cannot add \"port removed\" listener to graph.");
                goto error;
        }
 
        ret = bt_graph_add_ports_connected_listener(ctx->graph,
-               graph_ports_connected_listener, ctx);
+               graph_ports_connected_listener, NULL, ctx);
        if (ret < 0) {
                BT_LOGE_STR("Cannot add \"ports connected\" listener to graph.");
                goto error;
        }
 
        ret = bt_graph_add_ports_disconnected_listener(ctx->graph,
-               graph_ports_disconnected_listener, ctx);
+               graph_ports_disconnected_listener, NULL, ctx);
        if (ret < 0) {
                BT_LOGE_STR("Cannot add \"ports disconnected\" listener to graph.");
                goto error;