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_MSG_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,
};
const char **fail_reason)
{
const bt_value *result = NULL;
- enum bt_query_executor_status status;
+ bt_query_executor_status status;
*fail_reason = "unknown error";
int ret = 0;
static
const bt_component_class *find_component_class(const char *plugin_name,
const char *comp_class_name,
- enum bt_component_class_type comp_class_type)
+ bt_component_class_type comp_class_type)
{
const bt_component_class *comp_cls = NULL;
}
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:
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;
{
bt_bool bool_val;
int64_t int_val;
+ uint64_t uint_val;
double dbl_val;
const char *str_val;
int size;
bt_common_color_fg_cyan(), bool_val ? "yes" : "no",
bt_common_color_reset());
break;
- case BT_VALUE_TYPE_INTEGER:
- int_val = bt_value_integer_get(value);
+ 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());
{
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);
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_type type =
bt_component_class_get_type(comp_cls);
print_plugin_comp_cls_opt(stdout, plugin_name, comp_class_name, type);
uint64_t i;
if (count == 0) {
- printf(" %s%s component classes%s: (none)\n", cc_type_name,
+ 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", cc_type_name,
+ printf(" %s%s component classes%s:\n",
bt_common_color_bold(),
+ cc_type_name,
bt_common_color_reset());
}
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_type type =
bt_component_class_get_type(comp_class);
printf(" ");
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_name_const,
+ 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_name_const,
+ 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_name_const,
+ bt_plugin_borrow_sink_component_class_by_index_const,
(spec_comp_cls_borrow_comp_cls_func_t)
bt_component_class_sink_as_component_class);
}
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;
BT_LOGE_STR("Unexpected empty array \"timer-us\" entry.");
goto error;
}
- timer_us = bt_value_integer_get(v);
+ timer_us = bt_value_signed_integer_get(v);
fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us);
v = bt_value_map_borrow_entry_value_const(map, "stream-count");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"stream-count\" entry.");
goto error;
}
- streams = bt_value_integer_get(v);
+ streams = bt_value_signed_integer_get(v);
fprintf(out_stream, "%" PRIu64 " stream(s), ", streams);
v = bt_value_map_borrow_entry_value_const(map, "client-count");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"client-count\" entry.");
goto error;
}
- clients = bt_value_integer_get(v);
+ clients = bt_value_signed_integer_get(v);
fprintf(out_stream, "%" PRIu64 " client(s) connected)\n", clients);
}
}
}
- return 0;
+ return ret;
}
static
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;
}
}
- return 0;
+ return ret;
}
struct port_id {
uint64_t i;
input_port_count_func_t port_count_fn;
borrow_input_port_by_index_func_t port_by_index_fn;
- enum bt_graph_status status = BT_GRAPH_STATUS_ERROR;
+ bt_graph_status status = BT_GRAPH_STATUS_ERROR;
bool insert_trimmer = false;
bt_value *trimmer_params = NULL;
char *intersection_begin = NULL;
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);
}
downstream_port_count = port_count_fn(downstream_comp);
- BT_ASSERT(downstream_port_count >= 0);
for (i = 0; i < downstream_port_count; i++) {
const bt_port_input *in_downstream_port =
* source and the trimmer.
*/
char *trimmer_name = NULL;
- enum bt_graph_status graph_status;
+ bt_graph_status graph_status;
ret = asprintf(&trimmer_name,
"stream-intersection-trimmer-%s",
int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg)
{
int ret = 0;
- enum bt_graph_status status;
+ bt_graph_status status;
ctx->cfg = cfg;
ctx->connect_ports = false;
int ret = 0;
uint64_t trace_idx;
int64_t trace_count;
- enum bt_value_status value_status;
const char *path = NULL;
- const bt_value *component_path_value = NULL;
- bt_value *query_params = NULL;
const bt_value *query_result = NULL;
const bt_value *trace_info = NULL;
const bt_value *intersection_range = NULL;
const bt_component_class *comp_cls =
bt_component_class_source_as_component_class_const(src_comp_cls);
- component_path_value = bt_value_map_borrow_entry_value(cfg_comp->params,
- "path");
- if (component_path_value && !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;
- }
-
- path = bt_value_string_get(component_path_value);
- 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_string_entry(query_params, "path",
- path);
- if (value_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Cannot insert path parameter in query parameter map.");
- ret = -1;
- goto error;
- }
-
ret = query(comp_cls, "trace-info",
- query_params, &query_result,
+ cfg_comp->params, &query_result,
&fail_reason);
if (ret) {
BT_LOGD("Component class does not support the `trace-info` query: %s: "
goto error;
}
- begin = bt_value_integer_get(intersection_begin);
- end = bt_value_integer_get(intersection_end);
+ 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: "
path ? path : "(unknown)",
bt_common_color_reset());
end:
- bt_value_put_ref(query_params);
bt_value_put_ref(query_result);
g_free(port_id);
g_free(trace_range);
uint64_t i;
count = port_count_fn(comp);
- BT_ASSERT(count >= 0);
for (i = 0; i < count; i++) {
const bt_port_output *upstream_port = port_by_index_fn(comp, i);
}
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_OK:
/* 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
projects / babeltrace.git / blobdiff