/*
- * babeltrace.c
- *
- * Babeltrace Trace Converter
- *
* Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
*
* Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
#include <babeltrace/babeltrace.h>
#include <babeltrace/common-internal.h>
-#include <babeltrace/values-internal.h>
#include <unistd.h>
#include <stdlib.h>
#include <popt.h>
static const char* log_level_env_var_names[] = {
"BABELTRACE_COMMON_LOG_LEVEL",
"BABELTRACE_COMPAT_LOG_LEVEL",
- "BABELTRACE_PLUGIN_CTF_BTR_LOG_LEVEL",
- "BABELTRACE_SINK_CTF_FS_LOG_LEVEL",
- "BABELTRACE_SRC_CTF_FS_LOG_LEVEL",
- "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL",
- "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL",
- "BABELTRACE_PLUGIN_CTF_NOTIF_ITER_LOG_LEVEL",
- "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL",
+ "BABELTRACE_CTFSER_LOG_LEVEL",
+ "BABELTRACE_FD_CACHE_LOG_LEVEL",
"BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL",
- "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL",
- "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL",
+ "BABELTRACE_FLT_UTILS_COUNTER_LOG_LEVEL",
"BABELTRACE_FLT_UTILS_MUXER_LOG_LEVEL",
"BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL",
+ "BABELTRACE_PLUGIN_CTF_BFCR_LOG_LEVEL",
+ "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL",
+ "BABELTRACE_PLUGIN_CTF_MSG_ITER_LOG_LEVEL",
+ "BABELTRACE_PLUGIN_CTF_UTILS_LOG_LEVEL",
"BABELTRACE_PYTHON_BT2_LOG_LEVEL",
- "BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL",
+ "BABELTRACE_SINK_CTF_FS_LOG_LEVEL",
+ "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL",
+ "BABELTRACE_SRC_CTF_FS_LOG_LEVEL",
+ "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL",
+ "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL",
NULL,
};
/* Application's processing graph (weak) */
-static struct bt_graph *the_graph;
-static struct bt_query_executor *the_query_executor;
+static bt_graph *the_graph;
+static bt_query_executor *the_query_executor;
static bool canceled = false;
GPtrArray *loaded_plugins;
#ifdef __MINGW32__
+
#include <windows.h>
static
BT_LOGE("Failed to set the ctrl+c handler.");
}
}
+
#else /* __MINGW32__ */
+
static
void signal_handler(int signum)
{
sigaction(SIGINT, &new_action, NULL);
}
}
+
#endif /* __MINGW32__ */
static
void init_static_data(void)
{
- loaded_plugins = g_ptr_array_new_with_free_func(bt_put);
+ loaded_plugins = g_ptr_array_new_with_free_func(
+ (GDestroyNotify) bt_object_put_ref);
}
static
static
void destroy_the_query_executor(void)
{
- BT_PUT(the_query_executor);
+ BT_QUERY_EXECUTOR_PUT_REF_AND_RESET(the_query_executor);
}
static
-int query(struct bt_component_class *comp_cls, const char *obj,
- struct bt_value *params, struct bt_value **user_result,
+int query(const bt_component_class *comp_cls, const char *obj,
+ const bt_value *params, const bt_value **user_result,
const char **fail_reason)
{
- struct bt_value *result = NULL;
- enum bt_query_status status;
+ const bt_value *result = NULL;
+ bt_query_executor_status status;
*fail_reason = "unknown error";
int ret = 0;
- assert(fail_reason);
- assert(user_result);
+ BT_ASSERT(fail_reason);
+ BT_ASSERT(user_result);
ret = create_the_query_executor();
if (ret) {
/* create_the_query_executor() logs errors */
}
while (true) {
- status = bt_query_executor_query(the_query_executor, comp_cls,
- obj, params, &result);
+ status = bt_query_executor_query(the_query_executor,
+ comp_cls, obj, params, &result);
switch (status) {
- case BT_QUERY_STATUS_OK:
+ case BT_QUERY_EXECUTOR_STATUS_OK:
goto ok;
- case BT_QUERY_STATUS_AGAIN:
+ case BT_QUERY_EXECUTOR_STATUS_AGAIN:
{
const uint64_t sleep_time_us = 100000;
/* Wait 100 ms and retry */
- BT_LOGV("Got BT_QUERY_STATUS_AGAIN: sleeping: "
+ BT_LOGV("Got BT_QUERY_EXECUTOR_STATUS_AGAIN: sleeping: "
"time-us=%" PRIu64, sleep_time_us);
if (usleep(sleep_time_us)) {
continue;
}
- case BT_QUERY_STATUS_EXECUTOR_CANCELED:
+ case BT_QUERY_EXECUTOR_STATUS_CANCELED:
*fail_reason = "canceled by user";
goto error;
- case BT_QUERY_STATUS_ERROR:
- case BT_QUERY_STATUS_INVALID:
+ case BT_QUERY_EXECUTOR_STATUS_ERROR:
goto error;
- case BT_QUERY_STATUS_INVALID_OBJECT:
+ case BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT:
*fail_reason = "invalid or unknown query object";
goto error;
- case BT_QUERY_STATUS_INVALID_PARAMS:
+ case BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS:
*fail_reason = "invalid query parameters";
goto error;
- case BT_QUERY_STATUS_NOMEM:
+ case BT_QUERY_EXECUTOR_STATUS_UNSUPPORTED:
+ *fail_reason = "unsupported action";
+ goto error;
+ case BT_QUERY_EXECUTOR_STATUS_NOMEM:
*fail_reason = "not enough memory";
goto error;
default:
end:
destroy_the_query_executor();
- bt_put(result);
+ bt_value_put_ref(result);
return ret;
}
static
-struct bt_plugin *find_plugin(const char *name)
+const bt_plugin *find_plugin(const char *name)
{
int i;
- struct bt_plugin *plugin = NULL;
+ const bt_plugin *plugin = NULL;
- assert(name);
+ BT_ASSERT(name);
BT_LOGD("Finding plugin: name=\"%s\"", name);
for (i = 0; i < loaded_plugins->len; i++) {
}
}
- return bt_get(plugin);
+ bt_plugin_get_ref(plugin);
+ return plugin;
}
+typedef const void *(*plugin_borrow_comp_cls_func_t)(
+ const bt_plugin *, const char *);
+
static
-struct bt_component_class *find_component_class(const char *plugin_name,
+const void *find_component_class_from_plugin(const char *plugin_name,
const char *comp_class_name,
- enum bt_component_class_type comp_class_type)
+ plugin_borrow_comp_cls_func_t plugin_borrow_comp_cls_func)
{
- struct bt_component_class *comp_class = NULL;
- struct bt_plugin *plugin;
+ const void *comp_class = NULL;
+ const bt_plugin *plugin;
BT_LOGD("Finding component class: plugin-name=\"%s\", "
- "comp-cls-name=\"%s\", comp-cls-type=%d",
- plugin_name, comp_class_name, comp_class_type);
+ "comp-cls-name=\"%s\"", plugin_name, comp_class_name);
plugin = find_plugin(plugin_name);
-
if (!plugin) {
goto end;
}
- comp_class = bt_plugin_get_component_class_by_name_and_type(plugin,
- comp_class_name, comp_class_type);
- BT_PUT(plugin);
+ comp_class = plugin_borrow_comp_cls_func(plugin, comp_class_name);
+ bt_object_get_ref(comp_class);
+ BT_PLUGIN_PUT_REF_AND_RESET(plugin);
end:
if (BT_LOG_ON_DEBUG) {
BT_LOGD("Found component class: comp-cls-addr=%p",
comp_class);
} else {
- BT_LOGD("Cannot find component class.");
+ BT_LOGD("Cannot find source component class.");
}
}
return comp_class;
}
+static
+const bt_component_class_source *find_source_component_class(
+ const char *plugin_name, const char *comp_class_name)
+{
+ return (const void *) find_component_class_from_plugin(
+ plugin_name, comp_class_name,
+ (plugin_borrow_comp_cls_func_t)
+ bt_plugin_borrow_source_component_class_by_name_const);
+}
+
+static
+const bt_component_class_filter *find_filter_component_class(
+ const char *plugin_name, const char *comp_class_name)
+{
+ return (const void *) find_component_class_from_plugin(
+ plugin_name, comp_class_name,
+ (plugin_borrow_comp_cls_func_t)
+ bt_plugin_borrow_filter_component_class_by_name_const);
+}
+
+static
+const bt_component_class_sink *find_sink_component_class(
+ const char *plugin_name, const char *comp_class_name)
+{
+ return (const void *) find_component_class_from_plugin(plugin_name,
+ comp_class_name,
+ (plugin_borrow_comp_cls_func_t)
+ bt_plugin_borrow_sink_component_class_by_name_const);
+}
+
+static
+const bt_component_class *find_component_class(const char *plugin_name,
+ const char *comp_class_name,
+ bt_component_class_type comp_class_type)
+{
+ const bt_component_class *comp_cls = NULL;
+
+ switch (comp_class_type) {
+ case BT_COMPONENT_CLASS_TYPE_SOURCE:
+ comp_cls = bt_component_class_source_as_component_class_const(find_source_component_class(plugin_name, comp_class_name));
+ break;
+ case BT_COMPONENT_CLASS_TYPE_FILTER:
+ comp_cls = bt_component_class_filter_as_component_class_const(find_filter_component_class(plugin_name, comp_class_name));
+ break;
+ case BT_COMPONENT_CLASS_TYPE_SINK:
+ comp_cls = bt_component_class_sink_as_component_class_const(find_sink_component_class(plugin_name, comp_class_name));
+ break;
+ default:
+ abort();
+ }
+
+ return comp_cls;
+}
+
static
void print_indent(FILE *fp, size_t indent)
{
}
static
-const char *component_type_str(enum bt_component_class_type type)
+const char *component_type_str(bt_component_class_type type)
{
switch (type) {
case BT_COMPONENT_CLASS_TYPE_SOURCE:
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)
+ const char *comp_cls_name, bt_component_class_type type)
{
GString *shell_plugin_name = NULL;
GString *shell_comp_cls_name = NULL;
}
static
-void print_value(FILE *, struct bt_value *, size_t);
+void print_value(FILE *, const bt_value *, size_t);
static
-void print_value_rec(FILE *, struct bt_value *, size_t);
+void print_value_rec(FILE *, const bt_value *, size_t);
struct print_map_value_data {
size_t indent;
};
static
-bt_bool print_map_value(const char *key, struct bt_value *object, void *data)
+bt_bool print_map_value(const char *key, const bt_value *object,
+ void *data)
{
struct print_map_value_data *print_map_value_data = data;
print_indent(print_map_value_data->fp, print_map_value_data->indent);
fprintf(print_map_value_data->fp, "%s: ", key);
+ BT_ASSERT(object);
if (bt_value_is_array(object) &&
bt_value_array_is_empty(object)) {
}
static
-void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
+void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
{
bt_bool bool_val;
int64_t int_val;
+ uint64_t uint_val;
double dbl_val;
const char *str_val;
int size;
int i;
- enum bt_value_status status;
if (!value) {
return;
bt_common_color_reset());
break;
case BT_VALUE_TYPE_BOOL:
- status = bt_value_bool_get(value, &bool_val);
- if (status != BT_VALUE_STATUS_OK) {
- goto error;
- }
+ bool_val = bt_value_bool_get(value);
fprintf(fp, "%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:
- status = bt_value_integer_get(value, &int_val);
- if (status != BT_VALUE_STATUS_OK) {
- goto error;
- }
+ case BT_VALUE_TYPE_UNSIGNED_INTEGER:
+ uint_val = bt_value_unsigned_integer_get(value);
+ fprintf(fp, "%s%s%" PRIu64 "%s\n", bt_common_color_bold(),
+ bt_common_color_fg_red(), uint_val,
+ bt_common_color_reset());
+ break;
+ case BT_VALUE_TYPE_SIGNED_INTEGER:
+ int_val = bt_value_signed_integer_get(value);
fprintf(fp, "%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:
- status = bt_value_float_get(value, &dbl_val);
- if (status != BT_VALUE_STATUS_OK) {
- goto error;
- }
+ case BT_VALUE_TYPE_REAL:
+ dbl_val = bt_value_real_get(value);
fprintf(fp, "%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:
- status = bt_value_string_get(value, &str_val);
- if (status != BT_VALUE_STATUS_OK) {
- goto error;
- }
+ str_val = bt_value_string_get(value);
fprintf(fp, "%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);
+ size = bt_value_array_get_size(value);
if (size < 0) {
goto error;
}
}
for (i = 0; i < size; i++) {
- struct bt_value *element =
- bt_value_array_get(value, i);
+ const bt_value *element =
+ bt_value_array_borrow_element_by_index_const(
+ value, i);
if (!element) {
goto error;
}
print_value_rec(fp, element, indent + 2);
- BT_PUT(element);
}
break;
case BT_VALUE_TYPE_MAP:
break;
}
- bt_value_map_foreach(value, print_map_value, &data);
+ bt_value_map_foreach_entry_const(value, print_map_value, &data);
break;
}
default:
error:
BT_LOGE("Error printing value of type %s.",
- bt_value_type_string(bt_value_get_type(value)));
+ bt_common_value_type_string(bt_value_get_type(value)));
}
static
-void print_value(FILE *fp, struct bt_value *value, size_t indent)
+void print_value(FILE *fp, const bt_value *value, size_t indent)
{
if (!bt_value_is_array(value) && !bt_value_is_map(value)) {
print_indent(fp, indent);
struct bt_config_component *cfg_component =
bt_config_get_component(array, i);
print_bt_config_component(cfg_component);
- BT_PUT(cfg_component);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg_component);
}
}
static
-void print_plugin_paths(struct bt_value *plugin_paths)
+void print_plugin_paths(const bt_value *plugin_paths)
{
fprintf(stderr, " Plugin paths:\n");
print_value(stderr, plugin_paths, 4);
}
static
-void add_to_loaded_plugins(struct bt_plugin_set *plugin_set)
+void add_to_loaded_plugins(const bt_plugin_set *plugin_set)
{
int64_t i;
int64_t count;
count = bt_plugin_set_get_plugin_count(plugin_set);
- assert(count >= 0);
+ BT_ASSERT(count >= 0);
for (i = 0; i < count; i++) {
- struct bt_plugin *plugin =
- bt_plugin_set_get_plugin(plugin_set, i);
- struct bt_plugin *loaded_plugin =
- find_plugin(bt_plugin_get_name(plugin));
+ const bt_plugin *plugin =
+ bt_plugin_set_borrow_plugin_by_index_const(plugin_set, i);
+ const bt_plugin *loaded_plugin =
+ find_plugin(bt_plugin_get_name(plugin));
- assert(plugin);
+ BT_ASSERT(plugin);
if (loaded_plugin) {
BT_LOGI("Not using plugin: another one already exists with the same name: "
bt_plugin_get_name(plugin),
bt_plugin_get_path(plugin),
bt_plugin_get_path(loaded_plugin));
- bt_put(loaded_plugin);
+ bt_plugin_put_ref(loaded_plugin);
} else {
/* Add to global array. */
BT_LOGD("Adding plugin to loaded plugins: plugin-path=\"%s\"",
bt_plugin_get_name(plugin));
- g_ptr_array_add(loaded_plugins, bt_get(plugin));
+ bt_plugin_get_ref(plugin);
+ g_ptr_array_add(loaded_plugins, (void *) plugin);
}
-
- bt_put(plugin);
}
}
static
-int load_dynamic_plugins(struct bt_value *plugin_paths)
+int load_dynamic_plugins(const bt_value *plugin_paths)
{
int nr_paths, i, ret = 0;
- nr_paths = bt_value_array_size(plugin_paths);
+ nr_paths = bt_value_array_get_size(plugin_paths);
if (nr_paths < 0) {
BT_LOGE_STR("Cannot load dynamic plugins: no plugin path.");
ret = -1;
BT_LOGI("Loading dynamic plugins.");
for (i = 0; i < nr_paths; i++) {
- struct bt_value *plugin_path_value = NULL;
+ const bt_value *plugin_path_value = NULL;
const char *plugin_path;
- struct bt_plugin_set *plugin_set;
- enum bt_value_status status;
-
- plugin_path_value = bt_value_array_get(plugin_paths, i);
- status = bt_value_string_get(plugin_path_value, &plugin_path);
- if (status != BT_VALUE_STATUS_OK) {
- BT_LOGD_STR("Cannot get plugin path string.");
- BT_PUT(plugin_path_value);
- continue;
- }
+ const bt_plugin_set *plugin_set;
+
+ plugin_path_value =
+ bt_value_array_borrow_element_by_index_const(
+ plugin_paths, i);
+ plugin_path = bt_value_string_get(plugin_path_value);
/*
* Skip this if the directory does not exist because
- * bt_plugin_create_all_from_dir() expects an existing
+ * bt_plugin_find_all_from_dir() expects an existing
* directory.
*/
if (!g_file_test(plugin_path, G_FILE_TEST_IS_DIR)) {
BT_LOGV("Skipping nonexistent directory path: "
"path=\"%s\"", plugin_path);
- BT_PUT(plugin_path_value);
continue;
}
- plugin_set = bt_plugin_create_all_from_dir(plugin_path, false);
+ plugin_set = bt_plugin_find_all_from_dir(plugin_path, false);
if (!plugin_set) {
BT_LOGD("Unable to load dynamic plugins: path=\"%s\"",
plugin_path);
- BT_PUT(plugin_path_value);
continue;
}
add_to_loaded_plugins(plugin_set);
- bt_put(plugin_set);
- BT_PUT(plugin_path_value);
+ bt_plugin_set_put_ref(plugin_set);
}
end:
return ret;
int load_static_plugins(void)
{
int ret = 0;
- struct bt_plugin_set *plugin_set;
+ const bt_plugin_set *plugin_set;
BT_LOGI("Loading static plugins.");
- plugin_set = bt_plugin_create_all_from_static();
+ plugin_set = bt_plugin_find_all_from_static();
if (!plugin_set) {
BT_LOGE("Unable to load static plugins.");
ret = -1;
}
add_to_loaded_plugins(plugin_set);
- bt_put(plugin_set);
+ bt_plugin_set_put_ref(plugin_set);
end:
return ret;
}
static
-int load_all_plugins(struct bt_value *plugin_paths)
+int load_all_plugins(const bt_value *plugin_paths)
{
int ret = 0;
}
static
-void print_plugin_info(struct bt_plugin *plugin)
+void print_plugin_info(const bt_plugin *plugin)
{
unsigned int major, minor, patch;
const char *extra;
- enum bt_plugin_status version_status;
+ bt_property_availability version_avail;
const char *plugin_name;
const char *path;
const char *author;
author = bt_plugin_get_author(plugin);
license = bt_plugin_get_license(plugin);
plugin_description = bt_plugin_get_description(plugin);
- version_status = bt_plugin_get_version(plugin, &major, &minor,
+ version_avail = bt_plugin_get_version(plugin, &major, &minor,
&patch, &extra);
printf("%s%s%s%s:\n", bt_common_color_bold(),
bt_common_color_fg_blue(), plugin_name,
puts(" Built-in");
}
- if (version_status == BT_PLUGIN_STATUS_OK) {
+ if (version_avail == BT_PROPERTY_AVAILABILITY_AVAILABLE) {
printf(" %sVersion%s: %u.%u.%u",
bt_common_color_bold(), bt_common_color_reset(),
major, minor, patch);
int cmd_query(struct bt_config *cfg)
{
int ret = 0;
- struct bt_component_class *comp_cls = NULL;
- struct bt_value *results = NULL;
+ const bt_component_class *comp_cls = NULL;
+ const bt_value *results = NULL;
const char *fail_reason = NULL;
- comp_cls = find_component_class(cfg->cmd_data.query.cfg_component->plugin_name->str,
+ 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) {
}
ret = query(comp_cls, cfg->cmd_data.query.object->str,
- cfg->cmd_data.query.cfg_component->params, &results,
- &fail_reason);
+ cfg->cmd_data.query.cfg_component->params,
+ &results, &fail_reason);
if (ret) {
goto failed;
}
ret = -1;
end:
- bt_put(comp_cls);
- bt_put(results);
+ bt_component_class_put_ref(comp_cls);
+ bt_value_put_ref(results);
return ret;
}
+static
+void print_component_class_help(const char *plugin_name,
+ const bt_component_class *comp_cls)
+{
+ const char *comp_class_name =
+ bt_component_class_get_name(comp_cls);
+ const char *comp_class_description =
+ bt_component_class_get_description(comp_cls);
+ const char *comp_class_help =
+ bt_component_class_get_help(comp_cls);
+ bt_component_class_type type =
+ bt_component_class_get_type(comp_cls);
+
+ print_plugin_comp_cls_opt(stdout, plugin_name, comp_class_name, type);
+ printf("\n");
+ printf(" %sDescription%s: %s\n", bt_common_color_bold(),
+ bt_common_color_reset(),
+ comp_class_description ? comp_class_description : "(None)");
+
+ if (comp_class_help) {
+ printf("\n%s\n", comp_class_help);
+ }
+}
+
static
int cmd_help(struct bt_config *cfg)
{
int ret = 0;
- struct bt_plugin *plugin = NULL;
- size_t i;
+ const bt_plugin *plugin = NULL;
+ const bt_component_class *needed_comp_cls = NULL;
plugin = find_plugin(cfg->cmd_data.help.cfg_component->plugin_name->str);
if (!plugin) {
}
print_plugin_info(plugin);
- printf(" %sComponent classes%s: %d\n",
+ printf(" %sSource component classes%s: %d\n",
+ bt_common_color_bold(),
+ bt_common_color_reset(),
+ (int) bt_plugin_get_source_component_class_count(plugin));
+ printf(" %sFilter component classes%s: %d\n",
+ bt_common_color_bold(),
+ bt_common_color_reset(),
+ (int) bt_plugin_get_filter_component_class_count(plugin));
+ printf(" %sSink component classes%s: %d\n",
bt_common_color_bold(),
bt_common_color_reset(),
- (int) bt_plugin_get_component_class_count(plugin));
+ (int) bt_plugin_get_sink_component_class_count(plugin));
+ if (strlen(cfg->cmd_data.help.cfg_component->comp_cls_name->str) == 0) {
+ /* Plugin help only */
+ goto end;
+ }
- 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.cfg_component->plugin_name->str,
- cfg->cmd_data.help.cfg_component->comp_cls_name->str,
- cfg->cmd_data.help.cfg_component->type);
+ needed_comp_cls = find_component_class(
+ 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) {
+ BT_LOGE("Cannot find component class: plugin-name=\"%s\", "
+ "comp-cls-name=\"%s\", comp-cls-type=%d",
+ 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%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.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;
+ }
- if (!needed_comp_cls) {
- BT_LOGE("Cannot find component class: plugin-name=\"%s\", "
- "comp-cls-name=\"%s\", comp-cls-type=%d",
- 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%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.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;
- }
+ printf("\n");
+ print_component_class_help(
+ cfg->cmd_data.help.cfg_component->plugin_name->str,
+ needed_comp_cls);
+
+end:
+ bt_component_class_put_ref(needed_comp_cls);
+ bt_plugin_put_ref(plugin);
+ return ret;
+}
- bt_put(needed_comp_cls);
+typedef void *(* plugin_borrow_comp_cls_by_index_func_t)(const bt_plugin *,
+ uint64_t);
+typedef const bt_component_class *(* spec_comp_cls_borrow_comp_cls_func_t)(
+ void *);
+
+void cmd_list_plugins_print_component_classes(const bt_plugin *plugin,
+ const char *cc_type_name, uint64_t count,
+ plugin_borrow_comp_cls_by_index_func_t borrow_comp_cls_by_index_func,
+ spec_comp_cls_borrow_comp_cls_func_t spec_comp_cls_borrow_comp_cls_func)
+{
+ uint64_t i;
+
+ if (count == 0) {
+ printf(" %s%s component classes%s: (none)\n",
+ bt_common_color_bold(),
+ cc_type_name,
+ bt_common_color_reset());
+ goto end;
+ } else {
+ printf(" %s%s component classes%s:\n",
+ bt_common_color_bold(),
+ cc_type_name,
+ bt_common_color_reset());
}
- for (i = 0; i < bt_plugin_get_component_class_count(plugin); i++) {
- struct bt_component_class *comp_cls =
- bt_plugin_get_component_class_by_index(plugin, i);
+ for (i = 0; i < count; i++) {
+ const bt_component_class *comp_class =
+ spec_comp_cls_borrow_comp_cls_func(
+ borrow_comp_cls_by_index_func(plugin, i));
const char *comp_class_name =
- bt_component_class_get_name(comp_cls);
+ bt_component_class_get_name(comp_class);
const char *comp_class_description =
- bt_component_class_get_description(comp_cls);
- const char *comp_class_help =
- bt_component_class_get_help(comp_cls);
- enum bt_component_class_type type =
- bt_component_class_get_type(comp_cls);
-
- assert(comp_cls);
-
- if (cfg->cmd_data.help.cfg_component->type !=
- BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
- if (strcmp(cfg->cmd_data.help.cfg_component->comp_cls_name->str,
- comp_class_name) != 0 ||
- type != cfg->cmd_data.help.cfg_component->type) {
- bt_put(comp_cls);
- continue;
- }
- }
+ bt_component_class_get_description(comp_class);
+ bt_component_class_type type =
+ bt_component_class_get_type(comp_class);
- printf("\n");
+ printf(" ");
print_plugin_comp_cls_opt(stdout,
- cfg->cmd_data.help.cfg_component->plugin_name->str,
- comp_class_name,
+ bt_plugin_get_name(plugin), comp_class_name,
type);
- printf("\n");
- printf(" %sDescription%s: %s\n", bt_common_color_bold(),
- bt_common_color_reset(),
- comp_class_description ? comp_class_description : "(None)");
- if (comp_class_help) {
- printf("\n%s\n", comp_class_help);
+ if (comp_class_description) {
+ printf(": %s", comp_class_description);
}
- bt_put(comp_cls);
+ printf("\n");
}
end:
- bt_put(plugin);
- return ret;
+ return;
}
static
}
for (i = 0; i < plugins_count; i++) {
- struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+ const bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
- component_classes_count += bt_plugin_get_component_class_count(plugin);
+ component_classes_count +=
+ bt_plugin_get_source_component_class_count(plugin) +
+ bt_plugin_get_filter_component_class_count(plugin) +
+ bt_plugin_get_sink_component_class_count(plugin);
}
printf("Found %s%d%s component classes in %s%d%s plugins.\n",
bt_common_color_reset());
for (i = 0; i < plugins_count; i++) {
- int j;
- struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+ const bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
- component_classes_count =
- bt_plugin_get_component_class_count(plugin);
printf("\n");
print_plugin_info(plugin);
-
- if (component_classes_count == 0) {
- printf(" %sComponent classes%s: (none)\n",
- bt_common_color_bold(),
- bt_common_color_reset());
- } else {
- printf(" %sComponent classes%s:\n",
- bt_common_color_bold(),
- bt_common_color_reset());
- }
-
- for (j = 0; j < component_classes_count; j++) {
- struct bt_component_class *comp_class =
- bt_plugin_get_component_class_by_index(
- plugin, j);
- const char *comp_class_name =
- bt_component_class_get_name(comp_class);
- const char *comp_class_description =
- bt_component_class_get_description(comp_class);
- enum bt_component_class_type type =
- bt_component_class_get_type(comp_class);
-
- printf(" ");
- print_plugin_comp_cls_opt(stdout,
- bt_plugin_get_name(plugin), comp_class_name,
- type);
-
- if (comp_class_description) {
- printf(": %s", comp_class_description);
- }
-
- printf("\n");
- bt_put(comp_class);
- }
+ cmd_list_plugins_print_component_classes(plugin, "Source",
+ bt_plugin_get_source_component_class_count(plugin),
+ (plugin_borrow_comp_cls_by_index_func_t)
+ bt_plugin_borrow_source_component_class_by_index_const,
+ (spec_comp_cls_borrow_comp_cls_func_t)
+ bt_component_class_source_as_component_class);
+ cmd_list_plugins_print_component_classes(plugin, "Filter",
+ bt_plugin_get_filter_component_class_count(plugin),
+ (plugin_borrow_comp_cls_by_index_func_t)
+ bt_plugin_borrow_filter_component_class_by_index_const,
+ (spec_comp_cls_borrow_comp_cls_func_t)
+ bt_component_class_filter_as_component_class);
+ cmd_list_plugins_print_component_classes(plugin, "Sink",
+ bt_plugin_get_sink_component_class_count(plugin),
+ (plugin_borrow_comp_cls_by_index_func_t)
+ bt_plugin_borrow_sink_component_class_by_index_const,
+ (spec_comp_cls_borrow_comp_cls_func_t)
+ bt_component_class_sink_as_component_class);
}
end:
int cmd_print_lttng_live_sessions(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 *map = NULL;
- struct bt_value *v = NULL;
+ const bt_component_class *comp_cls = NULL;
+ const bt_value *results = NULL;
+ bt_value *params = NULL;
+ const bt_value *map = NULL;
+ const bt_value *v = NULL;
static const char * const plugin_name = "ctf";
static const char * const comp_cls_name = "lttng-live";
- static const enum bt_component_class_type comp_cls_type =
+ static const bt_component_class_type comp_cls_type =
BT_COMPONENT_CLASS_TYPE_SOURCE;
int64_t array_size, i;
const char *fail_reason = NULL;
FILE *out_stream = stdout;
- assert(cfg->cmd_data.print_lttng_live_sessions.url);
+ BT_ASSERT(cfg->cmd_data.print_lttng_live_sessions.url);
comp_cls = find_component_class(plugin_name, comp_cls_name,
comp_cls_type);
if (!comp_cls) {
goto error;
}
- ret = bt_value_map_insert_string(params, "url",
+ ret = bt_value_map_insert_string_entry(params, "url",
cfg->cmd_data.print_lttng_live_sessions.url->str);
if (ret) {
goto error;
}
- ret = query(comp_cls, "sessions", params, &results, &fail_reason);
+ ret = query(comp_cls, "sessions", params,
+ &results, &fail_reason);
if (ret) {
goto failed;
}
+ BT_ASSERT(results);
+
if (!bt_value_is_array(results)) {
BT_LOGE_STR("Expecting an array for sessions query.");
fprintf(stderr, "%s%sUnexpected type returned by session query%s\n",
}
}
- array_size = bt_value_array_size(results);
+ array_size = bt_value_array_get_size(results);
for (i = 0; i < array_size; i++) {
const char *url_text;
int64_t timer_us, streams, clients;
- map = bt_value_array_get(results, i);
+ map = bt_value_array_borrow_element_by_index_const(results, i);
if (!map) {
BT_LOGE_STR("Unexpected empty array entry.");
goto error;
goto error;
}
- v = bt_value_map_get(map, "url");
+ v = bt_value_map_borrow_entry_value_const(map, "url");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"url\" entry.");
goto error;
}
- ret = bt_value_string_get(v, &url_text);
- assert(ret == 0);
+ url_text = bt_value_string_get(v);
fprintf(out_stream, "%s", url_text);
- BT_PUT(v);
-
- v = bt_value_map_get(map, "timer-us");
+ v = bt_value_map_borrow_entry_value_const(map, "timer-us");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"timer-us\" entry.");
goto error;
}
- ret = bt_value_integer_get(v, &timer_us);
- assert(ret == 0);
+ timer_us = bt_value_signed_integer_get(v);
fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us);
- BT_PUT(v);
-
- v = bt_value_map_get(map, "stream-count");
+ v = bt_value_map_borrow_entry_value_const(map, "stream-count");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"stream-count\" entry.");
goto error;
}
- ret = bt_value_integer_get(v, &streams);
- assert(ret == 0);
+ streams = bt_value_signed_integer_get(v);
fprintf(out_stream, "%" PRIu64 " stream(s), ", streams);
- BT_PUT(v);
-
- v = bt_value_map_get(map, "client-count");
+ v = bt_value_map_borrow_entry_value_const(map, "client-count");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"client-count\" entry.");
goto error;
}
- ret = bt_value_integer_get(v, &clients);
- assert(ret == 0);
+ clients = bt_value_signed_integer_get(v);
fprintf(out_stream, "%" PRIu64 " client(s) connected)\n", clients);
- BT_PUT(v);
-
- BT_PUT(map);
}
goto end;
ret = -1;
end:
- bt_put(v);
- bt_put(map);
- bt_put(results);
- bt_put(params);
- bt_put(comp_cls);
+ bt_value_put_ref(results);
+ bt_value_put_ref(params);
+ bt_component_class_put_ref(comp_cls);
if (out_stream && out_stream != stdout) {
int fclose_ret = fclose(out_stream);
}
}
- return 0;
+ return ret;
}
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 bt_component_class *comp_cls = NULL;
+ const bt_value *results = NULL;
+ bt_value *params = NULL;
+ const 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 =
+ static const bt_component_class_type comp_cls_type =
BT_COMPONENT_CLASS_TYPE_SOURCE;
const char *fail_reason = NULL;
FILE *out_stream = stdout;
- assert(cfg->cmd_data.print_ctf_metadata.path);
+ BT_ASSERT(cfg->cmd_data.print_ctf_metadata.path);
comp_cls = find_component_class(plugin_name, comp_cls_name,
comp_cls_type);
if (!comp_cls) {
goto end;
}
- ret = bt_value_map_insert_string(params, "path",
+ ret = bt_value_map_insert_string_entry(params, "path",
cfg->cmd_data.print_ctf_metadata.path->str);
if (ret) {
ret = -1;
goto end;
}
- ret = query(comp_cls, "metadata-info", params, &results, &fail_reason);
+ ret = query(comp_cls, "metadata-info",
+ params, &results, &fail_reason);
if (ret) {
goto failed;
}
- metadata_text_value = bt_value_map_get(results, "text");
+ metadata_text_value = bt_value_map_borrow_entry_value_const(results,
+ "text");
if (!metadata_text_value) {
BT_LOGE_STR("Cannot find `text` string value in the resulting metadata info object.");
ret = -1;
goto end;
}
- ret = bt_value_string_get(metadata_text_value, &metadata_text);
- assert(ret == 0);
+ metadata_text = bt_value_string_get(metadata_text_value);
if (cfg->cmd_data.print_ctf_metadata.output_path->len > 0) {
out_stream =
bt_common_color_reset());
end:
- destroy_the_query_executor();
- bt_put(results);
- bt_put(params);
- bt_put(metadata_text_value);
- bt_put(comp_cls);
+ bt_value_put_ref(results);
+ bt_value_put_ref(params);
+ bt_component_class_put_ref(comp_cls);
if (out_stream && out_stream != stdout) {
int fclose_ret = fclose(out_stream);
}
}
- return 0;
+ return ret;
}
struct port_id {
{
const struct port_id *id = v;
- assert(id->instance_name);
- assert(id->port_name);
+ BT_ASSERT(id->instance_name);
+ BT_ASSERT(id->port_name);
return g_str_hash(id->instance_name) ^ g_str_hash(id->port_name);
}
struct cmd_run_ctx {
/* Owned by this */
- GHashTable *components;
+ GHashTable *src_components;
+
+ /* Owned by this */
+ GHashTable *flt_components;
+
+ /* Owned by this */
+ GHashTable *sink_components;
/* Owned by this */
- struct bt_graph *graph;
+ bt_graph *graph;
/* Weak */
struct bt_config *cfg;
static
int cmd_run_ctx_connect_upstream_port_to_downstream_component(
- struct cmd_run_ctx *ctx, struct bt_component *upstream_comp,
- struct bt_port *upstream_port,
+ struct cmd_run_ctx *ctx,
+ const bt_component *upstream_comp,
+ const bt_port_output *out_upstream_port,
struct bt_config_connection *cfg_conn)
{
+ typedef uint64_t (*input_port_count_func_t)(void *);
+ typedef const bt_port_input *(*borrow_input_port_by_index_func_t)(
+ const void *, uint64_t);
+ const bt_port *upstream_port =
+ bt_port_output_as_port_const(out_upstream_port);
+
int ret = 0;
GQuark downstreamp_comp_name_quark;
- struct bt_component *downstream_comp;
- int64_t downstream_port_count;
+ void *downstream_comp;
+ uint64_t downstream_port_count;
uint64_t i;
- int64_t (*port_count_fn)(struct bt_component *);
- struct bt_port *(*port_by_index_fn)(struct bt_component *, uint64_t);
- enum bt_graph_status status = BT_GRAPH_STATUS_ERROR;
+ input_port_count_func_t port_count_fn;
+ borrow_input_port_by_index_func_t port_by_index_fn;
+ bt_graph_status status = BT_GRAPH_STATUS_ERROR;
bool insert_trimmer = false;
- struct bt_value *trimmer_params = NULL;
+ bt_value *trimmer_params = NULL;
char *intersection_begin = NULL;
char *intersection_end = NULL;
- struct bt_component *trimmer = NULL;
- struct bt_component_class *trimmer_class = NULL;
- struct bt_port *trimmer_input = NULL;
- struct bt_port *trimmer_output = NULL;
+ const bt_component_filter *trimmer = NULL;
+ const bt_component_class_filter *trimmer_class = NULL;
+ const bt_port_input *trimmer_input = NULL;
+ const bt_port_output *trimmer_output = NULL;
if (ctx->intersections &&
bt_component_get_class_type(upstream_comp) ==
range = (struct trace_range *) g_hash_table_lookup(
ctx->intersections, &port_id);
if (range) {
- enum bt_value_status status;
+ bt_value_status status;
intersection_begin = s_from_ns(
range->intersection_range_begin_ns);
goto error;
}
- status = bt_value_map_insert_string(trimmer_params,
- "begin", intersection_begin);
+ status = bt_value_map_insert_string_entry(
+ trimmer_params, "begin", intersection_begin);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
- status = bt_value_map_insert_string(trimmer_params,
+ status = bt_value_map_insert_string_entry(
+ trimmer_params,
"end", intersection_end);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
}
- trimmer_class = find_component_class("utils", "trimmer",
- BT_COMPONENT_CLASS_TYPE_FILTER);
+ trimmer_class = find_filter_component_class("utils", "trimmer");
if (!trimmer_class) {
goto error;
}
cfg_conn->arg->str);
downstreamp_comp_name_quark = g_quark_from_string(
cfg_conn->downstream_comp_name->str);
- assert(downstreamp_comp_name_quark > 0);
- downstream_comp = g_hash_table_lookup(ctx->components,
+ BT_ASSERT(downstreamp_comp_name_quark > 0);
+ downstream_comp = g_hash_table_lookup(ctx->flt_components,
GUINT_TO_POINTER(downstreamp_comp_name_quark));
+ port_count_fn = (input_port_count_func_t)
+ bt_component_filter_get_input_port_count;
+ port_by_index_fn = (borrow_input_port_by_index_func_t)
+ bt_component_filter_borrow_input_port_by_index_const;
+
+ if (!downstream_comp) {
+ downstream_comp = g_hash_table_lookup(ctx->sink_components,
+ GUINT_TO_POINTER(downstreamp_comp_name_quark));
+ port_count_fn = (input_port_count_func_t)
+ bt_component_sink_get_input_port_count;
+ port_by_index_fn = (borrow_input_port_by_index_func_t)
+ bt_component_sink_borrow_input_port_by_index_const;
+ }
+
if (!downstream_comp) {
BT_LOGE("Cannot find downstream component: comp-name=\"%s\", "
"conn-arg=\"%s\"", cfg_conn->downstream_comp_name->str,
goto error;
}
- if (bt_component_is_filter(downstream_comp)) {
- port_count_fn = bt_component_filter_get_input_port_count;
- port_by_index_fn = bt_component_filter_get_input_port_by_index;
- } else if (bt_component_is_sink(downstream_comp)) {
- port_count_fn = bt_component_sink_get_input_port_count;
- port_by_index_fn = bt_component_sink_get_input_port_by_index;
- } else {
- /*
- * Should never happen because the connections are
- * validated before we get here.
- */
- BT_LOGF("Invalid connection: downstream component is a source: "
- "conn-arg=\"%s\"", cfg_conn->arg->str);
- abort();
- }
-
downstream_port_count = port_count_fn(downstream_comp);
- assert(downstream_port_count >= 0);
for (i = 0; i < downstream_port_count; i++) {
- struct bt_port *downstream_port =
+ const bt_port_input *in_downstream_port =
port_by_index_fn(downstream_comp, i);
+ const bt_port *downstream_port =
+ bt_port_input_as_port_const(in_downstream_port);
const char *upstream_port_name;
const char *downstream_port_name;
- assert(downstream_port);
+ BT_ASSERT(downstream_port);
/* Skip port if it's already connected. */
if (bt_port_is_connected(downstream_port)) {
- bt_put(downstream_port);
BT_LOGD("Skipping downstream port: already connected: "
"port-addr=%p, port-name=\"%s\"",
downstream_port,
}
downstream_port_name = bt_port_get_name(downstream_port);
- assert(downstream_port_name);
+ BT_ASSERT(downstream_port_name);
upstream_port_name = bt_port_get_name(upstream_port);
- assert(upstream_port_name);
+ BT_ASSERT(upstream_port_name);
if (!bt_common_star_glob_match(
cfg_conn->downstream_port_glob->str, SIZE_MAX,
downstream_port_name, SIZE_MAX)) {
- bt_put(downstream_port);
continue;
}
if (insert_trimmer) {
/*
- * In order to insert the trimmer between the two
- * components that were being connected, we create
- * a connection configuration entry which describes
- * a connection from the trimmer's output to the
- * original input that was being connected.
+ * In order to insert the trimmer between the
+ * two components that were being connected, we
+ * create a connection configuration entry which
+ * describes a connection from the trimmer's
+ * output to the original input that was being
+ * connected.
*
- * Hence, the creation of the trimmer will cause the
- * graph "new port" listener to establish all downstream
- * connections as its output port is connected. We will
- * then establish the connection between the original
- * upstream source and the trimmer.
+ * Hence, the creation of the trimmer will cause
+ * the graph "new port" listener to establish
+ * all downstream connections as its output port
+ * is connected. We will then establish the
+ * connection between the original upstream
+ * source and the trimmer.
*/
char *trimmer_name = NULL;
- enum bt_graph_status graph_status;
+ bt_graph_status graph_status;
- ret = asprintf(&trimmer_name, "%s-%s",
- "stream-intersection-trimmer",
+ ret = asprintf(&trimmer_name,
+ "stream-intersection-trimmer-%s",
upstream_port_name);
if (ret < 0) {
goto error;
ret = 0;
ctx->connect_ports = false;
- graph_status = bt_graph_add_component(ctx->graph,
- trimmer_class, trimmer_name, trimmer_params,
- &trimmer);
+ graph_status = bt_graph_add_filter_component(
+ ctx->graph, trimmer_class, trimmer_name,
+ trimmer_params, &trimmer);
free(trimmer_name);
if (graph_status != BT_GRAPH_STATUS_OK) {
goto error;
}
- assert(trimmer);
+ BT_ASSERT(trimmer);
trimmer_input =
- bt_component_filter_get_input_port_by_index(
+ bt_component_filter_borrow_input_port_by_index_const(
trimmer, 0);
if (!trimmer_input) {
goto error;
}
trimmer_output =
- bt_component_filter_get_output_port_by_index(
+ bt_component_filter_borrow_output_port_by_index_const(
trimmer, 0);
if (!trimmer_output) {
goto error;
* Replace the current downstream port by the trimmer's
* upstream port.
*/
- BT_MOVE(downstream_port, trimmer_input);
+ in_downstream_port = trimmer_input;
+ downstream_port =
+ bt_port_input_as_port_const(in_downstream_port);
downstream_port_name = bt_port_get_name(
downstream_port);
- if (!downstream_port_name) {
- goto error;
- }
+ BT_ASSERT(downstream_port_name);
}
/* We have a winner! */
status = bt_graph_connect_ports(ctx->graph,
- upstream_port, downstream_port, NULL);
- BT_PUT(downstream_port);
+ out_upstream_port, in_downstream_port, NULL);
+ downstream_port = NULL;
switch (status) {
case BT_GRAPH_STATUS_OK:
break;
* original downstream port.
*/
ret = cmd_run_ctx_connect_upstream_port_to_downstream_component(
- ctx, trimmer, trimmer_output, cfg_conn);
+ ctx,
+ bt_component_filter_as_component_const(trimmer),
+ trimmer_output, cfg_conn);
if (ret) {
goto error;
}
end:
free(intersection_begin);
free(intersection_end);
- BT_PUT(trimmer_params);
- BT_PUT(trimmer_class);
- BT_PUT(trimmer);
- BT_PUT(trimmer_input);
- BT_PUT(trimmer_output);
+ BT_VALUE_PUT_REF_AND_RESET(trimmer_params);
+ BT_COMPONENT_CLASS_FILTER_PUT_REF_AND_RESET(trimmer_class);
+ BT_COMPONENT_FILTER_PUT_REF_AND_RESET(trimmer);
return ret;
}
static
int cmd_run_ctx_connect_upstream_port(struct cmd_run_ctx *ctx,
- struct bt_port *upstream_port)
+ const bt_port_output *upstream_port)
{
int ret = 0;
const char *upstream_port_name;
const char *upstream_comp_name;
- struct bt_component *upstream_comp = NULL;
+ const bt_component *upstream_comp = NULL;
size_t i;
- assert(ctx);
- assert(upstream_port);
- upstream_port_name = bt_port_get_name(upstream_port);
- assert(upstream_port_name);
- upstream_comp = bt_port_get_component(upstream_port);
+ BT_ASSERT(ctx);
+ BT_ASSERT(upstream_port);
+ upstream_port_name = bt_port_get_name(
+ bt_port_output_as_port_const(upstream_port));
+ BT_ASSERT(upstream_port_name);
+ upstream_comp = bt_port_borrow_component_const(
+ bt_port_output_as_port_const(upstream_port));
if (!upstream_comp) {
BT_LOGW("Upstream port to connect is not part of a component: "
"port-addr=%p, port-name=\"%s\"",
}
upstream_comp_name = bt_component_get_name(upstream_comp);
- assert(upstream_comp_name);
+ BT_ASSERT(upstream_comp_name);
BT_LOGI("Connecting upstream port: comp-addr=%p, comp-name=\"%s\", "
"port-addr=%p, port-name=\"%s\"",
upstream_comp, upstream_comp_name,
ret = -1;
end:
- bt_put(upstream_comp);
return ret;
}
static
-void graph_port_added_listener(struct bt_port *port, void *data)
+void graph_output_port_added_listener(struct cmd_run_ctx *ctx,
+ const bt_port_output *out_port)
{
- struct bt_component *comp = NULL;
- struct cmd_run_ctx *ctx = data;
+ const bt_component *comp;
+ const bt_port *port = bt_port_output_as_port_const(out_port);
- comp = bt_port_get_component(port);
+ comp = bt_port_borrow_component_const(port);
BT_LOGI("Port added to a graph's component: comp-addr=%p, "
"comp-name=\"%s\", port-addr=%p, port-name=\"%s\"",
comp, comp ? bt_component_get_name(comp) : "",
goto end;
}
- if (!bt_port_is_output(port)) {
- BT_LOGI_STR("Skipping input port.");
- goto end;
- }
-
- if (cmd_run_ctx_connect_upstream_port(ctx, port)) {
+ if (cmd_run_ctx_connect_upstream_port(ctx, out_port)) {
BT_LOGF_STR("Cannot connect upstream port.");
fprintf(stderr, "Added port could not be connected: aborting\n");
abort();
}
end:
- bt_put(comp);
return;
}
static
-void graph_port_removed_listener(struct bt_component *component,
- struct bt_port *port, void *data)
-{
- BT_LOGI("Port removed from a graph's component: comp-addr=%p, "
- "comp-name=\"%s\", port-addr=%p, port-name=\"%s\"",
- component, bt_component_get_name(component),
- port, bt_port_get_name(port));
-}
-
-static
-void graph_ports_connected_listener(struct bt_port *upstream_port,
- struct bt_port *downstream_port, void *data)
+void graph_source_output_port_added_listener(
+ const bt_component_source *component,
+ const bt_port_output *port, void *data)
{
- struct bt_component *upstream_comp = bt_port_get_component(upstream_port);
- struct bt_component *downstream_comp = bt_port_get_component(downstream_port);
-
- assert(upstream_comp);
- assert(downstream_comp);
- BT_LOGI("Graph's component ports connected: "
- "upstream-comp-addr=%p, upstream-comp-name=\"%s\", "
- "upstream-port-addr=%p, upstream-port-name=\"%s\", "
- "downstream-comp-addr=%p, downstream-comp-name=\"%s\", "
- "downstream-port-addr=%p, downstream-port-name=\"%s\"",
- upstream_comp, bt_component_get_name(upstream_comp),
- upstream_port, bt_port_get_name(upstream_port),
- downstream_comp, bt_component_get_name(downstream_comp),
- downstream_port, bt_port_get_name(downstream_port));
- bt_put(upstream_comp);
- bt_put(downstream_comp);
+ graph_output_port_added_listener(data, port);
}
static
-void graph_ports_disconnected_listener(
- struct bt_component *upstream_component,
- struct bt_component *downstream_component,
- struct bt_port *upstream_port, struct bt_port *downstream_port,
- void *data)
+void graph_filter_output_port_added_listener(
+ const bt_component_filter *component,
+ const bt_port_output *port, void *data)
{
- BT_LOGI("Graph's component ports disconnected: "
- "upstream-port-addr=%p, upstream-port-name=\"%s\", "
- "downstream-port-addr=%p, downstream-port-name=\"%s\"",
- upstream_port, bt_port_get_name(upstream_port),
- downstream_port, bt_port_get_name(downstream_port));
+ graph_output_port_added_listener(data, port);
}
static
return;
}
- if (ctx->components) {
- g_hash_table_destroy(ctx->components);
- ctx->components = NULL;
+ if (ctx->src_components) {
+ g_hash_table_destroy(ctx->src_components);
+ ctx->src_components = NULL;
+ }
+
+ if (ctx->flt_components) {
+ g_hash_table_destroy(ctx->flt_components);
+ ctx->flt_components = NULL;
+ }
+
+ if (ctx->sink_components) {
+ g_hash_table_destroy(ctx->sink_components);
+ ctx->sink_components = NULL;
}
if (ctx->intersections) {
ctx->intersections = NULL;
}
- BT_PUT(ctx->graph);
+ BT_GRAPH_PUT_REF_AND_RESET(ctx->graph);
the_graph = NULL;
ctx->cfg = NULL;
}
int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg)
{
int ret = 0;
+ bt_graph_status status;
ctx->cfg = cfg;
ctx->connect_ports = false;
- ctx->components = g_hash_table_new_full(g_direct_hash, g_direct_equal,
- NULL, bt_put);
- if (!ctx->components) {
+ ctx->src_components = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, (GDestroyNotify) bt_object_put_ref);
+ if (!ctx->src_components) {
+ goto error;
+ }
+
+ ctx->flt_components = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, (GDestroyNotify) bt_object_put_ref);
+ if (!ctx->flt_components) {
+ goto error;
+ }
+
+ ctx->sink_components = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, (GDestroyNotify) bt_object_put_ref);
+ if (!ctx->sink_components) {
goto error;
}
}
the_graph = ctx->graph;
- ret = bt_graph_add_port_added_listener(ctx->graph,
- graph_port_added_listener, NULL, ctx);
- if (ret < 0) {
+ status = bt_graph_add_source_component_output_port_added_listener(
+ ctx->graph, graph_source_output_port_added_listener, NULL, ctx,
+ NULL);
+ if (status != BT_GRAPH_STATUS_OK) {
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, 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, 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, NULL, ctx);
- if (ret < 0) {
- BT_LOGE_STR("Cannot add \"ports disconnected\" listener to graph.");
+ status = bt_graph_add_filter_component_output_port_added_listener(
+ ctx->graph, graph_filter_output_port_added_listener, NULL, ctx,
+ NULL);
+ if (status != BT_GRAPH_STATUS_OK) {
+ BT_LOGE_STR("Cannot add \"port added\" listener to graph.");
goto error;
}
static
int set_stream_intersections(struct cmd_run_ctx *ctx,
struct bt_config_component *cfg_comp,
- struct bt_component_class *comp_cls)
+ const bt_component_class_source *src_comp_cls)
{
int ret = 0;
uint64_t trace_idx;
int64_t trace_count;
- enum bt_value_status value_status;
const char *path = NULL;
- struct bt_value *component_path_value = NULL;
- struct bt_value *query_params = NULL;
- struct bt_value *query_result = NULL;
- struct bt_value *trace_info = NULL;
- struct bt_value *intersection_range = NULL;
- struct bt_value *intersection_begin = NULL;
- struct bt_value *intersection_end = NULL;
- struct bt_value *stream_path_value = NULL;
- struct bt_value *stream_paths = NULL;
- struct bt_value *stream_infos = NULL;
- struct bt_value *stream_info = NULL;
+ const bt_value *query_result = NULL;
+ const bt_value *trace_info = NULL;
+ const bt_value *intersection_range = NULL;
+ const bt_value *intersection_begin = NULL;
+ const bt_value *intersection_end = NULL;
+ const bt_value *stream_path_value = NULL;
+ const bt_value *stream_paths = NULL;
+ const bt_value *stream_infos = NULL;
+ const bt_value *stream_info = NULL;
struct port_id *port_id = NULL;
struct trace_range *trace_range = NULL;
const char *fail_reason = NULL;
+ const bt_component_class *comp_cls =
+ bt_component_class_source_as_component_class_const(src_comp_cls);
- component_path_value = bt_value_map_get(cfg_comp->params, "path");
- if (!bt_value_is_string(component_path_value)) {
- BT_LOGD("Cannot get path parameter: component-name=%s",
- cfg_comp->instance_name->str);
- ret = -1;
- goto error;
- }
-
- value_status = bt_value_string_get(component_path_value, &path);
- if (value_status != BT_VALUE_STATUS_OK) {
- BT_LOGD("Cannot get path string value: component-name=%s",
- cfg_comp->instance_name->str);
- ret = -1;
- goto error;
- }
-
- query_params = bt_value_map_create();
- if (!query_params) {
- BT_LOGE_STR("Cannot create query parameters.");
- ret = -1;
- goto error;
- }
-
- value_status = bt_value_map_insert(query_params, "path", component_path_value);
- if (value_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Cannot insert path parameter in query paramater map.");
- ret = -1;
- goto error;
- }
-
- ret = query(comp_cls, "trace-info", query_params, &query_result,
+ ret = query(comp_cls, "trace-info",
+ cfg_comp->params, &query_result,
&fail_reason);
if (ret) {
BT_LOGD("Component class does not support the `trace-info` query: %s: "
goto error;
}
+ BT_ASSERT(query_result);
+
if (!bt_value_is_array(query_result)) {
BT_LOGD("Unexpected format of \'trace-info\' query result: "
"component-class-name=%s",
goto error;
}
- trace_count = bt_value_array_size(query_result);
+ trace_count = bt_value_array_get_size(query_result);
if (trace_count < 0) {
ret = -1;
goto error;
uint64_t stream_idx;
int64_t stream_count;
- trace_info = bt_value_array_get(query_result, trace_idx);
+ trace_info = bt_value_array_borrow_element_by_index_const(
+ query_result, trace_idx);
if (!trace_info || !bt_value_is_map(trace_info)) {
ret = -1;
BT_LOGD_STR("Cannot retrieve trace from query result.");
goto error;
}
- intersection_range = bt_value_map_get(trace_info,
- "intersection-range-ns");
+ intersection_range = bt_value_map_borrow_entry_value_const(
+ trace_info, "intersection-range-ns");
if (!intersection_range) {
ret = -1;
BT_LOGD_STR("Cannot retrieve \'intersetion-range-ns\' field from query result.");
goto error;
}
- intersection_begin = bt_value_map_get(intersection_range,
- "begin");
+ intersection_begin = bt_value_map_borrow_entry_value_const(intersection_range,
+ "begin");
if (!intersection_begin) {
ret = -1;
BT_LOGD_STR("Cannot retrieve intersection-range-ns \'begin\' field from query result.");
goto error;
}
- intersection_end = bt_value_map_get(intersection_range,
- "end");
+ intersection_end = bt_value_map_borrow_entry_value_const(intersection_range,
+ "end");
if (!intersection_end) {
ret = -1;
BT_LOGD_STR("Cannot retrieve intersection-range-ns \'end\' field from query result.");
goto error;
}
- value_status = bt_value_integer_get(intersection_begin, &begin);
- if (value_status != BT_VALUE_STATUS_OK) {
- ret = -1;
- BT_LOGD_STR("Cannot retrieve value of intersection-range-ns \'begin\' field from query result.");
- goto error;
- }
-
- value_status = bt_value_integer_get(intersection_end, &end);
- if (value_status != BT_VALUE_STATUS_OK) {
- ret = -1;
- BT_LOGD_STR("Cannot retrieve value of intersection-range-ns \'end\' field from query result.");
- goto error;
- }
+ begin = bt_value_signed_integer_get(intersection_begin);
+ end = bt_value_signed_integer_get(intersection_end);
if (begin < 0 || end < 0 || end < begin) {
BT_LOGW("Invalid trace stream intersection values: "
goto error;
}
- stream_infos = bt_value_map_get(trace_info, "streams");
+ stream_infos = bt_value_map_borrow_entry_value_const(trace_info,
+ "streams");
if (!stream_infos || !bt_value_is_array(stream_infos)) {
ret = -1;
- BT_LOGD_STR("Cannot retrieve stream informations from trace in query result.");
+ BT_LOGD_STR("Cannot retrieve stream information from trace in query result.");
goto error;
}
- stream_count = bt_value_array_size(stream_infos);
+ stream_count = bt_value_array_get_size(stream_infos);
if (stream_count < 0) {
ret = -1;
goto error;
trace_range->intersection_range_begin_ns = begin;
trace_range->intersection_range_end_ns = end;
- stream_info = bt_value_array_get(stream_infos,
- stream_idx);
+ stream_info = bt_value_array_borrow_element_by_index_const(
+ stream_infos, stream_idx);
if (!stream_info || !bt_value_is_map(stream_info)) {
ret = -1;
BT_LOGD_STR("Cannot retrieve stream informations from trace in query result.");
goto error;
}
- stream_paths = bt_value_map_get(stream_info, "paths");
+ stream_paths = bt_value_map_borrow_entry_value_const(stream_info,
+ "paths");
if (!stream_paths || !bt_value_is_array(stream_paths)) {
ret = -1;
BT_LOGD_STR("Cannot retrieve stream paths from trace in query result.");
goto error;
}
- stream_path_value = bt_value_array_get(stream_paths, 0);
+ stream_path_value =
+ bt_value_array_borrow_element_by_index_const(
+ stream_paths, 0);
if (!stream_path_value ||
!bt_value_is_string(stream_path_value)) {
ret = -1;
goto error;
}
- value_status = bt_value_string_get(stream_path_value,
- &stream_path);
- if (value_status != BT_VALUE_STATUS_OK) {
- ret = -1;
- goto error;
- }
-
+ stream_path = bt_value_string_get(stream_path_value);
port_id->port_name = strdup(stream_path);
if (!port_id->port_name) {
ret = -1;
port_id = NULL;
trace_range = NULL;
- BT_PUT(stream_info);
- BT_PUT(stream_paths);
- BT_PUT(stream_path_value);
}
-
- BT_PUT(trace_info);
- BT_PUT(stream_paths);
- BT_PUT(stream_path_value);
- BT_PUT(intersection_range);
- BT_PUT(intersection_begin);
- BT_PUT(intersection_end);
- BT_PUT(stream_paths);
- BT_PUT(stream_path_value);
}
goto end;
path ? path : "(unknown)",
bt_common_color_reset());
end:
- bt_put(component_path_value);
- bt_put(query_params);
- bt_put(query_result);
- bt_put(trace_info);
- bt_put(intersection_range);
- bt_put(intersection_begin);
- bt_put(intersection_end);
- bt_put(stream_infos);
- bt_put(stream_info);
- bt_put(stream_paths);
- bt_put(stream_path_value);
+ bt_value_put_ref(query_result);
g_free(port_id);
g_free(trace_range);
return ret;
struct cmd_run_ctx *ctx, GPtrArray *cfg_components)
{
size_t i;
- struct bt_component_class *comp_cls = NULL;
- struct bt_component *comp = NULL;
+ const void *comp_cls = NULL;
+ const void *comp = NULL;
int ret = 0;
for (i = 0; i < cfg_components->len; i++) {
g_ptr_array_index(cfg_components, i);
GQuark quark;
- comp_cls = find_component_class(cfg_comp->plugin_name->str,
- cfg_comp->comp_cls_name->str, cfg_comp->type);
+ switch (cfg_comp->type) {
+ case BT_COMPONENT_CLASS_TYPE_SOURCE:
+ comp_cls = find_source_component_class(
+ cfg_comp->plugin_name->str,
+ cfg_comp->comp_cls_name->str);
+ break;
+ case BT_COMPONENT_CLASS_TYPE_FILTER:
+ comp_cls = find_filter_component_class(
+ cfg_comp->plugin_name->str,
+ cfg_comp->comp_cls_name->str);
+ break;
+ case BT_COMPONENT_CLASS_TYPE_SINK:
+ comp_cls = find_sink_component_class(
+ cfg_comp->plugin_name->str,
+ cfg_comp->comp_cls_name->str);
+ break;
+ default:
+ abort();
+ }
+
if (!comp_cls) {
BT_LOGE("Cannot find component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d",
goto error;
}
- ret = bt_graph_add_component(ctx->graph, comp_cls,
- cfg_comp->instance_name->str, cfg_comp->params, &comp);
+ switch (cfg_comp->type) {
+ case BT_COMPONENT_CLASS_TYPE_SOURCE:
+ ret = bt_graph_add_source_component(ctx->graph,
+ comp_cls, cfg_comp->instance_name->str,
+ cfg_comp->params,
+ (void *) &comp);
+ break;
+ case BT_COMPONENT_CLASS_TYPE_FILTER:
+ ret = bt_graph_add_filter_component(ctx->graph,
+ comp_cls, cfg_comp->instance_name->str,
+ cfg_comp->params,
+ (void *) &comp);
+ break;
+ case BT_COMPONENT_CLASS_TYPE_SINK:
+ ret = bt_graph_add_sink_component(ctx->graph,
+ comp_cls, cfg_comp->instance_name->str,
+ cfg_comp->params,
+ (void *) &comp);
+ break;
+ default:
+ abort();
+ }
+
if (ret) {
BT_LOGE("Cannot create component: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d, "
BT_LOGI("Created and inserted component: comp-addr=%p, comp-name=\"%s\"",
comp, cfg_comp->instance_name->str);
quark = g_quark_from_string(cfg_comp->instance_name->str);
- assert(quark > 0);
- g_hash_table_insert(ctx->components,
- GUINT_TO_POINTER(quark), comp);
+ BT_ASSERT(quark > 0);
+
+ switch (cfg_comp->type) {
+ case BT_COMPONENT_CLASS_TYPE_SOURCE:
+ g_hash_table_insert(ctx->src_components,
+ GUINT_TO_POINTER(quark), (void *) comp);
+ break;
+ case BT_COMPONENT_CLASS_TYPE_FILTER:
+ g_hash_table_insert(ctx->flt_components,
+ GUINT_TO_POINTER(quark), (void *) comp);
+ break;
+ case BT_COMPONENT_CLASS_TYPE_SINK:
+ g_hash_table_insert(ctx->sink_components,
+ GUINT_TO_POINTER(quark), (void *) comp);
+ break;
+ default:
+ abort();
+ }
+
comp = NULL;
- BT_PUT(comp_cls);
+ BT_OBJECT_PUT_REF_AND_RESET(comp_cls);
}
goto end;
ret = -1;
end:
- bt_put(comp);
- bt_put(comp_cls);
+ bt_object_put_ref(comp);
+ bt_object_put_ref(comp_cls);
return ret;
}
return ret;
}
+typedef uint64_t (*output_port_count_func_t)(const void *);
+typedef const bt_port_output *(*borrow_output_port_by_index_func_t)(
+ const void *, uint64_t);
+
static
int cmd_run_ctx_connect_comp_ports(struct cmd_run_ctx *ctx,
- struct bt_component *comp,
- int64_t (*port_count_fn)(struct bt_component *),
- struct bt_port *(*port_by_index_fn)(struct bt_component *, uint64_t))
+ void *comp, output_port_count_func_t port_count_fn,
+ borrow_output_port_by_index_func_t port_by_index_fn)
{
int ret = 0;
- int64_t count;
+ uint64_t count;
uint64_t i;
count = port_count_fn(comp);
- assert(count >= 0);
for (i = 0; i < count; i++) {
- struct bt_port *upstream_port = port_by_index_fn(comp, i);
+ const bt_port_output *upstream_port = port_by_index_fn(comp, i);
- assert(upstream_port);
+ BT_ASSERT(upstream_port);
ret = cmd_run_ctx_connect_upstream_port(ctx, upstream_port);
- bt_put(upstream_port);
if (ret) {
goto end;
}
gpointer g_name_quark, g_comp;
ctx->connect_ports = true;
- g_hash_table_iter_init(&iter, ctx->components);
+ g_hash_table_iter_init(&iter, ctx->src_components);
while (g_hash_table_iter_next(&iter, &g_name_quark, &g_comp)) {
- int64_t (*port_count_fn)(struct bt_component *);
- struct bt_port *(*port_by_index_fn)(struct bt_component *, uint64_t);
-
- if (bt_component_is_source(g_comp)) {
- port_count_fn =
- bt_component_source_get_output_port_count;
- port_by_index_fn =
- bt_component_source_get_output_port_by_index;
- } else if (bt_component_is_filter(g_comp)) {
- port_count_fn =
- bt_component_filter_get_output_port_count;
- port_by_index_fn =
- bt_component_filter_get_output_port_by_index;
- } else {
- continue;
+ ret = cmd_run_ctx_connect_comp_ports(ctx, g_comp,
+ (output_port_count_func_t)
+ bt_component_source_get_output_port_count,
+ (borrow_output_port_by_index_func_t)
+ bt_component_source_borrow_output_port_by_index_const);
+ if (ret) {
+ goto end;
}
+ }
+
+ g_hash_table_iter_init(&iter, ctx->flt_components);
- ret = cmd_run_ctx_connect_comp_ports(ctx,
- g_comp, port_count_fn, port_by_index_fn);
+ while (g_hash_table_iter_next(&iter, &g_name_quark, &g_comp)) {
+ ret = cmd_run_ctx_connect_comp_ports(ctx, g_comp,
+ (output_port_count_func_t)
+ bt_component_filter_get_output_port_count,
+ (borrow_output_port_by_index_func_t)
+ bt_component_filter_borrow_output_port_by_index_const);
if (ret) {
goto end;
}
}
static inline
-const char *bt_graph_status_str(enum bt_graph_status status)
+const char *bt_graph_status_str(bt_graph_status status)
{
switch (status) {
- case BT_GRAPH_STATUS_CANCELED:
- return "BT_GRAPH_STATUS_CANCELED";
- case BT_GRAPH_STATUS_AGAIN:
- return "BT_GRAPH_STATUS_AGAIN";
- case BT_GRAPH_STATUS_END:
- return "BT_GRAPH_STATUS_END";
case BT_GRAPH_STATUS_OK:
return "BT_GRAPH_STATUS_OK";
- case BT_GRAPH_STATUS_INVALID:
- return "BT_GRAPH_STATUS_INVALID";
- case BT_GRAPH_STATUS_NO_SINK:
- return "BT_GRAPH_STATUS_NO_SINK";
+ case BT_GRAPH_STATUS_END:
+ return "BT_GRAPH_STATUS_END";
+ case BT_GRAPH_STATUS_AGAIN:
+ return "BT_GRAPH_STATUS_AGAIN";
+ case BT_GRAPH_STATUS_COMPONENT_REFUSES_PORT_CONNECTION:
+ return "BT_GRAPH_STATUS_COMPONENT_REFUSES_PORT_CONNECTION";
+ case BT_GRAPH_STATUS_CANCELED:
+ return "BT_GRAPH_STATUS_CANCELED";
case BT_GRAPH_STATUS_ERROR:
return "BT_GRAPH_STATUS_ERROR";
+ case BT_GRAPH_STATUS_NO_SINK:
+ return "BT_GRAPH_STATUS_NO_SINK";
+ case BT_GRAPH_STATUS_NOMEM:
+ return "BT_GRAPH_STATUS_NOMEM";
default:
return "(unknown)";
}
/* Run the graph */
while (true) {
- enum bt_graph_status graph_status = bt_graph_run(ctx.graph);
+ bt_graph_status graph_status = bt_graph_run(ctx.graph);
/*
* Reset console in case something messed with console
}
}
break;
- case BT_COMPONENT_STATUS_END:
+ case BT_GRAPH_STATUS_END:
goto end;
default:
BT_LOGE_STR("Graph failed to complete successfully");
retcode = ret ? 1 : 0;
end:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
fini_static_data();
return retcode;
}
projects / babeltrace.git / blobdiff