#include <babeltrace/babeltrace.h>
#include <babeltrace/plugin/plugin.h>
#include <babeltrace/common-internal.h>
-#include <babeltrace/component/component.h>
-#include <babeltrace/component/component-source.h>
-#include <babeltrace/component/component-sink.h>
-#include <babeltrace/component/component-filter.h>
-#include <babeltrace/component/component-class.h>
-#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/graph/component.h>
+#include <babeltrace/graph/component-source.h>
+#include <babeltrace/graph/component-sink.h>
+#include <babeltrace/graph/component-filter.h>
+#include <babeltrace/graph/component-class.h>
+#include <babeltrace/graph/port.h>
+#include <babeltrace/graph/graph.h>
+#include <babeltrace/graph/connection.h>
+#include <babeltrace/graph/notification-iterator.h>
#include <babeltrace/ref.h>
#include <babeltrace/values.h>
#include <stdlib.h>
-#include <babeltrace/ctf-ir/metadata.h> /* for clocks */
#include <popt.h>
#include <string.h>
#include <stdio.h>
#include <glib.h>
+#include <inttypes.h>
#include "babeltrace-cfg.h"
+#include "babeltrace-cfg-connect.h"
#include "default-cfg.h"
GPtrArray *loaded_plugins;
}
}
+static char *escape_name_for_shell(const char *input)
+{
+ char *output = g_malloc0(strlen(input) * 5 + 1);
+ const char *in;
+ char *out = output;
+
+ if (!output) {
+ goto end;
+ }
+
+ for (in = input; *in != '\0'; in++) {
+ switch (*in) {
+ case '\\':
+ *out++ = '\\';
+ *out++ = '\\';
+ break;
+ case '\'':
+ *out++ = '\'';
+ *out++ = '"';
+ *out++ = '\'';
+ *out++ = '"';
+ *out++ = '\'';
+ break;
+ case '.':
+ *out++ = '\\';
+ *out++ = '.';
+ break;
+ default:
+ *out++ = *in;
+ break;
+ }
+ }
+
+end:
+ return output;
+}
+
+static
+const char *component_type_str(enum bt_component_class_type type)
+{
+ switch (type) {
+ case BT_COMPONENT_CLASS_TYPE_SOURCE:
+ return "source";
+ case BT_COMPONENT_CLASS_TYPE_SINK:
+ return "sink";
+ case BT_COMPONENT_CLASS_TYPE_FILTER:
+ return "filter";
+ case BT_COMPONENT_CLASS_TYPE_UNKNOWN:
+ default:
+ return "unknown";
+ }
+}
+
+static void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
+ const char *comp_cls_name, enum bt_component_class_type type)
+{
+ char *shell_plugin_name = NULL;
+ char *shell_comp_cls_name = NULL;
+
+ shell_plugin_name = escape_name_for_shell(plugin_name);
+ if (!shell_plugin_name) {
+ goto end;
+ }
+
+ shell_comp_cls_name = escape_name_for_shell(comp_cls_name);
+ if (!shell_comp_cls_name) {
+ goto end;
+ }
+
+ fprintf(fh, "%s%s--%s%s %s'%s%s%s%s.%s%s%s'",
+ bt_common_color_bold(),
+ bt_common_color_fg_cyan(),
+ component_type_str(type),
+ bt_common_color_reset(),
+ bt_common_color_fg_default(),
+ bt_common_color_bold(),
+ bt_common_color_fg_blue(),
+ shell_plugin_name,
+ bt_common_color_fg_default(),
+ bt_common_color_fg_yellow(),
+ shell_comp_cls_name,
+ bt_common_color_reset());
+
+end:
+ g_free(shell_plugin_name);
+ g_free(shell_comp_cls_name);
+}
+
static
void print_value(struct bt_value *, size_t);
+static
+void print_value_rec(struct bt_value *, size_t);
+
static
bool print_map_value(const char *key, struct bt_value *object, void *data)
{
printf("\n");
}
- print_value(object, *indent + 2);
+ print_value_rec(object, *indent + 2);
return true;
}
static
-void print_value(struct bt_value *value, size_t indent)
+void print_value_rec(struct bt_value *value, size_t indent)
{
bool bool_val;
int64_t int_val;
switch (bt_value_get_type(value)) {
case BT_VALUE_TYPE_NULL:
- printf("null\n");
+ printf("%snull%s\n", bt_common_color_bold(),
+ bt_common_color_reset());
break;
case BT_VALUE_TYPE_BOOL:
bt_value_bool_get(value, &bool_val);
- printf("%s\n", bool_val ? "yes" : "no");
+ printf("%s%s%s%s\n", bt_common_color_bold(),
+ bt_common_color_fg_cyan(), bool_val ? "yes" : "no",
+ bt_common_color_reset());
break;
case BT_VALUE_TYPE_INTEGER:
bt_value_integer_get(value, &int_val);
- printf("%" PRId64 "\n", int_val);
+ printf("%s%s%" PRId64 "%s\n", bt_common_color_bold(),
+ bt_common_color_fg_red(), int_val,
+ bt_common_color_reset());
break;
case BT_VALUE_TYPE_FLOAT:
bt_value_float_get(value, &dbl_val);
- printf("%lf\n", dbl_val);
+ printf("%s%s%lf%s\n", bt_common_color_bold(),
+ bt_common_color_fg_red(), dbl_val,
+ bt_common_color_reset());
break;
case BT_VALUE_TYPE_STRING:
bt_value_string_get(value, &str_val);
- printf("%s\n", str_val);
+ printf("%s%s%s%s\n", bt_common_color_bold(),
+ bt_common_color_fg_green(), str_val,
+ bt_common_color_reset());
break;
case BT_VALUE_TYPE_ARRAY:
size = bt_value_array_size(value);
printf("\n");
}
- print_value(element, indent + 2);
+ print_value_rec(element, indent + 2);
BT_PUT(element);
}
break;
}
}
+static
+void print_value(struct bt_value *value, size_t indent)
+{
+ if (!bt_value_is_array(value) && !bt_value_is_map(value)) {
+ print_indent(indent);
+ }
+
+ print_value_rec(value, indent);
+}
+
static
void print_bt_config_component(struct bt_config_component *bt_config_component)
{
- printf(" %s.%s:\n", bt_config_component->plugin_name->str,
- bt_config_component->component_name->str);
+ printf(" ");
+ print_plugin_comp_cls_opt(stdout, bt_config_component->plugin_name->str,
+ bt_config_component->comp_cls_name->str,
+ bt_config_component->type);
+ printf(":\n");
if (bt_config_component->instance_name->len > 0) {
printf(" Name: %s\n",
}
static
-void print_cfg_convert(struct bt_config *cfg)
+void print_cfg_run(struct bt_config *cfg)
{
- printf(" Force correlate: %s\n",
- cfg->cmd_data.convert.force_correlate ? "yes" : "no");
- print_plugin_paths(cfg->cmd_data.convert.plugin_paths);
+ size_t i;
+
+ print_plugin_paths(cfg->plugin_paths);
printf(" Source component instances:\n");
- print_bt_config_components(cfg->cmd_data.convert.sources);
+ print_bt_config_components(cfg->cmd_data.run.sources);
+
+ if (cfg->cmd_data.run.filters->len > 0) {
+ printf(" Filter component instances:\n");
+ print_bt_config_components(cfg->cmd_data.run.filters);
+ }
+
printf(" Sink component instances:\n");
- print_bt_config_components(cfg->cmd_data.convert.sinks);
+ print_bt_config_components(cfg->cmd_data.run.sinks);
+ printf(" Connections:\n");
+
+ for (i = 0; i < cfg->cmd_data.run.connections->len; i++) {
+ struct bt_config_connection *cfg_connection =
+ g_ptr_array_index(cfg->cmd_data.run.connections,
+ i);
+
+ printf(" %s%s%s -> %s%s%s\n",
+ cfg_connection->src_instance_name->str,
+ cfg_connection->src_port_name->len > 0 ? "." : "",
+ cfg_connection->src_port_name->str,
+ cfg_connection->dst_instance_name->str,
+ cfg_connection->dst_port_name->len > 0 ? "." : "",
+ cfg_connection->dst_port_name->str);
+ }
}
static
void print_cfg_list_plugins(struct bt_config *cfg)
{
- print_plugin_paths(cfg->cmd_data.list_plugins.plugin_paths);
+ print_plugin_paths(cfg->plugin_paths);
+}
+
+static
+void print_cfg_help(struct bt_config *cfg)
+{
+ print_plugin_paths(cfg->plugin_paths);
+}
+
+static
+void print_cfg_print_ctf_metadata(struct bt_config *cfg)
+{
+ print_plugin_paths(cfg->plugin_paths);
+ printf(" Path: %s\n", cfg->cmd_data.print_ctf_metadata.path->str);
+}
+
+static
+void print_cfg_print_lttng_live_sessions(struct bt_config *cfg)
+{
+ print_plugin_paths(cfg->plugin_paths);
+ printf(" URL: %s\n", cfg->cmd_data.print_lttng_live_sessions.url->str);
+}
+
+static
+void print_cfg_query(struct bt_config *cfg)
+{
+ print_plugin_paths(cfg->plugin_paths);
+ printf(" Object: `%s`\n", cfg->cmd_data.query.object->str);
+ printf(" Component class:\n");
+ print_bt_config_component(cfg->cmd_data.query.cfg_component);
}
static
printf(" Verbose mode: %s\n", cfg->verbose ? "yes" : "no");
switch (cfg->command) {
- case BT_CONFIG_COMMAND_CONVERT:
- print_cfg_convert(cfg);
+ case BT_CONFIG_COMMAND_RUN:
+ print_cfg_run(cfg);
break;
case BT_CONFIG_COMMAND_LIST_PLUGINS:
print_cfg_list_plugins(cfg);
break;
+ case BT_CONFIG_COMMAND_HELP:
+ print_cfg_help(cfg);
+ break;
+ case BT_CONFIG_COMMAND_QUERY:
+ print_cfg_query(cfg);
+ break;
+ case BT_CONFIG_COMMAND_PRINT_CTF_METADATA:
+ print_cfg_print_ctf_metadata(cfg);
+ break;
+ case BT_CONFIG_COMMAND_PRINT_LTTNG_LIVE_SESSIONS:
+ print_cfg_print_lttng_live_sessions(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_ports(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_ports(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;
}
return ret;
}
-static
-const char *component_type_str(enum bt_component_class_type type)
-{
- switch (type) {
- case BT_COMPONENT_CLASS_TYPE_SOURCE:
- return "source";
- case BT_COMPONENT_CLASS_TYPE_SINK:
- return "sink";
- case BT_COMPONENT_CLASS_TYPE_FILTER:
- return "filter";
- case BT_COMPONENT_CLASS_TYPE_UNKNOWN:
- default:
- return "unknown";
- }
-}
-
static int load_all_plugins(struct bt_value *plugin_paths)
{
int ret = 0;
license ? license : "(Unknown)");
}
-static void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
- const char *comp_cls_name, enum bt_component_class_type type)
+static int cmd_query(struct bt_config *cfg)
{
- fprintf(fh, "%s%s--%s%s %s%s%s.%s%s%s",
- bt_common_color_bold(),
- bt_common_color_fg_cyan(),
- component_type_str(type),
- bt_common_color_fg_default(),
- bt_common_color_fg_blue(),
- plugin_name,
- bt_common_color_fg_default(),
- bt_common_color_fg_yellow(),
- comp_cls_name,
- bt_common_color_reset());
+ int ret;
+ struct bt_component_class *comp_cls = NULL;
+ struct bt_value *results = NULL;
+
+ ret = load_all_plugins(cfg->plugin_paths);
+ if (ret) {
+ goto end;
+ }
+
+ comp_cls = find_component_class(cfg->cmd_data.query.cfg_component->plugin_name->str,
+ cfg->cmd_data.query.cfg_component->comp_cls_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.cfg_component->plugin_name->str,
+ cfg->cmd_data.query.cfg_component->comp_cls_name->str,
+ cfg->cmd_data.query.cfg_component->type);
+ fprintf(stderr, "\n");
+ ret = -1;
+ goto end;
+ }
+
+ 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.cfg_component->plugin_name->str,
+ cfg->cmd_data.query.cfg_component->comp_cls_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.object->str,
+ bt_common_color_reset());
+ ret = -1;
+ goto end;
+ }
+
+ print_value(results, 0);
+
+end:
+ bt_put(comp_cls);
+ bt_put(results);
+ return ret;
}
static int cmd_help(struct bt_config *cfg)
struct bt_plugin *plugin = NULL;
size_t i;
- ret = load_all_plugins(cfg->cmd_data.list_plugins.plugin_paths);
+ ret = load_all_plugins(cfg->plugin_paths);
if (ret) {
goto end;
}
- plugin = find_plugin(cfg->cmd_data.help.plugin_name->str);
+ plugin = find_plugin(cfg->cmd_data.help.cfg_component->plugin_name->str);
if (!plugin) {
fprintf(stderr, "%s%sCannot find plugin %s%s%s\n",
bt_common_color_bold(), bt_common_color_fg_red(),
bt_common_color_fg_blue(),
- cfg->cmd_data.help.plugin_name->str,
+ cfg->cmd_data.help.cfg_component->plugin_name->str,
bt_common_color_reset());
ret = -1;
goto end;
bt_plugin_get_component_class_count(plugin));
- if (cfg->cmd_data.help.comp_cls_type !=
+ if (cfg->cmd_data.help.cfg_component->type !=
BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
struct bt_component_class *needed_comp_cls =
find_component_class(
- cfg->cmd_data.help.plugin_name->str,
- cfg->cmd_data.help.component_name->str,
- cfg->cmd_data.help.comp_cls_type);
+ cfg->cmd_data.help.cfg_component->plugin_name->str,
+ cfg->cmd_data.help.cfg_component->comp_cls_name->str,
+ cfg->cmd_data.help.cfg_component->type);
if (!needed_comp_cls) {
fprintf(stderr, "\n%s%sCannot find component class %s",
bt_common_color_fg_red(),
bt_common_color_reset());
print_plugin_comp_cls_opt(stderr,
- cfg->cmd_data.help.plugin_name->str,
- cfg->cmd_data.help.component_name->str,
- cfg->cmd_data.help.comp_cls_type);
+ cfg->cmd_data.help.cfg_component->plugin_name->str,
+ cfg->cmd_data.help.cfg_component->comp_cls_name->str,
+ cfg->cmd_data.help.cfg_component->type);
fprintf(stderr, "\n");
ret = -1;
goto end;
assert(comp_cls);
- if (cfg->cmd_data.help.comp_cls_type !=
+ if (cfg->cmd_data.help.cfg_component->type !=
BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
- if (strcmp(cfg->cmd_data.help.component_name->str,
+ if (strcmp(cfg->cmd_data.help.cfg_component->comp_cls_name->str,
comp_class_name) != 0 &&
type ==
- cfg->cmd_data.help.comp_cls_type) {
+ cfg->cmd_data.help.cfg_component->type) {
bt_put(comp_cls);
continue;
}
printf("\n");
print_plugin_comp_cls_opt(stdout,
- cfg->cmd_data.help.plugin_name->str,
+ cfg->cmd_data.help.cfg_component->plugin_name->str,
comp_class_name,
type);
printf("\n");
int ret;
int plugins_count, component_classes_count = 0, i;
- ret = load_all_plugins(cfg->cmd_data.list_plugins.plugin_paths);
+ ret = load_all_plugins(cfg->plugin_paths);
if (ret) {
goto end;
}
printf("From the following plugin paths:\n\n");
- print_value(cfg->cmd_data.list_plugins.plugin_paths, 2);
+ print_value(cfg->plugin_paths, 2);
printf("\n");
plugins_count = loaded_plugins->len;
if (plugins_count == 0) {
return ret;
}
-static int cmd_convert(struct bt_config *cfg)
+static int cmd_print_lttng_live_sessions(struct bt_config *cfg)
+{
+ printf("TODO\n");
+ return -1;
+}
+
+static int cmd_print_ctf_metadata(struct bt_config *cfg)
+{
+ int ret = 0;
+ struct bt_component_class *comp_cls = NULL;
+ struct bt_value *results = NULL;
+ struct bt_value *params = NULL;
+ struct bt_value *metadata_text_value = NULL;
+ const char *metadata_text = NULL;
+ static const char * const plugin_name = "ctf";
+ static const char * const comp_cls_name = "fs";
+ static const enum bt_component_class_type comp_cls_type =
+ BT_COMPONENT_CLASS_TYPE_SOURCE;
+
+ assert(cfg->cmd_data.print_ctf_metadata.path);
+ comp_cls = find_component_class(plugin_name, comp_cls_name,
+ comp_cls_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, plugin_name,
+ comp_cls_name, comp_cls_type);
+ fprintf(stderr, "\n");
+ ret = -1;
+ goto end;
+ }
+
+ params = bt_value_map_create();
+ if (!params) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = bt_value_map_insert_string(params, "path",
+ cfg->cmd_data.print_ctf_metadata.path->str);
+ 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(params);
+ bt_put(metadata_text_value);
+ bt_put(comp_cls);
+ return 0;
+}
+
+static int cmd_run(struct bt_config *cfg)
{
int ret = 0;
struct bt_component_class *source_class = NULL;
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;
- /* TODO handle more than 1 source and 1 sink. */
- if (cfg->cmd_data.convert.sources->len != 1 ||
- cfg->cmd_data.convert.sinks->len != 1) {
- ret = -1;
+ ret = load_all_plugins(cfg->plugin_paths);
+ if (ret) {
goto end;
}
- ret = load_all_plugins(cfg->cmd_data.convert.plugin_paths);
- if (ret) {
+ /* TODO handle more than 1 source and 1 sink. */
+ if (cfg->cmd_data.run.sources->len != 1 ||
+ cfg->cmd_data.run.sinks->len != 1) {
+ fprintf(stderr, "Only one source and one sink component class are supported. Aborting...\n");
+ ret = -1;
goto end;
}
- source_cfg = bt_config_get_component(cfg->cmd_data.convert.sources, 0);
+ source_cfg = bt_config_get_component(cfg->cmd_data.run.sources, 0);
source_params = bt_get(source_cfg->params);
source_class = find_component_class(source_cfg->plugin_name->str,
- source_cfg->component_name->str,
+ source_cfg->comp_cls_name->str,
BT_COMPONENT_CLASS_TYPE_SOURCE);
if (!source_class) {
- fprintf(stderr, "Could not find %s.%s source component class. Aborting...\n",
- source_cfg->plugin_name->str,
- source_cfg->component_name->str);
+ fprintf(stderr, "Could not find ");
+ print_plugin_comp_cls_opt(stderr, source_cfg->plugin_name->str,
+ source_cfg->comp_cls_name->str, BT_COMPONENT_CLASS_TYPE_SOURCE);
+ fprintf(stderr, ". Aborting...\n");
ret = -1;
goto end;
}
- sink_cfg = bt_config_get_component(cfg->cmd_data.convert.sinks, 0);
+ sink_cfg = bt_config_get_component(cfg->cmd_data.run.sinks, 0);
sink_params = bt_get(sink_cfg->params);
sink_class = find_component_class(sink_cfg->plugin_name->str,
- sink_cfg->component_name->str,
+ sink_cfg->comp_cls_name->str,
BT_COMPONENT_CLASS_TYPE_SINK);
if (!sink_class) {
- fprintf(stderr, "Could not find %s.%s output component class. Aborting...\n",
- sink_cfg->plugin_name->str,
- sink_cfg->component_name->str);
+ fprintf(stderr, "Could not find ");
+ print_plugin_comp_cls_opt(stderr, sink_cfg->plugin_name->str,
+ sink_cfg->comp_cls_name->str, BT_COMPONENT_CLASS_TYPE_SINK);
+ fprintf(stderr, ". Aborting...\n");
+ ret = -1;
+ goto end;
+ }
+
+ graph = bt_graph_create();
+ if (!graph) {
ret = -1;
goto end;
}
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);
+ 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;
}
if (!cfg) {
fprintf(stderr, "Failed to create Babeltrace configuration\n");
+ retcode = 1;
goto end;
}
babeltrace_verbose = cfg->verbose;
print_cfg(cfg);
+ if (cfg->command_needs_plugins) {
+ ret = load_all_plugins(cfg->plugin_paths);
+ if (ret) {
+ retcode = 1;
+ goto end;
+ }
+ }
+
switch (cfg->command) {
- case BT_CONFIG_COMMAND_CONVERT:
- ret = cmd_convert(cfg);
+ case BT_CONFIG_COMMAND_RUN:
+ ret = cmd_run(cfg);
break;
case BT_CONFIG_COMMAND_LIST_PLUGINS:
ret = cmd_list_plugins(cfg);
case BT_CONFIG_COMMAND_HELP:
ret = cmd_help(cfg);
break;
+ case BT_CONFIG_COMMAND_QUERY:
+ ret = cmd_query(cfg);
+ break;
+ case BT_CONFIG_COMMAND_PRINT_CTF_METADATA:
+ ret = cmd_print_ctf_metadata(cfg);
+ break;
+ case BT_CONFIG_COMMAND_PRINT_LTTNG_LIVE_SESSIONS:
+ ret = cmd_print_lttng_live_sessions(cfg);
+ break;
default:
assert(false);
}