projects
/
deliverable
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make bt_graph_add_*_listener() function return a listener ID
[deliverable/babeltrace.git]
/
cli
/
babeltrace.c
diff --git
a/cli/babeltrace.c
b/cli/babeltrace.c
index 124ee53ae54b29ac34c9dc0eabe4ccb42a12f521..f63150a273632ff6d753592cd2ba854143339856 100644
(file)
--- a/
cli/babeltrace.c
+++ b/
cli/babeltrace.c
@@
-366,7
+366,7
@@
void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
break;
}
default:
break;
}
default:
- a
ssert(false
);
+ a
bort(
);
}
}
}
}
@@
-519,7
+519,7
@@
void print_cfg(struct bt_config *cfg)
print_cfg_print_lttng_live_sessions(cfg);
break;
default:
print_cfg_print_lttng_live_sessions(cfg);
break;
default:
- a
ssert(false
);
+ a
bort(
);
}
}
}
}
@@
-1203,7
+1203,7
@@
int cmd_run_ctx_connect_upstream_port_to_downstream_component(
*/
BT_LOGF("Invalid connection: downstream component is a source: "
"conn-arg=\"%s\"", cfg_conn->arg->str);
*/
BT_LOGF("Invalid connection: downstream component is a source: "
"conn-arg=\"%s\"", cfg_conn->arg->str);
- a
ssert(false
);
+ a
bort(
);
}
downstream_port_count = port_count_fn(downstream_comp);
}
downstream_port_count = port_count_fn(downstream_comp);
@@
-1494,25
+1494,29
@@
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);
the_graph = ctx->graph;
ret = bt_graph_add_port_added_listener(ctx->graph,
graph_port_added_listener, ctx);
- if (ret) {
+ 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);
goto error;
}
ret = bt_graph_add_port_removed_listener(ctx->graph,
graph_port_removed_listener, ctx);
- if (ret) {
+ 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);
goto error;
}
ret = bt_graph_add_ports_connected_listener(ctx->graph,
graph_ports_connected_listener, ctx);
- if (ret) {
+ 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);
goto error;
}
ret = bt_graph_add_ports_disconnected_listener(ctx->graph,
graph_ports_disconnected_listener, ctx);
- if (ret) {
+ if (ret < 0) {
+ BT_LOGE_STR("Cannot add \"ports disconnected\" listener to graph.");
goto error;
}
goto error;
}
@@
-1564,7
+1568,7
@@
int cmd_run_ctx_create_components_from_config_components(
cfg_comp->instance_name->str, cfg_comp->params);
if (!comp) {
BT_LOGE("Cannot create component: plugin-name=\"%s\", "
cfg_comp->instance_name->str, cfg_comp->params);
if (!comp) {
BT_LOGE("Cannot create component: plugin-name=\"%s\", "
- "comp-cls-name=\"%s\", comp-cls-type=%d
",
+ "comp-cls-name=\"%s\", comp-cls-type=%d
, "
"comp-name=\"%s\"",
cfg_comp->plugin_name->str,
cfg_comp->comp_cls_name->str,
"comp-name=\"%s\"",
cfg_comp->plugin_name->str,
cfg_comp->comp_cls_name->str,
@@
-1756,6
+1760,13
@@
int cmd_run(struct bt_config *cfg)
while (true) {
enum bt_graph_status graph_status = bt_graph_run(ctx.graph);
while (true) {
enum bt_graph_status graph_status = bt_graph_run(ctx.graph);
+ /*
+ * Reset console in case something messed with console
+ * codes during the graph's execution.
+ */
+ printf("%s", bt_common_color_reset());
+ fflush(stdout);
+ fprintf(stderr, "%s", bt_common_color_reset());
BT_LOGV("bt_graph_run() returned: status=%s",
bt_graph_status_str(graph_status));
BT_LOGV("bt_graph_run() returned: status=%s",
bt_graph_status_str(graph_status));
@@
-1955,8
+1966,8
@@
int main(int argc, const char **argv)
ret = cmd_print_lttng_live_sessions(cfg);
break;
default:
ret = cmd_print_lttng_live_sessions(cfg);
break;
default:
- BT_LOGF("Invalid command: cmd=%d", cfg->command);
- a
ssert(false
);
+ BT_LOGF("Invalid
/unknown
command: cmd=%d", cfg->command);
+ a
bort(
);
}
BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", ret=%d",
}
BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", ret=%d",
This page took
0.035085 seconds
and
5
git commands to generate.