*/
#define BT_LOG_TAG "LIB/GRAPH"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
#include "common/assert.h"
#include "lib/assert-pre.h"
downstream_component = bt_port_borrow_component_inline(
(void *) downstream_port);
- /*
- * At this point the ports are not connected yet. Both
- * components need to accept an eventual connection to their
- * port by the other port before we continue.
- */
- BT_LIB_LOGD("Asking upstream component to accept the connection: "
- "%![comp-]+c", upstream_component);
- component_status = bt_component_accept_port_connection(
- upstream_component, (void *) upstream_port,
- (void *) downstream_port);
- if (component_status != BT_SELF_COMPONENT_STATUS_OK) {
- if (component_status == BT_SELF_COMPONENT_STATUS_REFUSE_PORT_CONNECTION) {
- BT_LOGD_STR("Upstream component refused the connection.");
- } else {
- BT_LOGW("Cannot ask upstream component to accept the connection: "
- "status=%s", bt_self_component_status_string(component_status));
- }
-
- status = (int) component_status;
- goto end;
- }
-
- BT_LIB_LOGD("Asking downstream component to accept the connection: "
- "%![comp-]+c", downstream_component);
- component_status = bt_component_accept_port_connection(
- downstream_component, (void *) downstream_port,
- (void *) upstream_port);
- if (component_status != BT_SELF_COMPONENT_STATUS_OK) {
- if (component_status == BT_SELF_COMPONENT_STATUS_REFUSE_PORT_CONNECTION) {
- BT_LOGD_STR("Downstream component refused the connection.");
- } else {
- BT_LOGW("Cannot ask downstream component to accept the connection: "
- "status=%s", bt_self_component_status_string(component_status));
- }
-
- status = (int) component_status;
- goto end;
- }
-
BT_LOGD_STR("Creating connection.");
connection = bt_connection_create(graph, (void *) upstream_port,
(void *) downstream_port);
struct bt_component_class *comp_cls,
comp_init_method_t init_method,
const char *name, const struct bt_value *params,
- void *init_method_data, struct bt_component **user_component)
+ void *init_method_data, bt_logging_level log_level,
+ struct bt_component **user_component)
{
enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
enum bt_self_component_status comp_status;
init_can_consume = graph->can_consume;
bt_graph_set_can_consume(graph, false);
BT_LIB_LOGI("Adding component to graph: "
- "%![graph-]+g, %![cc-]+C, name=\"%s\", %![params-]+v, "
- "init-method-data-addr=%p",
- graph, comp_cls, name, params, init_method_data);
+ "%![graph-]+g, %![cc-]+C, name=\"%s\", log-level=%s, "
+ "%![params-]+v, init-method-data-addr=%p",
+ graph, comp_cls, name,
+ bt_common_logging_level_string(log_level), params,
+ init_method_data);
if (!params) {
new_params = bt_value_map_create();
params = new_params;
}
- ret = bt_component_create(comp_cls, name, &component);
+ ret = bt_component_create(comp_cls, name, log_level, &component);
if (ret) {
BT_LOGE("Cannot create empty component object: ret=%d",
ret);
BT_LOGD_STR("Freezing component class.");
bt_component_class_freeze(comp_cls);
BT_LIB_LOGI("Added component to graph: "
- "%![graph-]+g, %![cc-]+C, name=\"%s\", %![params-]+v, "
- "init-method-data-addr=%p, %![comp-]+c",
- graph, comp_cls, name, params, init_method_data, component);
+ "%![graph-]+g, %![cc-]+C, name=\"%s\", log-level=%s, "
+ "%![params-]+v, init-method-data-addr=%p, %![comp-]+c",
+ graph, comp_cls, name,
+ bt_common_logging_level_string(log_level), params,
+ init_method_data, component);
if (user_component) {
/* Move reference to user */
struct bt_graph *graph,
const struct bt_component_class_source *comp_cls,
const char *name, const struct bt_value *params,
- void *init_method_data,
+ void *init_method_data, bt_logging_level log_level,
const struct bt_component_source **component)
{
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
- name, params, init_method_data, (void *) component);
+ name, params, init_method_data, log_level, (void *) component);
}
enum bt_graph_status bt_graph_add_source_component(
struct bt_graph *graph,
const struct bt_component_class_source *comp_cls,
const char *name, const struct bt_value *params,
+ bt_logging_level log_level,
const struct bt_component_source **component)
{
return bt_graph_add_source_component_with_init_method_data(
- graph, comp_cls, name, params, NULL, component);
+ graph, comp_cls, name, params, NULL, log_level, component);
}
enum bt_graph_status
struct bt_graph *graph,
const struct bt_component_class_filter *comp_cls,
const char *name, const struct bt_value *params,
- void *init_method_data,
+ void *init_method_data, bt_logging_level log_level,
const struct bt_component_filter **component)
{
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
- name, params, init_method_data, (void *) component);
+ name, params, init_method_data, log_level, (void *) component);
}
enum bt_graph_status bt_graph_add_filter_component(
struct bt_graph *graph,
const struct bt_component_class_filter *comp_cls,
const char *name, const struct bt_value *params,
+ bt_logging_level log_level,
const struct bt_component_filter **component)
{
return bt_graph_add_filter_component_with_init_method_data(
- graph, comp_cls, name, params, NULL, component);
+ graph, comp_cls, name, params, NULL, log_level, component);
}
enum bt_graph_status
struct bt_graph *graph,
const struct bt_component_class_sink *comp_cls,
const char *name, const struct bt_value *params,
- void *init_method_data,
+ void *init_method_data, bt_logging_level log_level,
const struct bt_component_sink **component)
{
BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
return add_component_with_init_method_data(graph,
(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
- name, params, init_method_data, (void *) component);
+ name, params, init_method_data, log_level, (void *) component);
}
enum bt_graph_status bt_graph_add_sink_component(
struct bt_graph *graph,
const struct bt_component_class_sink *comp_cls,
const char *name, const struct bt_value *params,
+ bt_logging_level log_level,
const struct bt_component_sink **component)
{
return bt_graph_add_sink_component_with_init_method_data(
- graph, comp_cls, name, params, NULL, component);
+ graph, comp_cls, name, params, NULL, log_level, component);
}
BT_HIDDEN
projects / babeltrace.git / blobdiff