#include <babeltrace/babeltrace.h>
#include <babeltrace/common-internal.h>
-#include <babeltrace/values-internal.h>
#include <unistd.h>
#include <stdlib.h>
#include <popt.h>
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
end:
destroy_the_query_executor();
- bt_put(result);
+ bt_object_put_ref(result);
return ret;
}
}
}
- 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) {
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
}
fprintf(stderr, " Parameters:\n");
- print_value(stderr, bt_config_component->params, 8);
+ print_value(stderr,
+ bt_value_borrow_from_private(bt_config_component->params), 8);
}
static
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);
}
}
{
size_t i;
- print_plugin_paths(cfg->plugin_paths);
+ print_plugin_paths(bt_value_borrow_from_private(cfg->plugin_paths));
fprintf(stderr, " Source component instances:\n");
print_bt_config_components(cfg->cmd_data.run.sources);
static
void print_cfg_list_plugins(struct bt_config *cfg)
{
- print_plugin_paths(cfg->plugin_paths);
+ print_plugin_paths(bt_value_borrow_from_private(cfg->plugin_paths));
}
static
void print_cfg_help(struct bt_config *cfg)
{
- print_plugin_paths(cfg->plugin_paths);
+ print_plugin_paths(bt_value_borrow_from_private(cfg->plugin_paths));
}
static
void print_cfg_print_ctf_metadata(struct bt_config *cfg)
{
- print_plugin_paths(cfg->plugin_paths);
+ print_plugin_paths(bt_value_borrow_from_private(cfg->plugin_paths));
fprintf(stderr, " Path: %s\n",
cfg->cmd_data.print_ctf_metadata.path->str);
}
static
void print_cfg_print_lttng_live_sessions(struct bt_config *cfg)
{
- print_plugin_paths(cfg->plugin_paths);
+ print_plugin_paths(bt_value_borrow_from_private(cfg->plugin_paths));
fprintf(stderr, " URL: %s\n",
cfg->cmd_data.print_lttng_live_sessions.url->str);
}
static
void print_cfg_query(struct bt_config *cfg)
{
- print_plugin_paths(cfg->plugin_paths);
+ print_plugin_paths(bt_value_borrow_from_private(cfg->plugin_paths));
fprintf(stderr, " Object: `%s`\n", cfg->cmd_data.query.object->str);
fprintf(stderr, " Component class:\n");
print_bt_config_component(cfg->cmd_data.query.cfg_component);
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);
}
}
}
add_to_loaded_plugins(plugin_set);
- bt_put(plugin_set);
+ 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 = query(comp_cls, cfg->cmd_data.query.object->str,
- cfg->cmd_data.query.cfg_component->params, &results,
- &fail_reason);
+ bt_value_borrow_from_private(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_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++) {
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);
+ 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;
}
int plugins_count, component_classes_count = 0, i;
printf("From the following plugin paths:\n\n");
- print_value(stdout, cfg->plugin_paths, 2);
+ print_value(stdout, bt_value_borrow_from_private(cfg->plugin_paths), 2);
printf("\n");
plugins_count = loaded_plugins->len;
if (plugins_count == 0) {
}
printf("\n");
- bt_put(comp_class);
+ bt_object_put_ref(comp_class);
}
}
int ret = 0;
struct bt_component_class *comp_cls = NULL;
struct bt_value *results = NULL;
- struct bt_value *params = NULL;
+ struct bt_private_value *params = NULL;
struct bt_value *map = NULL;
struct bt_value *v = NULL;
static const char * const plugin_name = "ctf";
goto error;
}
- params = bt_value_map_create();
+ params = bt_private_value_map_create();
if (!params) {
goto error;
}
- ret = bt_value_map_insert_string_entry(params, "url",
+ ret = bt_private_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", bt_value_borrow_from_private(params),
+ &results, &fail_reason);
if (ret) {
goto failed;
}
ret = -1;
end:
- 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);
int ret = 0;
struct bt_component_class *comp_cls = NULL;
struct bt_value *results = NULL;
- struct bt_value *params = NULL;
+ struct bt_private_value *params = NULL;
struct bt_value *metadata_text_value = NULL;
const char *metadata_text = NULL;
static const char * const plugin_name = "ctf";
goto end;
}
- params = bt_value_map_create();
+ params = bt_private_value_map_create();
if (!params) {
ret = -1;
goto end;
}
- ret = bt_value_map_insert_string_entry(params, "path",
+ ret = bt_private_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",
+ bt_value_borrow_from_private(params), &results, &fail_reason);
if (ret) {
goto failed;
}
end:
destroy_the_query_executor();
- 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);
struct bt_port *(*port_by_index_fn)(struct bt_component *, uint64_t);
enum bt_graph_status status = BT_GRAPH_STATUS_ERROR;
bool insert_trimmer = false;
- struct bt_value *trimmer_params = NULL;
+ struct bt_private_value *trimmer_params = NULL;
char *intersection_begin = NULL;
char *intersection_end = NULL;
struct bt_component *trimmer = NULL;
}
insert_trimmer = true;
- trimmer_params = bt_value_map_create();
+ trimmer_params = bt_private_value_map_create();
if (!trimmer_params) {
goto error;
}
- status = bt_value_map_insert_string_entry(
+ status = bt_private_value_map_insert_string_entry(
trimmer_params, "begin", intersection_begin);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
- status = bt_value_map_insert_string_entry(
+ status = bt_private_value_map_insert_string_entry(
trimmer_params,
"end", intersection_end);
if (status != BT_VALUE_STATUS_OK) {
/* 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,
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;
}
ctx->connect_ports = false;
graph_status = bt_graph_add_component(ctx->graph,
- trimmer_class, trimmer_name, trimmer_params,
+ trimmer_class, trimmer_name,
+ bt_value_borrow_from_private(trimmer_params),
&trimmer);
free(trimmer_name);
if (graph_status != BT_GRAPH_STATUS_OK) {
* 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;
}
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;
}
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;
}
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_private_value *query_params = NULL;
struct bt_value *query_result = NULL;
struct bt_value *trace_info = NULL;
struct bt_value *intersection_range = NULL;
struct trace_range *trace_range = NULL;
const char *fail_reason = NULL;
- component_path_value = bt_value_map_borrow_entry_value(cfg_comp->params,
+ component_path_value = bt_value_map_borrow_entry_value(
+ bt_value_borrow_from_private(cfg_comp->params),
"path");
if (component_path_value && !bt_value_is_string(component_path_value)) {
BT_LOGD("Cannot get path parameter: component-name=%s",
goto error;
}
- query_params = bt_value_map_create();
+ query_params = bt_private_value_map_create();
if (!query_params) {
BT_LOGE_STR("Cannot create query parameters.");
ret = -1;
goto error;
}
- value_status = bt_value_map_insert_entry(query_params, "path",
+ value_status = bt_private_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 parameter map.");
goto error;
}
- ret = query(comp_cls, "trace-info", query_params, &query_result,
+ ret = query(comp_cls, "trace-info",
+ bt_value_borrow_from_private(query_params), &query_result,
&fail_reason);
if (ret) {
BT_LOGD("Component class does not support the `trace-info` query: %s: "
path ? path : "(unknown)",
bt_common_color_reset());
end:
- bt_put(query_params);
- bt_put(query_result);
+ bt_object_put_ref(query_params);
+ bt_object_put_ref(query_result);
g_free(port_id);
g_free(trace_range);
return ret;
}
ret = bt_graph_add_component(ctx->graph, comp_cls,
- cfg_comp->instance_name->str, cfg_comp->params, &comp);
+ cfg_comp->instance_name->str,
+ bt_value_borrow_from_private(cfg_comp->params), &comp);
if (ret) {
BT_LOGE("Cannot create component: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d, "
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;
}
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;
}
print_cfg(cfg);
if (cfg->command_needs_plugins) {
- ret = load_all_plugins(cfg->plugin_paths);
+ ret = load_all_plugins(
+ bt_value_borrow_from_private(cfg->plugin_paths));
if (ret) {
BT_LOGE("Failed to load plugins: ret=%d", ret);
retcode = 1;
retcode = ret ? 1 : 0;
end:
- BT_PUT(cfg);
+ BT_OBJECT_PUT_REF_AND_RESET(cfg);
fini_static_data();
return retcode;
}