};
/* Application's processing graph (weak) */
-static struct bt_private_graph *the_graph;
-static struct bt_private_query_executor *the_query_executor;
+static struct bt_graph *the_graph;
+static struct bt_query_executor *the_query_executor;
static bool canceled = false;
GPtrArray *loaded_plugins;
static
BOOL WINAPI signal_handler(DWORD signal) {
if (the_graph) {
- bt_private_graph_cancel(the_graph);
+ bt_graph_cancel(the_graph);
}
canceled = true;
}
if (the_graph) {
- bt_private_graph_cancel(the_graph);
+ bt_graph_cancel(the_graph);
}
if (the_query_executor) {
- bt_private_query_executor_cancel(the_query_executor);
+ bt_query_executor_cancel(the_query_executor);
}
canceled = true;
static
void init_static_data(void)
{
- loaded_plugins = g_ptr_array_new_with_free_func(bt_object_put_ref);
+ loaded_plugins = g_ptr_array_new_with_free_func(
+ (GDestroyNotify) bt_object_put_ref);
}
static
{
int ret = 0;
- the_query_executor = bt_private_query_executor_create();
+ the_query_executor = bt_query_executor_create();
if (!the_query_executor) {
BT_LOGE_STR("Cannot create a query executor.");
ret = -1;
static
void destroy_the_query_executor(void)
{
- BT_OBJECT_PUT_REF_AND_RESET(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 struct bt_component_class *comp_cls, const char *obj,
+ const struct bt_value *params, const struct bt_value **user_result,
const char **fail_reason)
{
- struct bt_value *result = NULL;
- enum bt_query_status status;
+ const struct bt_value *result = NULL;
+ enum bt_query_executor_status status;
*fail_reason = "unknown error";
int ret = 0;
}
while (true) {
- status = bt_private_query_executor_query(the_query_executor,
+ 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)) {
- if (bt_query_executor_is_canceled(
- bt_private_query_executor_borrow_query_executor(the_query_executor))) {
+ if (bt_query_executor_is_canceled(the_query_executor)) {
BT_LOGI("Query was canceled by user: "
"comp-cls-addr=%p, comp-cls-name=\"%s\", "
"query-obj=\"%s\"", comp_cls,
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_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_object_put_ref(result);
+ bt_value_put_ref(result);
return ret;
}
static
-struct bt_plugin *find_plugin(const char *name)
+const struct bt_plugin *find_plugin(const char *name)
{
int i;
- struct bt_plugin *plugin = NULL;
+ const struct bt_plugin *plugin = NULL;
BT_ASSERT(name);
BT_LOGD("Finding plugin: name=\"%s\"", name);
}
}
- return bt_object_get_ref(plugin);
+ bt_plugin_get_ref(plugin);
+ return plugin;
}
-typedef void *(*plugin_borrow_comp_cls_func_t)(struct bt_plugin *,
- const char *);
+typedef const void *(*plugin_borrow_comp_cls_func_t)(
+ const struct bt_plugin *, const char *);
static
-void *find_component_class_from_plugin(const char *plugin_name,
+const void *find_component_class_from_plugin(const char *plugin_name,
const char *comp_class_name,
plugin_borrow_comp_cls_func_t plugin_borrow_comp_cls_func)
{
- void *comp_class = NULL;
- struct bt_plugin *plugin;
+ const void *comp_class = NULL;
+ const struct bt_plugin *plugin;
BT_LOGD("Finding component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\"", plugin_name, comp_class_name);
goto end;
}
- comp_class = bt_object_get_ref(
- plugin_borrow_comp_cls_func(plugin, comp_class_name));
- BT_OBJECT_PUT_REF_AND_RESET(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) {
}
static
-struct bt_component_class_source *find_source_component_class(
+const struct bt_component_class_source *find_source_component_class(
const char *plugin_name, const char *comp_class_name)
{
- return (void *) find_component_class_from_plugin(plugin_name,
- 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);
+ bt_plugin_borrow_source_component_class_by_name_const);
}
static
-struct bt_component_class_filter *find_filter_component_class(
+const struct bt_component_class_filter *find_filter_component_class(
const char *plugin_name, const char *comp_class_name)
{
- return (void *) find_component_class_from_plugin(plugin_name,
- 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);
+ bt_plugin_borrow_filter_component_class_by_name_const);
}
static
-struct bt_component_class_sink *find_sink_component_class(
+const struct bt_component_class_sink *find_sink_component_class(
const char *plugin_name, const char *comp_class_name)
{
- return (void *) find_component_class_from_plugin(plugin_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);
+ bt_plugin_borrow_sink_component_class_by_name_const);
}
static
-struct bt_component_class *find_component_class(const char *plugin_name,
+const struct bt_component_class *find_component_class(const char *plugin_name,
const char *comp_class_name,
enum bt_component_class_type comp_class_type)
{
- struct bt_component_class *comp_cls = NULL;
+ const struct bt_component_class *comp_cls = NULL;
switch (comp_class_type) {
case BT_COMPONENT_CLASS_TYPE_SOURCE:
- comp_cls = bt_component_class_source_borrow_component_class(
- find_source_component_class(plugin_name,
- comp_class_name));
+ 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_borrow_component_class(
- find_filter_component_class(plugin_name,
- comp_class_name));
+ 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_borrow_component_class(
- find_sink_component_class(plugin_name,
- comp_class_name));
+ comp_cls = bt_component_class_sink_as_component_class_const(find_sink_component_class(plugin_name, comp_class_name));
break;
default:
abort();
}
static
-void print_value(FILE *, struct bt_value *, size_t);
+void print_value(FILE *, const struct bt_value *, size_t);
static
-void print_value_rec(FILE *, struct bt_value *, size_t);
+void print_value_rec(FILE *, const struct 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 struct bt_value *object,
+ void *data)
{
struct print_map_value_data *print_map_value_data = data;
}
static
-void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
+void print_value_rec(FILE *fp, const struct bt_value *value, size_t indent)
{
bt_bool bool_val;
int64_t int_val;
}
for (i = 0; i < size; i++) {
- struct bt_value *element =
- bt_value_array_borrow_element_by_index(
+ const struct bt_value *element =
+ bt_value_array_borrow_element_by_index_const(
value, i);
if (!element) {
break;
}
- bt_value_map_foreach_entry(value, print_map_value, &data);
+ bt_value_map_foreach_entry_const(value, print_map_value, &data);
break;
}
default:
}
static
-void print_value(FILE *fp, struct bt_value *value, size_t indent)
+void print_value(FILE *fp, const struct bt_value *value, size_t indent)
{
if (!bt_value_is_array(value) && !bt_value_is_map(value)) {
print_indent(fp, indent);
}
fprintf(stderr, " Parameters:\n");
- print_value(stderr,
- bt_private_value_borrow_value(bt_config_component->params), 8);
+ print_value(stderr, bt_config_component->params, 8);
}
static
}
static
-void print_plugin_paths(struct bt_value *plugin_paths)
+void print_plugin_paths(const struct bt_value *plugin_paths)
{
fprintf(stderr, " Plugin paths:\n");
print_value(stderr, plugin_paths, 4);
{
size_t i;
- print_plugin_paths(bt_private_value_borrow_value(cfg->plugin_paths));
+ print_plugin_paths(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(bt_private_value_borrow_value(cfg->plugin_paths));
+ print_plugin_paths(cfg->plugin_paths);
}
static
void print_cfg_help(struct bt_config *cfg)
{
- print_plugin_paths(bt_private_value_borrow_value(cfg->plugin_paths));
+ print_plugin_paths(cfg->plugin_paths);
}
static
void print_cfg_print_ctf_metadata(struct bt_config *cfg)
{
- print_plugin_paths(bt_private_value_borrow_value(cfg->plugin_paths));
+ print_plugin_paths(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(bt_private_value_borrow_value(cfg->plugin_paths));
+ print_plugin_paths(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(bt_private_value_borrow_value(cfg->plugin_paths));
+ print_plugin_paths(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);
}
static
-void add_to_loaded_plugins(struct bt_plugin_set *plugin_set)
+void add_to_loaded_plugins(const struct bt_plugin_set *plugin_set)
{
int64_t i;
int64_t count;
BT_ASSERT(count >= 0);
for (i = 0; i < count; i++) {
- struct bt_plugin *plugin =
- bt_plugin_set_borrow_plugin_by_index(plugin_set, i);
- struct bt_plugin *loaded_plugin =
+ const struct bt_plugin *plugin =
+ bt_plugin_set_borrow_plugin_by_index_const(plugin_set, i);
+ const struct bt_plugin *loaded_plugin =
find_plugin(bt_plugin_get_name(plugin));
BT_ASSERT(plugin);
bt_plugin_get_name(plugin),
bt_plugin_get_path(plugin),
bt_plugin_get_path(loaded_plugin));
- bt_object_put_ref(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_object_get_ref(plugin));
+ bt_plugin_get_ref(plugin);
+ g_ptr_array_add(loaded_plugins, (void *) plugin);
}
}
}
static
-int load_dynamic_plugins(struct bt_value *plugin_paths)
+int load_dynamic_plugins(const struct bt_value *plugin_paths)
{
int nr_paths, i, ret = 0;
BT_LOGI("Loading dynamic plugins.");
for (i = 0; i < nr_paths; i++) {
- struct bt_value *plugin_path_value = NULL;
+ const struct bt_value *plugin_path_value = NULL;
const char *plugin_path;
- struct bt_plugin_set *plugin_set;
+ const struct bt_plugin_set *plugin_set;
- plugin_path_value = bt_value_array_borrow_element_by_index(
- plugin_paths, i);
+ plugin_path_value =
+ bt_value_array_borrow_element_by_index_const(
+ plugin_paths, i);
plugin_path = bt_value_string_get(plugin_path_value);
/*
}
add_to_loaded_plugins(plugin_set);
- bt_object_put_ref(plugin_set);
+ 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 struct bt_plugin_set *plugin_set;
BT_LOGI("Loading static plugins.");
plugin_set = bt_plugin_create_all_from_static();
}
add_to_loaded_plugins(plugin_set);
- bt_object_put_ref(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 struct bt_value *plugin_paths)
{
int ret = 0;
}
static
-void print_plugin_info(struct bt_plugin *plugin)
+void print_plugin_info(const struct bt_plugin *plugin)
{
unsigned int major, minor, patch;
const char *extra;
int cmd_query(struct bt_config *cfg)
{
int ret = 0;
- struct bt_component_class *comp_cls = NULL;
- struct bt_value *results = NULL;
+ const struct bt_component_class *comp_cls = NULL;
+ const struct bt_value *results = NULL;
const char *fail_reason = NULL;
comp_cls = find_component_class(
}
ret = query(comp_cls, cfg->cmd_data.query.object->str,
- bt_private_value_borrow_value(
- cfg->cmd_data.query.cfg_component->params),
+ cfg->cmd_data.query.cfg_component->params,
&results, &fail_reason);
if (ret) {
goto failed;
ret = -1;
end:
- bt_object_put_ref(comp_cls);
- bt_object_put_ref(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,
- struct bt_component_class *comp_cls)
+ const struct bt_component_class *comp_cls)
{
const char *comp_class_name =
bt_component_class_get_name(comp_cls);
int cmd_help(struct bt_config *cfg)
{
int ret = 0;
- struct bt_plugin *plugin = NULL;
- struct bt_component_class *needed_comp_cls = NULL;
+ const struct bt_plugin *plugin = NULL;
+ const struct bt_component_class *needed_comp_cls = NULL;
plugin = find_plugin(cfg->cmd_data.help.cfg_component->plugin_name->str);
if (!plugin) {
needed_comp_cls);
end:
- bt_object_put_ref(needed_comp_cls);
- bt_object_put_ref(plugin);
+ bt_component_class_put_ref(needed_comp_cls);
+ bt_plugin_put_ref(plugin);
return ret;
}
-typedef void *(* plugin_borrow_comp_cls_by_index_func_t)(struct bt_plugin *,
+typedef void *(* plugin_borrow_comp_cls_by_index_func_t)(const struct bt_plugin *,
uint64_t);
-typedef struct bt_component_class *(* spec_comp_cls_borrow_comp_cls_func_t)(
+typedef const struct bt_component_class *(* spec_comp_cls_borrow_comp_cls_func_t)(
void *);
-void cmd_list_plugins_print_component_classes(struct bt_plugin *plugin,
+void cmd_list_plugins_print_component_classes(const struct 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)
}
for (i = 0; i < count; i++) {
- struct bt_component_class *comp_class =
+ const struct 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 =
int plugins_count, component_classes_count = 0, i;
printf("From the following plugin paths:\n\n");
- print_value(stdout, bt_private_value_borrow_value(cfg->plugin_paths), 2);
+ print_value(stdout, cfg->plugin_paths, 2);
printf("\n");
plugins_count = loaded_plugins->len;
if (plugins_count == 0) {
}
for (i = 0; i < plugins_count; i++) {
- struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+ const struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
component_classes_count +=
bt_plugin_get_source_component_class_count(plugin) +
bt_common_color_reset());
for (i = 0; i < plugins_count; i++) {
- struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+ const struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
printf("\n");
print_plugin_info(plugin);
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,
+ bt_plugin_borrow_source_component_class_by_name_const,
(spec_comp_cls_borrow_comp_cls_func_t)
- bt_component_class_source_borrow_component_class);
+ 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,
+ bt_plugin_borrow_filter_component_class_by_name_const,
(spec_comp_cls_borrow_comp_cls_func_t)
- bt_component_class_filter_borrow_component_class);
+ 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,
+ bt_plugin_borrow_sink_component_class_by_name_const,
(spec_comp_cls_borrow_comp_cls_func_t)
- bt_component_class_sink_borrow_component_class);
+ 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_private_value *params = NULL;
- struct bt_value *map = NULL;
- struct bt_value *v = NULL;
+ const struct bt_component_class *comp_cls = NULL;
+ const struct bt_value *results = NULL;
+ struct bt_value *params = NULL;
+ const struct bt_value *map = NULL;
+ const struct 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 =
goto error;
}
- params = bt_private_value_map_create();
+ params = bt_value_map_create();
if (!params) {
goto error;
}
- ret = bt_private_value_map_insert_string_entry(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", bt_private_value_borrow_value(params),
- &results, &fail_reason);
+ ret = query(comp_cls, "sessions", params,
+ &results, &fail_reason);
if (ret) {
goto failed;
}
const char *url_text;
int64_t timer_us, streams, clients;
- map = bt_value_array_borrow_element_by_index(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_borrow_entry_value(map, "url");
+ v = bt_value_map_borrow_entry_value_const(map, "url");
if (!v) {
BT_LOGE_STR("Unexpected empty array \"url\" entry.");
goto error;
}
url_text = bt_value_string_get(v);
fprintf(out_stream, "%s", url_text);
- v = bt_value_map_borrow_entry_value(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;
}
timer_us = bt_value_integer_get(v);
fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us);
- v = bt_value_map_borrow_entry_value(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;
}
streams = bt_value_integer_get(v);
fprintf(out_stream, "%" PRIu64 " stream(s), ", streams);
- v = bt_value_map_borrow_entry_value(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 = -1;
end:
- bt_object_put_ref(results);
- bt_object_put_ref(params);
- bt_object_put_ref(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);
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_private_value *params = NULL;
- struct bt_value *metadata_text_value = NULL;
+ const struct bt_component_class *comp_cls = NULL;
+ const struct bt_value *results = NULL;
+ struct bt_value *params = NULL;
+ const struct 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";
goto end;
}
- params = bt_private_value_map_create();
+ params = bt_value_map_create();
if (!params) {
ret = -1;
goto end;
}
- ret = bt_private_value_map_insert_string_entry(params, "path",
+ ret = bt_value_map_insert_string_entry(params, "path",
cfg->cmd_data.print_ctf_metadata.path->str);
if (ret) {
ret = -1;
}
ret = query(comp_cls, "metadata-info",
- bt_private_value_borrow_value(params), &results, &fail_reason);
+ params, &results, &fail_reason);
if (ret) {
goto failed;
}
- metadata_text_value = bt_value_map_borrow_entry_value(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;
bt_common_color_reset());
end:
- bt_object_put_ref(results);
- bt_object_put_ref(params);
- bt_object_put_ref(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);
GHashTable *sink_components;
/* Owned by this */
- struct bt_private_graph *graph;
+ struct 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_output *out_upstream_port,
+ const struct bt_component *upstream_comp,
+ const struct bt_port_output *out_upstream_port,
struct bt_config_connection *cfg_conn)
{
typedef uint64_t (*input_port_count_func_t)(void *);
- typedef struct bt_port_input *(*borrow_input_port_by_index_func_t)(
- void *, uint64_t);
- struct bt_port *upstream_port =
- bt_port_output_borrow_port(out_upstream_port);
+ typedef const struct bt_port_input *(*borrow_input_port_by_index_func_t)(
+ const void *, uint64_t);
+ const struct bt_port *upstream_port =
+ bt_port_output_as_port_const(out_upstream_port);
int ret = 0;
GQuark downstreamp_comp_name_quark;
borrow_input_port_by_index_func_t port_by_index_fn;
enum bt_graph_status status = BT_GRAPH_STATUS_ERROR;
bool insert_trimmer = false;
- struct bt_private_value *trimmer_params = NULL;
+ struct bt_value *trimmer_params = NULL;
char *intersection_begin = NULL;
char *intersection_end = NULL;
- struct bt_component_filter *trimmer = NULL;
- struct bt_component_class_filter *trimmer_class = NULL;
- struct bt_port_input *trimmer_input = NULL;
- struct bt_port_output *trimmer_output = NULL;
+ const struct bt_component_filter *trimmer = NULL;
+ const struct bt_component_class_filter *trimmer_class = NULL;
+ const struct bt_port_input *trimmer_input = NULL;
+ const struct bt_port_output *trimmer_output = NULL;
if (ctx->intersections &&
bt_component_get_class_type(upstream_comp) ==
}
insert_trimmer = true;
- trimmer_params = bt_private_value_map_create();
+ trimmer_params = bt_value_map_create();
if (!trimmer_params) {
goto error;
}
- status = bt_private_value_map_insert_string_entry(
+ status = bt_value_map_insert_string_entry(
trimmer_params, "begin", intersection_begin);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
- status = bt_private_value_map_insert_string_entry(
+ status = bt_value_map_insert_string_entry(
trimmer_params,
"end", intersection_end);
if (status != BT_VALUE_STATUS_OK) {
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;
+ bt_component_filter_borrow_input_port_by_index_const;
if (!downstream_comp) {
downstream_comp = g_hash_table_lookup(ctx->sink_components,
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;
+ bt_component_sink_borrow_input_port_by_index_const;
}
if (!downstream_comp) {
BT_ASSERT(downstream_port_count >= 0);
for (i = 0; i < downstream_port_count; i++) {
- struct bt_port_input *in_downstream_port =
+ const struct bt_port_input *in_downstream_port =
port_by_index_fn(downstream_comp, i);
- struct bt_port *downstream_port =
- bt_port_input_borrow_port(in_downstream_port);
+ const struct bt_port *downstream_port =
+ bt_port_input_as_port_const(in_downstream_port);
const char *upstream_port_name;
const char *downstream_port_name;
ret = 0;
ctx->connect_ports = false;
- graph_status = bt_private_graph_add_filter_component(
+ graph_status = bt_graph_add_filter_component(
ctx->graph, trimmer_class, trimmer_name,
- bt_private_value_borrow_value(trimmer_params),
- &trimmer);
+ trimmer_params, &trimmer);
free(trimmer_name);
if (graph_status != BT_GRAPH_STATUS_OK) {
goto error;
BT_ASSERT(trimmer);
trimmer_input =
- bt_component_filter_borrow_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_borrow_output_port_by_index(
+ bt_component_filter_borrow_output_port_by_index_const(
trimmer, 0);
if (!trimmer_output) {
goto error;
*/
in_downstream_port = trimmer_input;
downstream_port =
- bt_port_input_borrow_port(in_downstream_port);
+ bt_port_input_as_port_const(in_downstream_port);
downstream_port_name = bt_port_get_name(
downstream_port);
BT_ASSERT(downstream_port_name);
}
/* We have a winner! */
- status = bt_private_graph_connect_ports(ctx->graph,
+ status = bt_graph_connect_ports(ctx->graph,
out_upstream_port, in_downstream_port, NULL);
downstream_port = NULL;
switch (status) {
*/
ret = cmd_run_ctx_connect_upstream_port_to_downstream_component(
ctx,
- bt_component_filter_borrow_component(trimmer),
+ bt_component_filter_as_component_const(trimmer),
trimmer_output, cfg_conn);
if (ret) {
goto error;
end:
free(intersection_begin);
free(intersection_end);
- BT_OBJECT_PUT_REF_AND_RESET(trimmer_params);
- BT_OBJECT_PUT_REF_AND_RESET(trimmer_class);
- BT_OBJECT_PUT_REF_AND_RESET(trimmer);
+ 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_output *upstream_port)
+ const struct 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 struct bt_component *upstream_comp = NULL;
size_t i;
BT_ASSERT(ctx);
BT_ASSERT(upstream_port);
upstream_port_name = bt_port_get_name(
- bt_port_output_borrow_port(upstream_port));
+ bt_port_output_as_port_const(upstream_port));
BT_ASSERT(upstream_port_name);
- upstream_comp = bt_port_borrow_component(
- bt_port_output_borrow_port(upstream_port));
+ 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\"",
static
void graph_output_port_added_listener(struct cmd_run_ctx *ctx,
- struct bt_port_output *out_port)
+ const struct bt_port_output *out_port)
{
- struct bt_component *comp;
- struct bt_port *port = bt_port_output_borrow_port(out_port);
+ const struct bt_component *comp;
+ const struct bt_port *port = bt_port_output_as_port_const(out_port);
- comp = bt_port_borrow_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) : "",
static
void graph_source_output_port_added_listener(
- struct bt_component_source *component,
- struct bt_port_output *port, void *data)
+ const struct bt_component_source *component,
+ const struct bt_port_output *port, void *data)
{
graph_output_port_added_listener(data, port);
}
static
void graph_filter_output_port_added_listener(
- struct bt_component_filter *component,
- struct bt_port_output *port, void *data)
+ const struct bt_component_filter *component,
+ const struct bt_port_output *port, void *data)
{
graph_output_port_added_listener(data, port);
}
ctx->intersections = NULL;
}
- BT_OBJECT_PUT_REF_AND_RESET(ctx->graph);
+ BT_GRAPH_PUT_REF_AND_RESET(ctx->graph);
the_graph = NULL;
ctx->cfg = NULL;
}
ctx->cfg = cfg;
ctx->connect_ports = false;
ctx->src_components = g_hash_table_new_full(g_direct_hash,
- g_direct_equal, NULL, bt_object_put_ref);
+ 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, bt_object_put_ref);
+ 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, bt_object_put_ref);
+ g_direct_equal, NULL, (GDestroyNotify) bt_object_put_ref);
if (!ctx->sink_components) {
goto error;
}
}
}
- ctx->graph = bt_private_graph_create();
+ ctx->graph = bt_graph_create();
if (!ctx->graph) {
goto error;
}
the_graph = ctx->graph;
- status = bt_private_graph_add_source_component_output_port_added_listener(
+ 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) {
goto error;
}
- status = bt_private_graph_add_filter_component_output_port_added_listener(
+ 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) {
static
int set_stream_intersections(struct cmd_run_ctx *ctx,
struct bt_config_component *cfg_comp,
- struct bt_component_class_source *src_comp_cls)
+ const struct 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_private_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 struct bt_value *component_path_value = NULL;
+ struct bt_value *query_params = NULL;
+ const struct bt_value *query_result = NULL;
+ const struct bt_value *trace_info = NULL;
+ const struct bt_value *intersection_range = NULL;
+ const struct bt_value *intersection_begin = NULL;
+ const struct bt_value *intersection_end = NULL;
+ const struct bt_value *stream_path_value = NULL;
+ const struct bt_value *stream_paths = NULL;
+ const struct bt_value *stream_infos = NULL;
+ const struct bt_value *stream_info = NULL;
struct port_id *port_id = NULL;
struct trace_range *trace_range = NULL;
const char *fail_reason = NULL;
- struct bt_component_class *comp_cls =
- bt_component_class_source_borrow_component_class(src_comp_cls);
+ const struct 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(
- bt_private_value_borrow_value(cfg_comp->params),
- "path");
+ 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);
}
path = bt_value_string_get(component_path_value);
- query_params = bt_private_value_map_create();
+ query_params = bt_value_map_create();
if (!query_params) {
BT_LOGE_STR("Cannot create query parameters.");
ret = -1;
goto error;
}
- value_status = bt_private_value_map_insert_entry(query_params, "path",
- component_path_value);
+ 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;
}
ret = query(comp_cls, "trace-info",
- bt_private_value_borrow_value(query_params), &query_result,
+ query_params, &query_result,
&fail_reason);
if (ret) {
BT_LOGD("Component class does not support the `trace-info` query: %s: "
uint64_t stream_idx;
int64_t stream_count;
- trace_info = bt_value_array_borrow_element_by_index(
+ 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;
goto error;
}
- intersection_range = bt_value_map_borrow_entry_value(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_borrow_entry_value(
- 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_borrow_entry_value(
- 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;
}
- stream_infos = bt_value_map_borrow_entry_value(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 information from trace in query result.");
trace_range->intersection_range_begin_ns = begin;
trace_range->intersection_range_end_ns = end;
- stream_info = bt_value_array_borrow_element_by_index(
+ 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;
goto error;
}
- stream_paths = bt_value_map_borrow_entry_value(
- 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.");
}
stream_path_value =
- bt_value_array_borrow_element_by_index(
+ bt_value_array_borrow_element_by_index_const(
stream_paths, 0);
if (!stream_path_value ||
!bt_value_is_string(stream_path_value)) {
path ? path : "(unknown)",
bt_common_color_reset());
end:
- bt_object_put_ref(query_params);
- bt_object_put_ref(query_result);
+ bt_value_put_ref(query_params);
+ 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;
- void *comp_cls = NULL;
- void *comp = NULL;
+ const void *comp_cls = NULL;
+ const void *comp = NULL;
int ret = 0;
for (i = 0; i < cfg_components->len; i++) {
switch (cfg_comp->type) {
case BT_COMPONENT_CLASS_TYPE_SOURCE:
- ret = bt_private_graph_add_source_component(ctx->graph,
+ ret = bt_graph_add_source_component(ctx->graph,
comp_cls, cfg_comp->instance_name->str,
- bt_private_value_borrow_value(cfg_comp->params),
+ cfg_comp->params,
(void *) &comp);
break;
case BT_COMPONENT_CLASS_TYPE_FILTER:
- ret = bt_private_graph_add_filter_component(ctx->graph,
+ ret = bt_graph_add_filter_component(ctx->graph,
comp_cls, cfg_comp->instance_name->str,
- bt_private_value_borrow_value(cfg_comp->params),
+ cfg_comp->params,
(void *) &comp);
break;
case BT_COMPONENT_CLASS_TYPE_SINK:
- ret = bt_private_graph_add_sink_component(ctx->graph,
+ ret = bt_graph_add_sink_component(ctx->graph,
comp_cls, cfg_comp->instance_name->str,
- bt_private_value_borrow_value(cfg_comp->params),
+ cfg_comp->params,
(void *) &comp);
break;
default:
switch (cfg_comp->type) {
case BT_COMPONENT_CLASS_TYPE_SOURCE:
g_hash_table_insert(ctx->src_components,
- GUINT_TO_POINTER(quark), comp);
+ GUINT_TO_POINTER(quark), (void *) comp);
break;
case BT_COMPONENT_CLASS_TYPE_FILTER:
g_hash_table_insert(ctx->flt_components,
- GUINT_TO_POINTER(quark), comp);
+ GUINT_TO_POINTER(quark), (void *) comp);
break;
case BT_COMPONENT_CLASS_TYPE_SINK:
g_hash_table_insert(ctx->sink_components,
- GUINT_TO_POINTER(quark), comp);
+ GUINT_TO_POINTER(quark), (void *) comp);
break;
default:
abort();
return ret;
}
-typedef uint64_t (*output_port_count_func_t)(void *);
-typedef struct bt_port_output *(*borrow_output_port_by_index_func_t)(
- void *, uint64_t);
+typedef uint64_t (*output_port_count_func_t)(const void *);
+typedef const struct 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,
BT_ASSERT(count >= 0);
for (i = 0; i < count; i++) {
- struct bt_port_output *upstream_port = port_by_index_fn(comp, i);
+ const struct bt_port_output *upstream_port = port_by_index_fn(comp, i);
BT_ASSERT(upstream_port);
ret = cmd_run_ctx_connect_upstream_port(ctx, upstream_port);
(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);
+ bt_component_source_borrow_output_port_by_index_const);
if (ret) {
goto end;
}
(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);
+ bt_component_filter_borrow_output_port_by_index_const);
if (ret) {
goto end;
}
/* Run the graph */
while (true) {
- enum bt_graph_status graph_status = bt_private_graph_run(ctx.graph);
+ enum bt_graph_status graph_status = bt_graph_run(ctx.graph);
/*
* Reset console in case something messed with console
printf("%s", bt_common_color_reset());
fflush(stdout);
fprintf(stderr, "%s", bt_common_color_reset());
- BT_LOGV("bt_private_graph_run() returned: status=%s",
+ BT_LOGV("bt_graph_run() returned: status=%s",
bt_graph_status_str(graph_status));
switch (graph_status) {
BT_LOGI_STR("Graph was canceled by user.");
goto error;
case BT_GRAPH_STATUS_AGAIN:
- if (bt_graph_is_canceled(
- bt_private_graph_borrow_graph(ctx.graph))) {
+ if (bt_graph_is_canceled(ctx.graph)) {
BT_LOGI_STR("Graph was canceled by user.");
goto error;
}
cfg->cmd_data.run.retry_duration_us);
if (usleep(cfg->cmd_data.run.retry_duration_us)) {
- if (bt_graph_is_canceled(
- bt_private_graph_borrow_graph(ctx.graph))) {
+ if (bt_graph_is_canceled(ctx.graph)) {
BT_LOGI_STR("Graph was canceled by user.");
goto error;
}
print_cfg(cfg);
if (cfg->command_needs_plugins) {
- ret = load_all_plugins(
- bt_private_value_borrow_value(cfg->plugin_paths));
+ ret = load_all_plugins(cfg->plugin_paths);
if (ret) {
BT_LOGE("Failed to load plugins: ret=%d", ret);
retcode = 1;
projects / babeltrace.git / blobdiff