*/
static const char* log_level_env_var_names[] = {
"BABELTRACE_COMMON_LOG_LEVEL",
+ "BABELTRACE_COMPAT_LOG_LEVEL",
"BABELTRACE_PLUGIN_CTF_BTR_LOG_LEVEL",
- "BABELTRACE_PLUGIN_CTF_FS_SRC_LOG_LEVEL",
- "BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_SRC_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_LTTNG_UTILS_DEBUG_INFO_FLT_LOG_LEVEL",
- "BABELTRACE_PLUGIN_TEXT_DMESG_SRC_LOG_LEVEL",
- "BABELTRACE_PLUGIN_UTILS_MUXER_FLT_LOG_LEVEL",
- "BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL",
"BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL",
- "BABELTRACE_PLUGIN_CTF_FS_SINK_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_MUXER_LOG_LEVEL",
+ "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL",
+ "BABELTRACE_PYTHON_BT2_LOG_LEVEL",
"BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL",
NULL,
};
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(bt_object_put_ref);
}
static
static
void destroy_the_query_executor(void)
{
- BT_PUT(the_query_executor);
+ BT_OBJECT_PUT_REF_AND_RESET(the_query_executor);
}
static
*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 */
end:
destroy_the_query_executor();
- bt_put(result);
+ bt_object_put_ref(result);
return ret;
}
int i;
struct 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);
+ return bt_object_get_ref(plugin);
}
static
comp_class = bt_plugin_get_component_class_by_name_and_type(plugin,
comp_class_name, comp_class_type);
- BT_PUT(plugin);
+ BT_OBJECT_PUT_REF_AND_RESET(plugin);
end:
if (BT_LOG_ON_DEBUG) {
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)) {
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);
+ case BT_VALUE_TYPE_REAL:
+ status = bt_value_real_get(value, &dbl_val);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
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);
+ bt_value_array_borrow_element_by_index(
+ 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(value, print_map_value, &data);
break;
}
default:
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);
}
}
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 =
struct 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_object_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));
+ g_ptr_array_add(loaded_plugins, bt_object_get_ref(plugin));
}
- bt_put(plugin);
+ bt_object_put_ref(plugin);
}
}
{
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;
struct bt_plugin_set *plugin_set;
enum bt_value_status status;
- plugin_path_value = bt_value_array_get(plugin_paths, i);
+ plugin_path_value = bt_value_array_borrow_element_by_index(
+ 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;
}
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;
}
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_object_put_ref(plugin_set);
}
end:
return ret;
}
add_to_loaded_plugins(plugin_set);
- bt_put(plugin_set);
+ bt_object_put_ref(plugin_set);
end:
return ret;
}
ret = -1;
end:
- bt_put(comp_cls);
- bt_put(results);
+ bt_object_put_ref(comp_cls);
+ bt_object_put_ref(results);
return ret;
}
goto end;
}
- bt_put(needed_comp_cls);
+ bt_object_put_ref(needed_comp_cls);
}
for (i = 0; i < bt_plugin_get_component_class_count(plugin); i++) {
enum bt_component_class_type type =
bt_component_class_get_type(comp_cls);
- assert(comp_cls);
+ BT_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);
+ comp_class_name) != 0 ||
+ type != cfg->cmd_data.help.cfg_component->type) {
+ bt_object_put_ref(comp_cls);
continue;
}
}
printf("\n%s\n", comp_class_help);
}
- bt_put(comp_cls);
+ bt_object_put_ref(comp_cls);
}
end:
- bt_put(plugin);
+ bt_object_put_ref(plugin);
return ret;
}
}
printf("\n");
- bt_put(comp_class);
+ bt_object_put_ref(comp_class);
}
}
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;
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",
goto error;
}
- array_size = bt_value_array_size(results);
+ if (cfg->cmd_data.print_lttng_live_sessions.output_path->len > 0) {
+ out_stream =
+ 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);
+ goto end;
+ }
+ }
+
+ 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(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(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);
- printf("%s", url_text);
- BT_PUT(v);
-
- v = bt_value_map_get(map, "timer-us");
+ BT_ASSERT(ret == 0);
+ fprintf(out_stream, "%s", url_text);
+ v = bt_value_map_borrow_entry_value(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);
- printf(" (timer = %" PRIu64 ", ", timer_us);
- BT_PUT(v);
-
- v = bt_value_map_get(map, "stream-count");
+ BT_ASSERT(ret == 0);
+ fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us);
+ v = bt_value_map_borrow_entry_value(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);
- printf("%" PRIu64 " stream(s), ", streams);
- BT_PUT(v);
-
- v = bt_value_map_get(map, "client-count");
+ BT_ASSERT(ret == 0);
+ fprintf(out_stream, "%" PRIu64 " stream(s), ", streams);
+ v = bt_value_map_borrow_entry_value(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);
- printf("%" PRIu64 " client(s) connected)\n", clients);
- BT_PUT(v);
-
- BT_PUT(map);
+ BT_ASSERT(ret == 0);
+ fprintf(out_stream, "%" PRIu64 " client(s) connected)\n", clients);
}
goto end;
ret = -1;
end:
- bt_put(v);
- bt_put(map);
- bt_put(results);
- bt_put(params);
- bt_put(comp_cls);
+ bt_object_put_ref(results);
+ bt_object_put_ref(params);
+ bt_object_put_ref(comp_cls);
+
+ if (out_stream && out_stream != stdout) {
+ int fclose_ret = fclose(out_stream);
+
+ if (fclose_ret) {
+ BT_LOGE_ERRNO("Cannot close file stream",
+ ": path=\"%s\"",
+ cfg->cmd_data.print_lttng_live_sessions.output_path->str);
+ }
+ }
+
return 0;
}
static const enum 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 failed;
}
- metadata_text_value = bt_value_map_get(results, "text");
+ metadata_text_value = bt_value_map_borrow_entry_value(results, "text");
if (!metadata_text_value) {
BT_LOGE_STR("Cannot find `text` string value in the resulting metadata info object.");
ret = -1;
}
ret = bt_value_string_get(metadata_text_value, &metadata_text);
- assert(ret == 0);
- printf("%s\n", metadata_text);
+ BT_ASSERT(ret == 0);
+
+ if (cfg->cmd_data.print_ctf_metadata.output_path->len > 0) {
+ out_stream =
+ fopen(cfg->cmd_data.print_ctf_metadata.output_path->str,
+ "w");
+ if (!out_stream) {
+ ret = -1;
+ BT_LOGE_ERRNO("Cannot open file for writing",
+ ": path=\"%s\"",
+ cfg->cmd_data.print_ctf_metadata.output_path->str);
+ goto end;
+ }
+ }
+
+ ret = fprintf(out_stream, "%s\n", metadata_text);
+ if (ret < 0) {
+ BT_LOGE("Cannot write whole metadata text to output stream: "
+ "ret=%d", ret);
+ }
+
goto end;
failed:
end:
destroy_the_query_executor();
- bt_put(results);
- bt_put(params);
- bt_put(metadata_text_value);
- bt_put(comp_cls);
+ bt_object_put_ref(results);
+ bt_object_put_ref(params);
+ bt_object_put_ref(comp_cls);
+
+ if (out_stream && out_stream != stdout) {
+ int fclose_ret = fclose(out_stream);
+
+ if (fclose_ret) {
+ BT_LOGE_ERRNO("Cannot close file stream",
+ ": path=\"%s\"",
+ cfg->cmd_data.print_ctf_metadata.output_path->str);
+ }
+ }
+
return 0;
}
{
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);
}
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;
cfg_conn->arg->str);
downstreamp_comp_name_quark = g_quark_from_string(
cfg_conn->downstream_comp_name->str);
- assert(downstreamp_comp_name_quark > 0);
+ BT_ASSERT(downstreamp_comp_name_quark > 0);
downstream_comp = g_hash_table_lookup(ctx->components,
GUINT_TO_POINTER(downstreamp_comp_name_quark));
if (!downstream_comp) {
}
downstream_port_count = port_count_fn(downstream_comp);
- assert(downstream_port_count >= 0);
+ BT_ASSERT(downstream_port_count >= 0);
for (i = 0; i < downstream_port_count; i++) {
struct bt_port *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_object_put_ref(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);
+ bt_object_put_ref(downstream_port);
continue;
}
if (graph_status != BT_GRAPH_STATUS_OK) {
goto error;
}
- assert(trimmer);
+ BT_ASSERT(trimmer);
trimmer_input =
bt_component_filter_get_input_port_by_index(
* Replace the current downstream port by the trimmer's
* upstream port.
*/
- BT_MOVE(downstream_port, trimmer_input);
+ BT_OBJECT_MOVE_REF(downstream_port, trimmer_input);
downstream_port_name = bt_port_get_name(
downstream_port);
if (!downstream_port_name) {
/* We have a winner! */
status = bt_graph_connect_ports(ctx->graph,
upstream_port, downstream_port, NULL);
- BT_PUT(downstream_port);
+ BT_OBJECT_PUT_REF_AND_RESET(downstream_port);
switch (status) {
case BT_GRAPH_STATUS_OK:
break;
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_OBJECT_PUT_REF_AND_RESET(trimmer_params);
+ BT_OBJECT_PUT_REF_AND_RESET(trimmer_class);
+ BT_OBJECT_PUT_REF_AND_RESET(trimmer);
+ BT_OBJECT_PUT_REF_AND_RESET(trimmer_input);
+ BT_OBJECT_PUT_REF_AND_RESET(trimmer_output);
return ret;
}
struct bt_component *upstream_comp = NULL;
size_t i;
- assert(ctx);
- assert(upstream_port);
+ BT_ASSERT(ctx);
+ BT_ASSERT(upstream_port);
upstream_port_name = bt_port_get_name(upstream_port);
- assert(upstream_port_name);
+ BT_ASSERT(upstream_port_name);
upstream_comp = bt_port_get_component(upstream_port);
if (!upstream_comp) {
BT_LOGW("Upstream port to connect is not part of a component: "
}
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);
+ bt_object_put_ref(upstream_comp);
return ret;
}
}
end:
- bt_put(comp);
+ bt_object_put_ref(comp);
return;
}
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_ASSERT(upstream_comp);
+ BT_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\", "
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);
+ bt_object_put_ref(upstream_comp);
+ bt_object_put_ref(downstream_comp);
}
static
ctx->intersections = NULL;
}
- BT_PUT(ctx->graph);
+ BT_OBJECT_PUT_REF_AND_RESET(ctx->graph);
the_graph = NULL;
ctx->cfg = NULL;
}
ctx->cfg = cfg;
ctx->connect_ports = false;
ctx->components = g_hash_table_new_full(g_direct_hash, g_direct_equal,
- NULL, bt_put);
+ NULL, bt_object_put_ref);
if (!ctx->components) {
goto error;
}
struct trace_range *trace_range = NULL;
const char *fail_reason = NULL;
- component_path_value = bt_value_map_get(cfg_comp->params, "path");
- if (!bt_value_is_string(component_path_value)) {
+ 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;
}
- value_status = bt_value_map_insert(query_params, "path", component_path_value);
+ value_status = bt_value_map_insert_entry(query_params, "path",
+ component_path_value);
if (value_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Cannot insert path parameter in query paramater map.");
+ BT_LOGE_STR("Cannot insert path parameter in query parameter map.");
ret = -1;
goto error;
}
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(
+ 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 = bt_value_map_borrow_entry_value(trace_info,
"intersection-range-ns");
if (!intersection_range) {
ret = -1;
goto error;
}
- intersection_begin = bt_value_map_get(intersection_range,
- "begin");
+ intersection_begin = bt_value_map_borrow_entry_value(
+ 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(
+ intersection_range, "end");
if (!intersection_end) {
ret = -1;
BT_LOGD_STR("Cannot retrieve intersection-range-ns \'end\' field from query result.");
goto error;
}
- stream_infos = bt_value_map_get(trace_info, "streams");
+ stream_infos = bt_value_map_borrow_entry_value(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(
+ 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(
+ 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(
+ stream_paths, 0);
if (!stream_path_value ||
!bt_value_is_string(stream_path_value)) {
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_object_put_ref(query_params);
+ bt_object_put_ref(query_result);
g_free(port_id);
g_free(trace_range);
return ret;
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);
+ BT_ASSERT(quark > 0);
g_hash_table_insert(ctx->components,
GUINT_TO_POINTER(quark), comp);
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;
}
uint64_t i;
count = port_count_fn(comp);
- assert(count >= 0);
+ BT_ASSERT(count >= 0);
for (i = 0; i < count; i++) {
struct bt_port *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);
+ bt_object_put_ref(upstream_port);
if (ret) {
goto end;
}
retcode = ret ? 1 : 0;
end:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
fini_static_data();
return retcode;
}