/*
- * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
- *
- * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
*/
#define BT_LOG_TAG "CLI"
#include <babeltrace2/babeltrace.h>
#include "common/common.h"
+#include "string-format/format-error.h"
+#include "string-format/format-plugin-comp-cls-name.h"
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#define ENV_BABELTRACE_WARN_COMMAND_NAME_DIRECTORY_CLASH "BABELTRACE_CLI_WARN_COMMAND_NAME_DIRECTORY_CLASH"
#define NSEC_PER_SEC 1000000000LL
+enum bt_cmd_status {
+ BT_CMD_STATUS_OK = 0,
+ BT_CMD_STATUS_ERROR = -1,
+ BT_CMD_STATUS_INTERRUPTED = -2,
+};
+
+static
+const char *bt_cmd_status_string(enum bt_cmd_status cmd_status)
+{
+ switch (cmd_status) {
+ case BT_CMD_STATUS_OK:
+ return "OK";
+ case BT_CMD_STATUS_ERROR:
+ return "ERROR";
+ case BT_CMD_STATUS_INTERRUPTED:
+ return "INTERRUPTED";
+ default:
+ bt_common_abort();
+ }
+}
+
/* Application's interrupter (owned by this) */
static bt_interrupter *the_interrupter;
BT_LOGI("Finding component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\"", plugin_name, comp_class_name);
- plugin = find_loaded_plugin(plugin_name);
+ plugin = borrow_loaded_plugin_by_name(plugin_name);
if (!plugin) {
goto end;
}
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 (comp_class) {
comp_cls = bt_component_class_sink_as_component_class_const(find_sink_component_class(plugin_name, comp_class_name));
break;
default:
- abort();
+ bt_common_abort();
}
return comp_cls;
}
}
-static
-const char *component_type_str(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";
- default:
- return "(unknown)";
- }
-}
-
-static
-void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
- const char *comp_cls_name, bt_component_class_type type)
-{
- GString *shell_plugin_name = NULL;
- GString *shell_comp_cls_name = NULL;
-
- if (plugin_name) {
- shell_plugin_name = bt_common_shell_quote(plugin_name, false);
- if (!shell_plugin_name) {
- goto end;
- }
- }
-
- shell_comp_cls_name = bt_common_shell_quote(comp_cls_name, false);
- if (!shell_comp_cls_name) {
- goto end;
- }
-
- fprintf(fh, "'%s%s%s%s",
- bt_common_color_bold(),
- bt_common_color_fg_cyan(),
- component_type_str(type),
- bt_common_color_fg_default());
-
- if (shell_plugin_name) {
- fprintf(fh, ".%s%s%s",
- bt_common_color_fg_blue(),
- shell_plugin_name->str,
- bt_common_color_fg_default());
- }
-
- fprintf(fh, ".%s%s%s'",
- bt_common_color_fg_yellow(),
- shell_comp_cls_name->str,
- bt_common_color_reset());
-
-end:
- if (shell_plugin_name) {
- g_string_free(shell_plugin_name, TRUE);
- }
-
- if (shell_comp_cls_name) {
- g_string_free(shell_comp_cls_name, TRUE);
- }
-}
-
static
void print_value(FILE *, const bt_value *, size_t);
static
void print_value_rec(FILE *, const bt_value *, size_t);
-struct print_map_value_data {
- size_t indent;
- FILE *fp;
-};
-
static
-bt_bool print_map_value(const char *key, const bt_value *object,
- void *data)
+void print_map_value(const char *key, const bt_value *object, FILE *fp,
+ size_t indent)
{
- 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);
+ print_indent(fp, indent);
+ fprintf(fp, "%s: ", key);
BT_ASSERT(object);
if (bt_value_is_array(object) &&
bt_value_array_is_empty(object)) {
- fprintf(print_map_value_data->fp, "[ ]\n");
- return true;
+ fprintf(fp, "[ ]\n");
+ goto end;
}
if (bt_value_is_map(object) &&
bt_value_map_is_empty(object)) {
- fprintf(print_map_value_data->fp, "{ }\n");
- return true;
+ fprintf(fp, "{ }\n");
+ goto end;
}
if (bt_value_is_array(object) ||
bt_value_is_map(object)) {
- fprintf(print_map_value_data->fp, "\n");
+ fprintf(fp, "\n");
}
- print_value_rec(print_map_value_data->fp, object,
- print_map_value_data->indent + 2);
- return BT_TRUE;
+ print_value_rec(fp, object, indent + 2);
+
+end:
+ return;
+}
+
+static
+bt_value_map_foreach_entry_const_func_status collect_map_keys(
+ const char *key, const bt_value *object, void *data)
+{
+ GPtrArray *map_keys = data;
+
+ g_ptr_array_add(map_keys, (gpointer *) key);
+
+ return BT_VALUE_MAP_FOREACH_ENTRY_CONST_FUNC_STATUS_OK;
+}
+
+static
+gint g_ptr_array_sort_strings(gconstpointer a, gconstpointer b) {
+ const char *s1 = *((const char **) a);
+ const char *s2 = *((const char **) b);
+
+ return g_strcmp0(s1, s2);
}
static
uint64_t uint_val;
double dbl_val;
const char *str_val;
- int size;
- int i;
+ GPtrArray *map_keys = NULL;
- if (!value) {
- return;
- }
+ BT_ASSERT(value);
switch (bt_value_get_type(value)) {
case BT_VALUE_TYPE_NULL:
case BT_VALUE_TYPE_BOOL:
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_fg_bright_cyan(), bool_val ? "yes" : "no",
bt_common_color_reset());
break;
case BT_VALUE_TYPE_UNSIGNED_INTEGER:
uint_val = bt_value_integer_unsigned_get(value);
fprintf(fp, "%s%s%" PRIu64 "%s\n", bt_common_color_bold(),
- bt_common_color_fg_red(), uint_val,
+ bt_common_color_fg_bright_red(), uint_val,
bt_common_color_reset());
break;
case BT_VALUE_TYPE_SIGNED_INTEGER:
int_val = bt_value_integer_signed_get(value);
fprintf(fp, "%s%s%" PRId64 "%s\n", bt_common_color_bold(),
- bt_common_color_fg_red(), int_val,
+ bt_common_color_fg_bright_red(), int_val,
bt_common_color_reset());
break;
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_fg_bright_red(), dbl_val,
bt_common_color_reset());
break;
case BT_VALUE_TYPE_STRING:
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_fg_bright_green(), str_val,
bt_common_color_reset());
break;
case BT_VALUE_TYPE_ARRAY:
+ {
+ uint64_t i, size;
size = bt_value_array_get_length(value);
- if (size < 0) {
- goto error;
- }
-
if (size == 0) {
print_indent(fp, indent);
fprintf(fp, "[ ]\n");
bt_value_array_borrow_element_by_index_const(
value, i);
- if (!element) {
- goto error;
- }
print_indent(fp, indent);
fprintf(fp, "- ");
print_value_rec(fp, element, indent + 2);
}
break;
+ }
case BT_VALUE_TYPE_MAP:
{
- struct print_map_value_data data = {
- .indent = indent,
- .fp = fp,
- };
+ guint i;
+ bt_value_map_foreach_entry_const_status foreach_status;
if (bt_value_map_is_empty(value)) {
print_indent(fp, indent);
break;
}
- bt_value_map_foreach_entry_const(value, print_map_value, &data);
+ map_keys = g_ptr_array_new();
+ if (!map_keys) {
+ BT_CLI_LOGE_APPEND_CAUSE("Failed to allocated on GPtrArray.");
+ goto end;
+ }
+
+ /*
+ * We want to print the map entries in a stable order. Collect
+ * all the map's keys in a GPtrArray, sort it, then print the
+ * entries in that order.
+ */
+ foreach_status = bt_value_map_foreach_entry_const(value,
+ collect_map_keys, map_keys);
+ if (foreach_status != BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_OK) {
+ BT_CLI_LOGE_APPEND_CAUSE("Failed to iterator on map value.");
+ goto end;
+ }
+
+ g_ptr_array_sort(map_keys, g_ptr_array_sort_strings);
+
+ for (i = 0; i < map_keys->len; i++) {
+ const char *map_key = g_ptr_array_index(map_keys, i);
+ const bt_value *map_value;
+
+ map_value = bt_value_map_borrow_entry_value_const(value, map_key);
+ BT_ASSERT(map_value);
+
+ print_map_value(map_key, map_value, fp, indent);
+ }
+
break;
}
default:
- abort();
+ bt_common_abort();
}
- return;
-error:
- BT_LOGE("Error printing value of type %s.",
- bt_common_value_type_string(bt_value_get_type(value)));
+ goto end;
+
+end:
+ if (map_keys) {
+ g_ptr_array_free(map_keys, TRUE);
+ }
}
static
static
void print_bt_config_component(struct bt_config_component *bt_config_component)
{
- fprintf(stderr, " ");
- print_plugin_comp_cls_opt(stderr, bt_config_component->plugin_name->str,
+ gchar *comp_cls_str;
+
+ comp_cls_str = format_plugin_comp_cls_opt(
+ bt_config_component->plugin_name->str,
bt_config_component->comp_cls_name->str,
- bt_config_component->type);
- fprintf(stderr, ":\n");
+ bt_config_component->type,
+ BT_COMMON_COLOR_WHEN_AUTO);
+ BT_ASSERT(comp_cls_str);
+
+ fprintf(stderr, " %s:\n", comp_cls_str);
if (bt_config_component->instance_name->len > 0) {
fprintf(stderr, " Name: %s\n",
fprintf(stderr, " Parameters:\n");
print_value(stderr, bt_config_component->params, 8);
+
+ g_free(comp_cls_str);
}
static
print_cfg_print_lttng_live_sessions(cfg);
break;
default:
- abort();
+ bt_common_abort();
}
}
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,
+ bt_common_color_fg_bright_blue(), plugin_name,
bt_common_color_reset());
if (path) {
printf(" %sPath%s: %s\n", bt_common_color_bold(),
}
static
-int cmd_query(struct bt_config *cfg)
+enum bt_cmd_status cmd_query(struct bt_config *cfg)
{
int ret = 0;
+ enum bt_cmd_status cmd_status;
const bt_component_class *comp_cls = NULL;
const bt_value *results = NULL;
const char *fail_reason = NULL;
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);
- ret = -1;
- goto end;
+ goto error;
}
ret = query(cfg, comp_cls, cfg->cmd_data.query.object->str,
cfg->cmd_data.query.cfg_component->params,
&results, &fail_reason);
if (ret) {
- goto failed;
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Failed to query component class: %s: plugin-name=\"%s\", "
+ "comp-cls-name=\"%s\", comp-cls-type=%d "
+ "object=\"%s\"", fail_reason,
+ 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,
+ cfg->cmd_data.query.object->str);
+ goto error;
}
print_value(stdout, results, 0);
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
-failed:
- BT_CLI_LOGE_APPEND_CAUSE(
- "Failed to query component class: %s: plugin-name=\"%s\", "
- "comp-cls-name=\"%s\", comp-cls-type=%d "
- "object=\"%s\"", fail_reason,
- 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,
- cfg->cmd_data.query.object->str);
- ret = -1;
+error:
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
bt_component_class_put_ref(comp_cls);
bt_value_put_ref(results);
- return ret;
+ return cmd_status;
}
static
bt_component_class_get_help(comp_cls);
bt_component_class_type type =
bt_component_class_get_type(comp_cls);
+ gchar *comp_cls_str;
- print_plugin_comp_cls_opt(stdout, plugin_name, comp_class_name, type);
- printf("\n");
+ comp_cls_str = format_plugin_comp_cls_opt(plugin_name, comp_class_name,
+ type, BT_COMMON_COLOR_WHEN_AUTO);
+ BT_ASSERT(comp_cls_str);
+
+ printf("%s\n", comp_cls_str);
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);
}
+
+ g_free(comp_cls_str);
}
static
-int cmd_help(struct bt_config *cfg)
+enum bt_cmd_status cmd_help(struct bt_config *cfg)
{
- int ret = 0;
+ enum bt_cmd_status cmd_status;
const bt_plugin *plugin = NULL;
const bt_component_class *needed_comp_cls = NULL;
- plugin = find_loaded_plugin(cfg->cmd_data.help.cfg_component->plugin_name->str);
+ plugin = borrow_loaded_plugin_by_name(cfg->cmd_data.help.cfg_component->plugin_name->str);
if (!plugin) {
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot find plugin: plugin-name=\"%s\"",
cfg->cmd_data.help.cfg_component->plugin_name->str);
- ret = -1;
- goto end;
+ goto error;
}
print_plugin_info(plugin);
if (strlen(cfg->cmd_data.help.cfg_component->comp_cls_name->str) == 0) {
/* Plugin help only */
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
}
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);
- ret = -1;
- goto end;
+ goto error;
}
printf("\n");
print_component_class_help(
cfg->cmd_data.help.cfg_component->plugin_name->str,
needed_comp_cls);
+ cmd_status = BT_CMD_STATUS_OK;
+ goto end;
+
+error:
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
bt_component_class_put_ref(needed_comp_cls);
- bt_plugin_put_ref(plugin);
- return ret;
+ return cmd_status;
}
typedef void *(* plugin_borrow_comp_cls_by_index_func_t)(const bt_plugin *,
typedef const bt_component_class *(* spec_comp_cls_borrow_comp_cls_func_t)(
void *);
+static
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;
+ gchar *comp_cls_str = NULL;
if (count == 0) {
printf(" %s%s component classes%s: (none)\n",
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);
+ g_free(comp_cls_str);
+ comp_cls_str = format_plugin_comp_cls_opt(
+ bt_plugin_get_name(plugin), comp_class_name, type,
+ BT_COMMON_COLOR_WHEN_AUTO);
+ printf(" %s", comp_cls_str);
if (comp_class_description) {
printf(": %s", comp_class_description);
}
end:
- return;
+ g_free(comp_cls_str);
}
static
-int cmd_list_plugins(struct bt_config *cfg)
+enum bt_cmd_status cmd_list_plugins(struct bt_config *cfg)
{
- int ret = 0;
int plugins_count, component_classes_count = 0, i;
printf("From the following plugin paths:\n\n");
}
for (i = 0; i < plugins_count; i++) {
- const bt_plugin *plugin = borrow_loaded_plugin(i);
+ const bt_plugin *plugin = borrow_loaded_plugin_by_index(i);
component_classes_count +=
bt_plugin_get_source_component_class_count(plugin) +
bt_common_color_reset());
for (i = 0; i < plugins_count; i++) {
- const bt_plugin *plugin = borrow_loaded_plugin(i);
+ const bt_plugin *plugin = borrow_loaded_plugin_by_index(i);
printf("\n");
print_plugin_info(plugin);
}
end:
- return ret;
+ return BT_CMD_STATUS_OK;
}
static
-int cmd_print_lttng_live_sessions(struct bt_config *cfg)
+enum bt_cmd_status cmd_print_lttng_live_sessions(struct bt_config *cfg)
{
int ret = 0;
+ enum bt_cmd_status cmd_status;
const bt_component_class *comp_cls = NULL;
const bt_value *results = NULL;
bt_value *params = NULL;
static const char * const comp_cls_name = "lttng-live";
static const bt_component_class_type comp_cls_type =
BT_COMPONENT_CLASS_TYPE_SOURCE;
- int64_t array_size, i;
+ uint64_t array_size, i;
const char *fail_reason = NULL;
FILE *out_stream = stdout;
ret = query(cfg, comp_cls, "sessions", params,
&results, &fail_reason);
if (ret) {
- goto failed;
+ BT_CLI_LOGE_APPEND_CAUSE("Failed to query `sessions` object: %s",
+ fail_reason);
+ goto error;
}
BT_ASSERT(results);
fopen(cfg->cmd_data.print_lttng_live_sessions.output_path->str,
"w");
if (!out_stream) {
- ret = -1;
BT_LOGE_ERRNO("Cannot open file for writing",
": path=\"%s\"",
cfg->cmd_data.print_lttng_live_sessions.output_path->str);
"Babeltrace CLI",
"Cannot open file for writing: path=\"%s\"",
cfg->cmd_data.print_lttng_live_sessions.output_path->str);
- goto end;
+ goto error;
}
}
int64_t timer_us, streams, clients;
map = bt_value_array_borrow_element_by_index_const(results, i);
- if (!map) {
- BT_CLI_LOGE_APPEND_CAUSE("Unexpected empty array entry.");
- goto error;
- }
if (!bt_value_is_map(map)) {
BT_CLI_LOGE_APPEND_CAUSE("Unexpected entry type.");
goto error;
BT_CLI_LOGE_APPEND_CAUSE("Missing `timer-us` entry.");
goto error;
}
- timer_us = bt_value_integer_signed_get(v);
+ timer_us = bt_value_integer_unsigned_get(v);
fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us);
v = bt_value_map_borrow_entry_value_const(map, "stream-count");
if (!v) {
"Missing `stream-count` entry.");
goto error;
}
- streams = bt_value_integer_signed_get(v);
+ streams = bt_value_integer_unsigned_get(v);
fprintf(out_stream, "%" PRIu64 " stream(s), ", streams);
v = bt_value_map_borrow_entry_value_const(map, "client-count");
if (!v) {
"Missing `client-count` entry.");
goto error;
}
- clients = bt_value_integer_signed_get(v);
+ clients = bt_value_integer_unsigned_get(v);
fprintf(out_stream, "%" PRIu64 " client(s) connected)\n", clients);
}
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
-failed:
- BT_CLI_LOGE_APPEND_CAUSE("Failed to query `sessions` object: %s",
- fail_reason);
-
error:
- ret = -1;
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
bt_value_put_ref(results);
}
}
- return ret;
+ return cmd_status;
}
static
-int cmd_print_ctf_metadata(struct bt_config *cfg)
+enum bt_cmd_status cmd_print_ctf_metadata(struct bt_config *cfg)
{
int ret = 0;
+ enum bt_cmd_status cmd_status;
const bt_component_class *comp_cls = NULL;
const bt_value *results = NULL;
bt_value *params = NULL;
"comp-cls-name=\"%s\", comp-cls-type=%d",
plugin_name, comp_cls_name,
BT_COMPONENT_CLASS_TYPE_SOURCE);
- ret = -1;
- goto end;
+ goto error;
}
params = bt_value_map_create();
if (!params) {
- ret = -1;
- goto end;
+ goto error;
}
ret = bt_value_map_insert_string_entry(params, "path",
cfg->cmd_data.print_ctf_metadata.path->str);
if (ret) {
- ret = -1;
- goto end;
+ goto error;
}
ret = query(cfg, comp_cls, "metadata-info",
params, &results, &fail_reason);
if (ret) {
- goto failed;
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Failed to query `metadata-info` object: %s", fail_reason);
+ goto error;
}
metadata_text_value = bt_value_map_borrow_entry_value_const(results,
if (!metadata_text_value) {
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot find `text` string value in the resulting metadata info object.");
- ret = -1;
- goto end;
+ goto error;
}
metadata_text = bt_value_string_get(metadata_text_value);
"Babeltrace CLI",
"Cannot open file for writing: path=\"%s\"",
cfg->cmd_data.print_ctf_metadata.output_path->str);
- ret = -1;
- goto end;
+ goto error;
}
}
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot write whole metadata text to output stream: "
"ret=%d", ret);
- goto end;
+ goto error;
}
- ret = 0;
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
-failed:
- ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE(
- "Failed to query `metadata-info` object: %s", fail_reason);
+error:
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
bt_value_put_ref(results);
}
}
- return ret;
+ return cmd_status;
}
struct port_id {
ctx->graph, trimmer_class, trimmer_name,
trimmer_params, ctx->cfg->log_level,
&trimmer);
+ bt_component_filter_get_ref(trimmer);
free(trimmer_name);
if (add_comp_status !=
BT_GRAPH_ADD_COMPONENT_STATUS_OK) {
bt_graph_add_interrupter(ctx->graph, the_interrupter);
add_listener_status = bt_graph_add_source_component_output_port_added_listener(
- ctx->graph, graph_source_output_port_added_listener, NULL, ctx,
+ ctx->graph, graph_source_output_port_added_listener, ctx,
NULL);
if (add_listener_status != BT_GRAPH_ADD_LISTENER_STATUS_OK) {
BT_CLI_LOGE_APPEND_CAUSE(
}
add_listener_status = bt_graph_add_filter_component_output_port_added_listener(
- ctx->graph, graph_filter_output_port_added_listener, NULL, ctx,
+ ctx->graph, graph_filter_output_port_added_listener, ctx,
NULL);
if (add_listener_status != BT_GRAPH_ADD_LISTENER_STATUS_OK) {
BT_CLI_LOGE_APPEND_CAUSE(
return ret;
}
+/*
+ * Compute the intersection of all streams in the array `streams`, write it
+ * in `range`.
+ */
+
+static
+int compute_stream_intersection(const bt_value *streams,
+ struct trace_range *range)
+{
+ uint64_t i, stream_count;
+ int ret;
+
+ BT_ASSERT(bt_value_get_type(streams) == BT_VALUE_TYPE_ARRAY);
+
+ stream_count = bt_value_array_get_length(streams);
+
+ BT_ASSERT(stream_count > 0);
+
+ range->intersection_range_begin_ns = 0;
+ range->intersection_range_end_ns = UINT64_MAX;
+
+ for (i = 0; i < stream_count; i++) {
+ int64_t begin_ns, end_ns;
+ uint64_t begin_ns_u, end_ns_u;
+ const bt_value *stream_value;
+ const bt_value *range_ns_value;
+ const bt_value *begin_value;
+ const bt_value *end_value;
+
+ stream_value = bt_value_array_borrow_element_by_index_const(streams, i);
+ if (bt_value_get_type(stream_value) != BT_VALUE_TYPE_MAP) {
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
+ "expected streams array element to be a map, got %s.",
+ bt_common_value_type_string(bt_value_get_type(stream_value)));
+ goto error;
+ }
+
+ range_ns_value = bt_value_map_borrow_entry_value_const(
+ stream_value, "range-ns");
+ if (!range_ns_value) {
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
+ "missing expected `range-ns` key in stream map.");
+ goto error;
+ }
+
+ if (bt_value_get_type(range_ns_value) != BT_VALUE_TYPE_MAP) {
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
+ "expected `range-ns` entry value of stream map to be a map, got %s.",
+ bt_common_value_type_string(bt_value_get_type(range_ns_value)));
+ goto error;
+ }
+
+ begin_value = bt_value_map_borrow_entry_value_const(range_ns_value, "begin");
+ if (!begin_value) {
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
+ "missing expected `begin` key in range-ns map.");
+ goto error;
+ }
+
+ if (bt_value_get_type(begin_value) != BT_VALUE_TYPE_SIGNED_INTEGER) {
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
+ "expected `begin` entry value of range-ns map to be a signed integer, got %s.",
+ bt_common_value_type_string(bt_value_get_type(range_ns_value)));
+ goto error;
+ }
+
+ end_value = bt_value_map_borrow_entry_value_const(range_ns_value, "end");
+ if (!end_value) {
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
+ "missing expected `end` key in range-ns map.");
+ goto error;
+ }
+
+ if (bt_value_get_type(end_value) != BT_VALUE_TYPE_SIGNED_INTEGER) {
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
+ "expected `end` entry value of range-ns map to be a signed integer, got %s.",
+ bt_common_value_type_string(bt_value_get_type(range_ns_value)));
+ goto error;
+ }
+
+ begin_ns = bt_value_integer_signed_get(begin_value);
+ end_ns = bt_value_integer_signed_get(end_value);
+
+ if (begin_ns < 0 || end_ns < 0 || end_ns < begin_ns) {
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Invalid stream range values: "
+ "range-ns:begin=%" PRId64 ", "
+ "range-ns:end=%" PRId64,
+ begin_ns, end_ns);
+ goto error;
+ }
+
+ begin_ns_u = begin_ns;
+ end_ns_u = end_ns;
+
+ range->intersection_range_begin_ns =
+ MAX(range->intersection_range_begin_ns, begin_ns_u);
+ range->intersection_range_end_ns =
+ MIN(range->intersection_range_end_ns, end_ns_u);
+ }
+
+ ret = 0;
+ goto end;
+error:
+ ret = -1;
+
+end:
+ return ret;
+}
+
static
int set_stream_intersections(struct cmd_run_ctx *ctx,
struct bt_config_component *cfg_comp,
{
int ret = 0;
uint64_t trace_idx;
- int64_t trace_count;
- const char *path = NULL;
+ uint64_t trace_count;
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_infos = NULL;
const bt_value *stream_info = NULL;
struct port_id *port_id = NULL;
- struct trace_range *trace_range = NULL;
+ struct trace_range *stream_intersection = NULL;
const char *fail_reason = NULL;
const bt_component_class *comp_cls =
bt_component_class_source_as_component_class_const(src_comp_cls);
- ret = query(ctx->cfg, comp_cls, "babeltrace.trace-info",
+ ret = query(ctx->cfg, comp_cls, "babeltrace.trace-infos",
cfg_comp->params, &query_result,
&fail_reason);
if (ret) {
- BT_LOGD("Component class does not support the `babeltrace.trace-info` query: %s: "
+ BT_CLI_LOGE_APPEND_CAUSE("Failed to execute `babeltrace.trace-infos` query: %s: "
"comp-class-name=\"%s\"", fail_reason,
bt_component_class_get_name(comp_cls));
ret = -1;
- goto error;
+ goto end;
}
BT_ASSERT(query_result);
if (!bt_value_is_array(query_result)) {
- BT_LOGD("Unexpected format of `babeltrace.trace-info` query result: "
- "component-class-name=%s",
- bt_component_class_get_name(comp_cls));
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: expecting result to be an array: "
+ "component-class-name=%s, actual-type=%s",
+ bt_component_class_get_name(comp_cls),
+ bt_common_value_type_string(bt_value_get_type(query_result)));
ret = -1;
- goto error;
+ goto end;
}
trace_count = bt_value_array_get_length(query_result);
- if (trace_count < 0) {
+ if (trace_count == 0) {
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: result is empty: "
+ "component-class-name=%s", bt_component_class_get_name(comp_cls));
ret = -1;
- goto error;
+ goto end;
}
for (trace_idx = 0; trace_idx < trace_count; trace_idx++) {
- int64_t begin, end;
uint64_t stream_idx;
int64_t stream_count;
+ struct trace_range trace_intersection;
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_borrow_entry_value_const(
- trace_info, "intersection-range-ns");
- if (!intersection_range) {
+ if (!bt_value_is_map(trace_info)) {
ret = -1;
- BT_LOGD_STR("Cannot retrieve \'intersetion-range-ns\' field from query result.");
- goto error;
- }
-
- 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;
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: expecting element to be a map: "
+ "component-class-name=%s, actual-type=%s",
+ bt_component_class_get_name(comp_cls),
+ bt_common_value_type_string(bt_value_get_type(trace_info)));
+ goto end;
}
- intersection_end = bt_value_map_borrow_entry_value_const(intersection_range,
- "end");
- if (!intersection_end) {
+ stream_infos = bt_value_map_borrow_entry_value_const(
+ trace_info, "stream-infos");
+ if (!stream_infos) {
ret = -1;
- BT_LOGD_STR("Cannot retrieve intersection-range-ns \'end\' field from query result.");
- goto error;
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: missing `streams` key in trace info map: "
+ "component-class-name=%s",
+ bt_component_class_get_name(comp_cls));
+ goto end;
}
- begin = bt_value_integer_signed_get(intersection_begin);
- end = bt_value_integer_signed_get(intersection_end);
-
- if (begin < 0 || end < 0 || end < begin) {
- BT_CLI_LOGE_APPEND_CAUSE(
- "Invalid trace stream intersection values: "
- "intersection-range-ns:begin=%" PRId64
- ", intersection-range-ns:end=%" PRId64,
- begin, end);
+ if (!bt_value_is_array(stream_infos)) {
ret = -1;
- goto error;
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: expecting `streams` entry of trace info map to be an array: "
+ "component-class-name=%s, actual-type=%s",
+ bt_component_class_get_name(comp_cls),
+ bt_common_value_type_string(bt_value_get_type(stream_infos)));
+ goto end;
}
- stream_infos = bt_value_map_borrow_entry_value_const(trace_info,
- "streams");
- if (!stream_infos || !bt_value_is_array(stream_infos)) {
+ stream_count = bt_value_array_get_length(stream_infos);
+ if (stream_count == 0) {
ret = -1;
- BT_LOGD_STR("Cannot retrieve stream information from trace in query result.");
- goto error;
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: list of streams is empty: "
+ "component-class-name=%s",
+ bt_component_class_get_name(comp_cls));
+ goto end;
}
- stream_count = bt_value_array_get_length(stream_infos);
- if (stream_count < 0) {
- ret = -1;
- goto error;
+ ret = compute_stream_intersection(stream_infos, &trace_intersection);
+ if (ret != 0) {
+ BT_CLI_LOGE_APPEND_CAUSE("Failed to compute trace streams intersection.");
+ goto end;
}
for (stream_idx = 0; stream_idx < stream_count; stream_idx++) {
ret = -1;
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot allocate memory for port_id structure.");
- goto error;
+ goto end;
}
port_id->instance_name = strdup(cfg_comp->instance_name->str);
if (!port_id->instance_name) {
ret = -1;
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot allocate memory for port_id component instance name.");
- goto error;
+ goto end;
}
- trace_range = g_new0(struct trace_range, 1);
- if (!trace_range) {
+ stream_intersection = g_new0(struct trace_range, 1);
+ if (!stream_intersection) {
ret = -1;
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot allocate memory for trace_range structure.");
- goto error;
+ goto end;
}
- trace_range->intersection_range_begin_ns = begin;
- trace_range->intersection_range_end_ns = end;
+
+ *stream_intersection = trace_intersection;
stream_info = bt_value_array_borrow_element_by_index_const(
stream_infos, stream_idx);
- if (!stream_info || !bt_value_is_map(stream_info)) {
+ if (!bt_value_is_map(stream_info)) {
ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE(
- "Cannot retrieve stream informations from trace in query result.");
- goto error;
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: "
+ "expecting element of stream list to be a map: "
+ "component-class-name=%s, actual-type=%s",
+ bt_component_class_get_name(comp_cls),
+ bt_common_value_type_string(bt_value_get_type(stream_info)));
+ goto end;
}
port_name = bt_value_map_borrow_entry_value_const(stream_info, "port-name");
- if (!port_name || !bt_value_is_string(port_name)) {
+ if (!port_name) {
ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE(
- "Cannot retrieve port name in query result.");
- goto error;
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: "
+ "missing `port-name` key in stream info map: "
+ "component-class-name=%s",
+ bt_component_class_get_name(comp_cls));
+ goto end;
+ }
+
+ if (!bt_value_is_string(port_name)) {
+ ret = -1;
+ BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: "
+ "expecting `port-name` entry of stream info map to be a string: "
+ "component-class-name=%s, actual-type=%s",
+ bt_component_class_get_name(comp_cls),
+ bt_common_value_type_string(bt_value_get_type(port_name)));
+ goto end;
}
port_id->port_name = g_strdup(bt_value_string_get(port_name));
ret = -1;
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot allocate memory for port_id port_name.");
- goto error;
+ goto end;
}
BT_LOGD("Inserting stream intersection ");
- g_hash_table_insert(ctx->intersections, port_id, trace_range);
+ g_hash_table_insert(ctx->intersections, port_id, stream_intersection);
port_id = NULL;
- trace_range = NULL;
+ stream_intersection = NULL;
}
}
- goto end;
-
-error:
- BT_CLI_LOGE_APPEND_CAUSE(
- "Cannot determine stream intersection of trace: path=\"%s\"",
- path ? path : "(unknown)");
+ ret = 0;
end:
bt_value_put_ref(query_result);
g_free(port_id);
- g_free(trace_range);
+ g_free(stream_intersection);
return ret;
}
cfg_comp->comp_cls_name->str);
break;
default:
- abort();
+ bt_common_abort();
}
if (!comp_cls) {
comp_cls, cfg_comp->instance_name->str,
cfg_comp->params, cfg_comp->log_level,
(void *) &comp);
+ bt_component_source_get_ref(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, cfg_comp->log_level,
(void *) &comp);
+ bt_component_filter_get_ref(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, cfg_comp->log_level,
(void *) &comp);
+ bt_component_sink_get_ref(comp);
break;
default:
- abort();
+ bt_common_abort();
}
if (ret) {
cfg_comp->type == BT_COMPONENT_CLASS_TYPE_SOURCE) {
ret = set_stream_intersections(ctx, cfg_comp, comp_cls);
if (ret) {
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot determine stream intersection of trace.");
goto error;
}
}
GUINT_TO_POINTER(quark), (void *) comp);
break;
default:
- abort();
+ bt_common_abort();
}
comp = NULL;
}
static
-int cmd_run(struct bt_config *cfg)
+enum bt_cmd_status cmd_run(struct bt_config *cfg)
{
- int ret = 0;
+ enum bt_cmd_status cmd_status;
struct cmd_run_ctx ctx = { 0 };
/* Initialize the command's context and the graph object */
switch (run_status) {
case BT_GRAPH_RUN_STATUS_OK:
- break;
+ cmd_status = BT_CMD_STATUS_OK;
+ goto end;
case BT_GRAPH_RUN_STATUS_AGAIN:
if (bt_interrupter_is_set(the_interrupter)) {
- BT_CLI_LOGW_APPEND_CAUSE(
- "Graph was interrupted by user.");
- goto error;
+ /*
+ * The graph was interrupted by a SIGINT.
+ */
+ cmd_status = BT_CMD_STATUS_INTERRUPTED;
+ goto end;
}
if (cfg->cmd_data.run.retry_duration_us > 0) {
if (usleep(cfg->cmd_data.run.retry_duration_us)) {
if (bt_interrupter_is_set(the_interrupter)) {
- BT_CLI_LOGW_APPEND_CAUSE(
- "Graph was interrupted by user.");
- goto error;
+ cmd_status = BT_CMD_STATUS_INTERRUPTED;
+ goto end;
}
}
}
break;
- case BT_GRAPH_RUN_STATUS_END:
- goto end;
default:
if (bt_interrupter_is_set(the_interrupter)) {
- BT_CLI_LOGW_APPEND_CAUSE(
- "Graph was interrupted by user and failed: "
- "status=%s",
- bt_common_func_status_string(run_status));
- goto error;
+ cmd_status = BT_CMD_STATUS_INTERRUPTED;
+ goto end;
}
BT_CLI_LOGE_APPEND_CAUSE(
goto error;
}
}
-
- goto end;
-
error:
- if (ret == 0) {
- ret = -1;
- }
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
cmd_run_ctx_destroy(&ctx);
- return ret;
+ return cmd_status;
}
static
void print_error_causes(void)
{
const bt_error *error = bt_current_thread_take_error();
- int64_t i;
- GString *folded = NULL;
unsigned int columns;
+ gchar *error_str = NULL;
if (!error || bt_error_get_cause_count(error) == 0) {
fprintf(stderr, "%s%sUnknown command-line error.%s\n",
- bt_common_color_bold(), bt_common_color_fg_red(),
+ bt_common_color_bold(), bt_common_color_fg_bright_red(),
bt_common_color_reset());
goto end;
}
* This helps visually separate the error causes from the last
* logging statement.
*/
- fprintf(stderr, "\n");
-
- /* Reverse order: deepest (root) cause printed at the end */
- for (i = bt_error_get_cause_count(error) - 1; i >= 0; i--) {
- const bt_error_cause *cause =
- bt_error_borrow_cause_by_index(error, (uint64_t) i);
- const char *prefix_fmt =
- i == bt_error_get_cause_count(error) - 1 ?
- "%s%sERROR%s: " : "%s%sCAUSED BY%s ";
-
- /* Print prefix */
- fprintf(stderr, prefix_fmt,
- bt_common_color_bold(), bt_common_color_fg_red(),
- bt_common_color_reset());
+ fputc('\n', stderr);
- /* Print actor name */
- fprintf(stderr, "[");
- switch (bt_error_cause_get_actor_type(cause)) {
- case BT_ERROR_CAUSE_ACTOR_TYPE_UNKNOWN:
- fprintf(stderr, "%s%s%s",
- bt_common_color_bold(),
- bt_error_cause_get_module_name(cause),
- bt_common_color_reset());
- break;
- case BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT:
- fprintf(stderr, "%s%s%s: ",
- bt_common_color_bold(),
- bt_error_cause_component_actor_get_component_name(cause),
- bt_common_color_reset());
- print_plugin_comp_cls_opt(stderr,
- bt_error_cause_component_actor_get_plugin_name(cause),
- bt_error_cause_component_actor_get_component_class_name(cause),
- bt_error_cause_component_actor_get_component_class_type(cause));
- break;
- case BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS:
- print_plugin_comp_cls_opt(stderr,
- bt_error_cause_component_class_actor_get_plugin_name(cause),
- bt_error_cause_component_class_actor_get_component_class_name(cause),
- bt_error_cause_component_class_actor_get_component_class_type(cause));
- break;
- case BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR:
- fprintf(stderr, "%s%s%s (%s%s%s): ",
- bt_common_color_bold(),
- bt_error_cause_message_iterator_actor_get_component_name(cause),
- bt_common_color_reset(),
- bt_common_color_bold(),
- bt_error_cause_message_iterator_actor_get_component_output_port_name(cause),
- bt_common_color_reset());
- print_plugin_comp_cls_opt(stderr,
- bt_error_cause_message_iterator_actor_get_plugin_name(cause),
- bt_error_cause_message_iterator_actor_get_component_class_name(cause),
- bt_error_cause_message_iterator_actor_get_component_class_type(cause));
- break;
- default:
- abort();
- }
+ error_str = format_bt_error(error, columns, bt_cli_log_level,
+ BT_COMMON_COLOR_WHEN_AUTO);
+ BT_ASSERT(error_str);
- /* Print file name and line number */
- fprintf(stderr, "] (%s%s%s%s:%s%" PRIu64 "%s)\n",
- bt_common_color_bold(),
- bt_common_color_fg_magenta(),
- bt_error_cause_get_file_name(cause),
- bt_common_color_reset(),
- bt_common_color_fg_green(),
- bt_error_cause_get_line_number(cause),
- bt_common_color_reset());
-
- /* Print message */
- folded = bt_common_fold(bt_error_cause_get_message(cause),
- columns, 2);
- if (!folded) {
- BT_LOGE_STR("Could not fold string.");
- fprintf(stderr, "%s\n",
- bt_error_cause_get_message(cause));
- continue;
- }
-
- fprintf(stderr, "%s\n", folded->str);
- g_string_free(folded, TRUE);
- folded = NULL;
- }
+ fprintf(stderr, "%s\n", error_str);
end:
- BT_ASSERT(!folded);
-
if (error) {
bt_error_release(error);
}
+
+ g_free(error_str);
}
int main(int argc, const char **argv)
{
- int ret;
- int retcode;
- struct bt_config *cfg;
+ int ret, retcode;
+ enum bt_cmd_status cmd_status;
+ struct bt_config *cfg = NULL;
init_log_level();
set_signal_handler();
init_loaded_plugins();
- cfg = bt_config_cli_args_create_with_default(argc, argv, &retcode);
+
+ BT_ASSERT(!the_interrupter);
+ the_interrupter = bt_interrupter_create();
+ if (!the_interrupter) {
+ BT_CLI_LOGE_APPEND_CAUSE("Failed to create an interrupter object.");
+ retcode = 1;
+ goto end;
+ }
+
+ cfg = bt_config_cli_args_create_with_default(argc, argv, &retcode,
+ the_interrupter);
if (retcode < 0) {
/* Quit without errors; typically usage/version */
}
}
- BT_ASSERT(!the_interrupter);
- the_interrupter = bt_interrupter_create();
- if (!the_interrupter) {
- BT_CLI_LOGE_APPEND_CAUSE("Failed to create an interrupter object.");
- retcode = 1;
- goto end;
- }
-
BT_LOGI("Executing command: cmd=%d, command-name=\"%s\"",
cfg->command, cfg->command_name);
switch (cfg->command) {
case BT_CONFIG_COMMAND_RUN:
- ret = cmd_run(cfg);
+ cmd_status = cmd_run(cfg);
break;
case BT_CONFIG_COMMAND_LIST_PLUGINS:
- ret = cmd_list_plugins(cfg);
+ cmd_status = cmd_list_plugins(cfg);
break;
case BT_CONFIG_COMMAND_HELP:
- ret = cmd_help(cfg);
+ cmd_status = cmd_help(cfg);
break;
case BT_CONFIG_COMMAND_QUERY:
- ret = cmd_query(cfg);
+ cmd_status = cmd_query(cfg);
break;
case BT_CONFIG_COMMAND_PRINT_CTF_METADATA:
- ret = cmd_print_ctf_metadata(cfg);
+ cmd_status = cmd_print_ctf_metadata(cfg);
break;
case BT_CONFIG_COMMAND_PRINT_LTTNG_LIVE_SESSIONS:
- ret = cmd_print_lttng_live_sessions(cfg);
+ cmd_status = cmd_print_lttng_live_sessions(cfg);
break;
default:
BT_LOGF("Invalid/unknown command: cmd=%d", cfg->command);
- abort();
+ bt_common_abort();
}
- BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", ret=%d",
- cfg->command, cfg->command_name, ret);
+ BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", command-status=\"%s\"",
+ cfg->command, cfg->command_name, bt_cmd_status_string(cmd_status));
warn_command_name_and_directory_clash(cfg);
- retcode = ret ? 1 : 0;
+
+ switch (cmd_status) {
+ case BT_CMD_STATUS_OK:
+ retcode = 0;
+ break;
+ case BT_CMD_STATUS_ERROR:
+ retcode = 1;
+ break;
+ case BT_CMD_STATUS_INTERRUPTED:
+ retcode = 2;
+ break;
+ default:
+ BT_LOGF("Invalid command status: cmd-status=%d", cmd_status);
+ bt_common_abort();
+ }
end:
+ if (retcode == 1) {
+ print_error_causes();
+ }
+
BT_OBJECT_PUT_REF_AND_RESET(cfg);
fini_loaded_plugins();
bt_interrupter_put_ref(the_interrupter);
- if (retcode != 0) {
- print_error_causes();
- }
-
/*
* Clear current thread's error in case there is one to avoid a
* memory leak.
projects / babeltrace.git / blobdiff