#include <babeltrace/component/component-sink.h>
#include <babeltrace/component/component-filter.h>
#include <babeltrace/component/component-class.h>
+#include <babeltrace/component/port.h>
+#include <babeltrace/component/graph.h>
+#include <babeltrace/component/connection.h>
#include <babeltrace/component/notification/iterator.h>
#include <babeltrace/ref.h>
#include <babeltrace/values.h>
printf(" Force correlate: %s\n",
cfg->cmd_data.convert.force_correlate ? "yes" : "no");
print_plugin_paths(cfg->cmd_data.convert.plugin_paths);
+ printf(" Print CTF metadata: %s\n",
+ cfg->cmd_data.convert.print_ctf_metadata ? "yes" : "no");
printf(" Source component instances:\n");
print_bt_config_components(cfg->cmd_data.convert.sources);
}
static
-void print_cfg_query_info(struct bt_config *cfg)
+void print_cfg_query(struct bt_config *cfg)
{
- print_plugin_paths(cfg->cmd_data.query_info.plugin_paths);
- printf(" Action: `%s`\n", cfg->cmd_data.query_info.action->str);
+ print_plugin_paths(cfg->cmd_data.query.plugin_paths);
+ printf(" Object: `%s`\n", cfg->cmd_data.query.object->str);
printf(" Component class:\n");
- print_bt_config_component(cfg->cmd_data.query_info.cfg_component);
+ print_bt_config_component(cfg->cmd_data.query.cfg_component);
}
static
case BT_CONFIG_COMMAND_HELP:
print_cfg_help(cfg);
break;
- case BT_CONFIG_COMMAND_QUERY_INFO:
- print_cfg_query_info(cfg);
+ case BT_CONFIG_COMMAND_QUERY:
+ print_cfg_query(cfg);
break;
default:
assert(false);
}
static
-int connect_source_sink(struct bt_component *source,
+int connect_source_sink(struct bt_graph *graph,
+ struct bt_component *source,
struct bt_config_component *source_cfg,
struct bt_component *sink)
{
int ret = 0;
- enum bt_component_status sink_status;
+ struct bt_connection *connection = NULL;
struct bt_component *trimmer = NULL;
- struct bt_notification_iterator *source_it = NULL;
- struct bt_notification_iterator *to_sink_it = NULL;
-
- source_it = bt_component_source_create_notification_iterator(source);
- if (!source_it) {
- fprintf(stderr, "Failed to instantiate source iterator. Aborting...\n");
- ret = -1;
- goto end;
- }
+ struct bt_port *source_port =
+ bt_component_source_get_default_output_port(source);
+ struct bt_port *sink_port =
+ bt_component_sink_get_default_input_port(sink);
+ struct bt_port *to_sink_port = NULL;
+ struct bt_port *trimmer_input_port = NULL;
+
+ if (!source_port) {
+ fprintf(stderr, "Failed to find default source output port. Aborting...\n");
+ ret = -1;
+ goto end;
+ }
+ if (!sink_port) {
+ fprintf(stderr, "Failed to find default sink input port. Aborting...\n");
+ ret = -1;
+ goto end;
+ }
if (bt_value_map_has_key(source_cfg->params, "begin")
|| bt_value_map_has_key(source_cfg->params, "end")) {
/* A trimmer must be inserted in the graph. */
- enum bt_component_status trimmer_status;
-
trimmer = create_trimmer(source_cfg);
if (!trimmer) {
fprintf(stderr, "Failed to create trimmer component. Aborting...\n");
goto end;
}
- trimmer_status = bt_component_filter_add_iterator(trimmer,
- source_it);
- BT_PUT(source_it);
- if (trimmer_status != BT_COMPONENT_STATUS_OK) {
- fprintf(stderr, "Failed to connect source to trimmer. Aborting...\n");
+ trimmer_input_port = bt_component_filter_get_default_input_port(
+ trimmer);
+ if (!trimmer_input_port) {
+ fprintf(stderr, "Failed to find trimmer input port. Aborting...\n");
+ ret = -1;
+ goto end;
+ }
+ to_sink_port = bt_component_filter_get_default_output_port(
+ trimmer);
+ if (!to_sink_port) {
+ fprintf(stderr, "Failed to find trimmer output port. Aborting...\n");
ret = -1;
goto end;
}
- to_sink_it = bt_component_filter_create_notification_iterator(trimmer);
- if (!to_sink_it) {
- fprintf(stderr, "Failed to instantiate trimmer iterator. Aborting...\n");
+ connection = bt_graph_connect(graph, source_port,
+ trimmer_input_port);
+ if (!connection) {
+ fprintf(stderr, "Failed to connect source to trimmer. Aborting...\n");
ret = -1;
goto end;
}
+ BT_PUT(connection);
} else {
- BT_MOVE(to_sink_it, source_it);
+ BT_MOVE(to_sink_port, source_port);
}
- sink_status = bt_component_sink_add_iterator(sink, to_sink_it);
- if (sink_status != BT_COMPONENT_STATUS_OK) {
- fprintf(stderr, "Failed to connect to sink component. Aborting...\n");
+ connection = bt_graph_connect(graph, to_sink_port, sink_port);
+ if (!connection) {
+ fprintf(stderr, "Failed to connect to sink. Aborting...\n");
ret = -1;
goto end;
}
end:
bt_put(trimmer);
- bt_put(source_it);
- bt_put(to_sink_it);
+ bt_put(source_port);
+ bt_put(sink_port);
+ bt_put(to_sink_port);
+ bt_put(connection);
return ret;
}
bt_common_color_reset());
}
-static int cmd_query_info(struct bt_config *cfg)
+static int cmd_query(struct bt_config *cfg)
{
int ret;
struct bt_component_class *comp_cls = NULL;
goto end;
}
- comp_cls = find_component_class(cfg->cmd_data.query_info.cfg_component->plugin_name->str,
- cfg->cmd_data.query_info.cfg_component->component_name->str,
- cfg->cmd_data.query_info.cfg_component->type);
+ comp_cls = find_component_class(cfg->cmd_data.query.cfg_component->plugin_name->str,
+ cfg->cmd_data.query.cfg_component->component_name->str,
+ cfg->cmd_data.query.cfg_component->type);
if (!comp_cls) {
fprintf(stderr, "%s%sCannot find component class %s",
bt_common_color_bold(),
bt_common_color_fg_red(),
bt_common_color_reset());
print_plugin_comp_cls_opt(stderr,
- cfg->cmd_data.query_info.cfg_component->plugin_name->str,
- cfg->cmd_data.query_info.cfg_component->component_name->str,
- cfg->cmd_data.query_info.cfg_component->type);
+ cfg->cmd_data.query.cfg_component->plugin_name->str,
+ cfg->cmd_data.query.cfg_component->component_name->str,
+ cfg->cmd_data.query.cfg_component->type);
fprintf(stderr, "\n");
ret = -1;
goto end;
}
- results = bt_component_class_query_info(comp_cls,
- cfg->cmd_data.query_info.action->str,
- cfg->cmd_data.query_info.cfg_component->params);
+ results = bt_component_class_query(comp_cls,
+ cfg->cmd_data.query.object->str,
+ cfg->cmd_data.query.cfg_component->params);
if (!results) {
fprintf(stderr, "%s%sFailed to query info to %s",
bt_common_color_bold(),
bt_common_color_fg_red(),
bt_common_color_reset());
print_plugin_comp_cls_opt(stderr,
- cfg->cmd_data.query_info.cfg_component->plugin_name->str,
- cfg->cmd_data.query_info.cfg_component->component_name->str,
- cfg->cmd_data.query_info.cfg_component->type);
- fprintf(stderr, "%s%s with action `%s`%s\n",
+ cfg->cmd_data.query.cfg_component->plugin_name->str,
+ cfg->cmd_data.query.cfg_component->component_name->str,
+ cfg->cmd_data.query.cfg_component->type);
+ fprintf(stderr, "%s%s with object `%s`%s\n",
bt_common_color_bold(),
bt_common_color_fg_red(),
- cfg->cmd_data.query_info.action->str,
+ cfg->cmd_data.query.object->str,
bt_common_color_reset());
ret = -1;
goto end;
return ret;
}
+static int print_ctf_metadata(struct bt_config *cfg)
+{
+ int ret = 0;
+ struct bt_component_class *comp_cls = NULL;
+ struct bt_config_component *source_cfg = NULL;
+ struct bt_value *results = NULL;
+ struct bt_value *path = NULL;
+ struct bt_value *params = NULL;
+ struct bt_value *metadata_text_value = NULL;
+ const char *metadata_text = NULL;
+
+ assert(cfg->cmd_data.convert.sources->len == 1);
+ source_cfg = bt_config_get_component(cfg->cmd_data.convert.sources, 0);
+ assert(source_cfg);
+ comp_cls = find_component_class(source_cfg->plugin_name->str,
+ source_cfg->component_name->str,
+ source_cfg->type);
+ if (!comp_cls) {
+ fprintf(stderr, "%s%sCannot find component class %s",
+ bt_common_color_bold(),
+ bt_common_color_fg_red(),
+ bt_common_color_reset());
+ print_plugin_comp_cls_opt(stderr,
+ source_cfg->plugin_name->str,
+ source_cfg->component_name->str,
+ source_cfg->type);
+ fprintf(stderr, "\n");
+ ret = -1;
+ goto end;
+ }
+
+ path = bt_value_map_get(source_cfg->params, "path");
+ if (!path) {
+ ret = -1;
+ goto end;
+ }
+
+ params = bt_value_map_create();
+ if (!params) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = bt_value_map_insert(params, "path", path);
+ if (ret) {
+ ret = -1;
+ goto end;
+ }
+
+ results = bt_component_class_query(comp_cls, "metadata-info",
+ params);
+ if (!results) {
+ ret = -1;
+ fprintf(stderr, "%s%sFailed to request metadata info%s\n",
+ bt_common_color_bold(),
+ bt_common_color_fg_red(),
+ bt_common_color_reset());
+ goto end;
+ }
+
+ metadata_text_value = bt_value_map_get(results, "text");
+ if (!metadata_text_value) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = bt_value_string_get(metadata_text_value, &metadata_text);
+ assert(ret == 0);
+ printf("%s\n", metadata_text);
+
+end:
+ bt_put(results);
+ bt_put(path);
+ bt_put(params);
+ bt_put(metadata_text_value);
+ bt_put(comp_cls);
+ bt_put(source_cfg);
+ return 0;
+}
+
static int cmd_convert(struct bt_config *cfg)
{
int ret = 0;
struct bt_component_class *sink_class = NULL;
struct bt_component *source = NULL, *sink = NULL;
struct bt_value *source_params = NULL, *sink_params = NULL;
- enum bt_component_status sink_status;
struct bt_config_component *source_cfg = NULL, *sink_cfg = NULL;
+ struct bt_graph *graph = NULL;
+
+ ret = load_all_plugins(cfg->cmd_data.convert.plugin_paths);
+ if (ret) {
+ fprintf(stderr, "Could not load plugins from configured plugin paths. Aborting...\n");
+ goto end;
+ }
+
+ if (cfg->cmd_data.convert.print_ctf_metadata) {
+ ret = print_ctf_metadata(cfg);
+ goto end;
+ }
/* TODO handle more than 1 source and 1 sink. */
if (cfg->cmd_data.convert.sources->len != 1 ||
goto end;
}
- ret = load_all_plugins(cfg->cmd_data.convert.plugin_paths);
- if (ret) {
- fprintf(stderr, "Could not load plugins from configured plugin paths. Aborting...\n");
- goto end;
- }
-
source_cfg = bt_config_get_component(cfg->cmd_data.convert.sources, 0);
source_params = bt_get(source_cfg->params);
source_class = find_component_class(source_cfg->plugin_name->str,
goto end;
}
+ graph = bt_graph_create();
+ if (!graph) {
+ ret = -1;
+ goto end;
+ }
+
source = bt_component_create(source_class, "source", source_params);
if (!source) {
fprintf(stderr, "Failed to instantiate selected source component. Aborting...\n");
goto end;
}
- ret = connect_source_sink(source, source_cfg, sink);
+ ret = connect_source_sink(graph, source, source_cfg, sink);
if (ret) {
ret = -1;
goto end;
}
while (true) {
- sink_status = bt_component_sink_consume(sink);
- switch (sink_status) {
- case BT_COMPONENT_STATUS_AGAIN:
+ enum bt_graph_status graph_status;
+
+ graph_status = bt_graph_run(graph, NULL);
+ switch (graph_status) {
+ case BT_GRAPH_STATUS_AGAIN:
/* Wait for an arbitraty 500 ms. */
usleep(500000);
break;
- case BT_COMPONENT_STATUS_OK:
- break;
case BT_COMPONENT_STATUS_END:
goto end;
default:
}
end:
- BT_PUT(sink_class);
- BT_PUT(source_class);
- BT_PUT(source);
- BT_PUT(sink);
- BT_PUT(source_params);
- BT_PUT(sink_params);
- BT_PUT(sink_cfg);
- BT_PUT(source_cfg);
+ bt_put(sink_class);
+ bt_put(source_class);
+ bt_put(source);
+ bt_put(sink);
+ bt_put(source_params);
+ bt_put(sink_params);
+ bt_put(sink_cfg);
+ bt_put(source_cfg);
+ bt_put(graph);
return ret;
}
case BT_CONFIG_COMMAND_HELP:
ret = cmd_help(cfg);
break;
- case BT_CONFIG_COMMAND_QUERY_INFO:
- ret = cmd_query_info(cfg);
+ case BT_CONFIG_COMMAND_QUERY:
+ ret = cmd_query(cfg);
break;
default:
assert(false);