* SOFTWARE.
*/
-#define BT_LOG_TAG "GRAPH"
+#define BT_LOG_TAG "LIB/GRAPH"
#include "lib/lib-logging.h"
#include "common/assert.h"
* step 4 goes from 1 to 2, and from 2 to 1 at step 6. This
* ensures that this function is not called two times.
*/
- BT_LIB_LOGD("Destroying graph: %!+g", graph);
+ BT_LIB_LOGI("Destroying graph: %!+g", graph);
obj->ref_count++;
/*
struct bt_graph *graph;
int ret;
- BT_LOGD_STR("Creating graph object.");
+ BT_LOGI_STR("Creating graph object.");
graph = g_new0(struct bt_graph, 1);
if (!graph) {
BT_LOGE_STR("Failed to allocate one graph.");
graph->messages = g_ptr_array_new_with_free_func(
(GDestroyNotify) notify_message_graph_is_destroyed);
- BT_LIB_LOGD("Created graph object: %!+g", graph);
+ BT_LIB_LOGI("Created graph object: %!+g", graph);
end:
return (void *) graph;
"Downstream port does not belong to a component: %!+p",
downstream_port);
init_can_consume = graph->can_consume;
- BT_LIB_LOGD("Connecting component ports within graph: "
+ BT_LIB_LOGI("Connecting component ports within graph: "
"%![graph-]+g, %![up-port-]+p, %![down-port-]+p",
graph, upstream_port, downstream_port);
bt_graph_set_can_consume(graph, false);
}
connection->notified_graph_ports_connected = true;
- BT_LIB_LOGD("Connected component ports within graph: "
+ BT_LIB_LOGI("Connected component ports within graph: "
"%![graph-]+g, %![up-comp-]+c, %![down-comp-]+c, "
"%![up-port-]+p, %![down-port-]+p",
graph, upstream_component, downstream_component,
goto end;
}
- BT_LIB_LOGV("Consumed from sink: %![comp-]+c, status=%s",
+ BT_LIB_LOGD("Consumed from sink: %![comp-]+c, status=%s",
comp, bt_self_component_status_string(comp_status));
end:
sink = node->data;
status = consume_graph_sink(sink);
- if (unlikely(status != BT_GRAPH_STATUS_END)) {
+ if (G_UNLIKELY(status != BT_GRAPH_STATUS_END)) {
g_queue_push_tail_link(graph->sinks_to_consume, node);
goto end;
}
}
end:
- BT_LIB_LOGV("Consumed sink node: %![comp-]+c, status=%s",
+ BT_LIB_LOGD("Consumed sink node: %![comp-]+c, status=%s",
sink, bt_graph_status_string(status));
return status;
}
GList *sink_node;
int index;
- BT_LIB_LOGV("Making specific sink consume: %![comp-]+c", sink);
+ BT_LIB_LOGD("Making specific sink consume: %![comp-]+c", sink);
BT_ASSERT(bt_component_borrow_graph((void *) sink) == graph);
if (g_queue_is_empty(graph->sinks_to_consume)) {
- BT_LOGV_STR("Graph's sink queue is empty: end of graph.");
+ BT_LOGD_STR("Graph's sink queue is empty: end of graph.");
status = BT_GRAPH_STATUS_END;
goto end;
}
index = g_queue_index(graph->sinks_to_consume, sink);
if (index < 0) {
- BT_LOGV_STR("Sink is not marked as consumable: sink is ended.");
+ BT_LIB_LOGD("Sink component is not marked as consumable: "
+ "component sink is ended: %![comp-]+c", sink);
status = BT_GRAPH_STATUS_END;
goto end;
}
BT_ASSERT_PRE(graph->has_sink,
"Graph has no sink component: %!+g", graph);
- BT_LIB_LOGV("Making next sink consume: %![graph-]+g", graph);
+ BT_LIB_LOGD("Making next sink component consume: %![graph-]+g", graph);
- if (unlikely(g_queue_is_empty(graph->sinks_to_consume))) {
- BT_LOGV_STR("Graph's sink queue is empty: end of graph.");
+ if (G_UNLIKELY(g_queue_is_empty(graph->sinks_to_consume))) {
+ BT_LOGD_STR("Graph's sink queue is empty: end of graph.");
status = BT_GRAPH_STATUS_END;
goto end;
}
current_node = g_queue_pop_head_link(graph->sinks_to_consume);
sink = current_node->data;
- BT_LIB_LOGV("Chose next sink to consume: %!+c", sink);
+ BT_LIB_LOGD("Chose next sink to consume: %!+c", sink);
status = consume_sink_node(graph, current_node);
end:
"Graph is in a faulty state: %!+g", graph);
bt_graph_set_can_consume(graph, false);
status = bt_graph_configure(graph);
- if (unlikely(status)) {
+ if (G_UNLIKELY(status)) {
/* bt_graph_configure() logs errors */
goto end;
}
"Graph is in a faulty state: %!+g", graph);
bt_graph_set_can_consume(graph, false);
status = bt_graph_configure(graph);
- if (unlikely(status)) {
+ if (G_UNLIKELY(status)) {
/* bt_graph_configure() logs errors */
goto end;
}
- BT_LIB_LOGV("Running graph: %!+g", graph);
+ BT_LIB_LOGI("Running graph: %!+g", graph);
do {
/*
* signal handler, this is not a warning nor an error,
* it was intentional: log with a DEBUG level only.
*/
- if (unlikely(graph->canceled)) {
- BT_LIB_LOGD("Stopping the graph: graph is canceled: "
+ if (G_UNLIKELY(graph->canceled)) {
+ BT_LIB_LOGI("Stopping the graph: graph is canceled: "
"%!+g", graph);
status = BT_GRAPH_STATUS_CANCELED;
goto end;
}
status = consume_no_check(graph);
- if (unlikely(status == BT_GRAPH_STATUS_AGAIN)) {
+ if (G_UNLIKELY(status == BT_GRAPH_STATUS_AGAIN)) {
/*
* If AGAIN is received and there are multiple
* sinks, go ahead and consume from the next
}
end:
- BT_LIB_LOGV("Graph ran: %![graph-]+g, status=%s", graph,
+ BT_LIB_LOGI("Graph ran: %![graph-]+g, status=%s", graph,
bt_graph_status_string(status));
bt_graph_set_can_consume(graph, true);
return status;
"%!+g", graph);
g_array_append_val(graph->listeners.source_output_port_added, listener);
listener_id = graph->listeners.source_output_port_added->len - 1;
- BT_LIB_LOGV("Added \"source component output port added\" listener to graph: "
+ BT_LIB_LOGD("Added \"source component output port added\" listener to graph: "
"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
listener_id);
"%!+g", graph);
g_array_append_val(graph->listeners.filter_output_port_added, listener);
listener_id = graph->listeners.filter_output_port_added->len - 1;
- BT_LIB_LOGV("Added \"filter component output port added\" listener to graph: "
+ BT_LIB_LOGD("Added \"filter component output port added\" listener to graph: "
"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
listener_id);
"%!+g", graph);
g_array_append_val(graph->listeners.filter_input_port_added, listener);
listener_id = graph->listeners.filter_input_port_added->len - 1;
- BT_LIB_LOGV("Added \"filter component input port added\" listener to graph: "
+ BT_LIB_LOGD("Added \"filter component input port added\" listener to graph: "
"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
listener_id);
"%!+g", graph);
g_array_append_val(graph->listeners.sink_input_port_added, listener);
listener_id = graph->listeners.sink_input_port_added->len - 1;
- BT_LIB_LOGV("Added \"sink component input port added\" listener to graph: "
+ BT_LIB_LOGD("Added \"sink component input port added\" listener to graph: "
"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
listener_id);
g_array_append_val(graph->listeners.source_filter_ports_connected,
listener);
listener_id = graph->listeners.source_filter_ports_connected->len - 1;
- BT_LIB_LOGV("Added \"source to filter component ports connected\" listener to graph: "
+ BT_LIB_LOGD("Added \"source to filter component ports connected\" listener to graph: "
"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
listener_id);
g_array_append_val(graph->listeners.source_sink_ports_connected,
listener);
listener_id = graph->listeners.source_sink_ports_connected->len - 1;
- BT_LIB_LOGV("Added \"source to sink component ports connected\" listener to graph: "
+ BT_LIB_LOGD("Added \"source to sink component ports connected\" listener to graph: "
"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
listener_id);
g_array_append_val(graph->listeners.filter_filter_ports_connected,
listener);
listener_id = graph->listeners.filter_filter_ports_connected->len - 1;
- BT_LIB_LOGV("Added \"filter to filter component ports connected\" listener to graph: "
+ BT_LIB_LOGD("Added \"filter to filter component ports connected\" listener to graph: "
"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
listener_id);
g_array_append_val(graph->listeners.filter_sink_ports_connected,
listener);
listener_id = graph->listeners.filter_sink_ports_connected->len - 1;
- BT_LIB_LOGV("Added \"filter to sink component ports connected\" listener to graph: "
+ BT_LIB_LOGD("Added \"filter to sink component ports connected\" listener to graph: "
"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
listener_id);
BT_ASSERT(graph);
BT_ASSERT(port);
- BT_LIB_LOGV("Notifying graph listeners that a port was added: "
+ BT_LIB_LOGD("Notifying graph listeners that a port was added: "
"%![graph-]+g, %![port-]+p", graph, port);
comp = bt_port_borrow_component_inline(port);
BT_ASSERT(comp);
BT_ASSERT(graph);
BT_ASSERT(upstream_port);
BT_ASSERT(downstream_port);
- BT_LIB_LOGV("Notifying graph listeners that ports were connected: "
+ BT_LIB_LOGD("Notifying graph listeners that ports were connected: "
"%![graph-]+g, %![up-port-]+p, %![down-port-]+p",
graph, upstream_port, downstream_port);
upstream_comp = bt_port_borrow_component_inline(upstream_port);
BT_ASSERT_PRE_NON_NULL(graph, "Graph");
graph->canceled = true;
- BT_LIB_LOGV("Canceled graph: %!+i", graph);
+ BT_LIB_LOGI("Canceled graph: %!+i", graph);
return BT_GRAPH_STATUS_OK;
}
{
BT_ASSERT(graph);
BT_ASSERT(connection);
- BT_LIB_LOGV("Removing graph's connection: %![graph-]+g, %![conn-]+x",
+ BT_LIB_LOGD("Removing graph's connection: %![graph-]+g, %![conn-]+x",
graph, connection);
g_ptr_array_remove(graph->connections, connection);
}
"Parameter value is not a map value: %!+v", params);
init_can_consume = graph->can_consume;
bt_graph_set_can_consume(graph, false);
- BT_LIB_LOGD("Adding component to graph: "
+ 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);
if (!params) {
new_params = bt_value_map_create();
if (!new_params) {
- BT_LOGE_STR("Cannot create map value object.");
+ BT_LOGE_STR("Cannot create empty map value object.");
graph_status = BT_GRAPH_STATUS_NOMEM;
goto end;
}
*/
BT_LOGD_STR("Freezing component class.");
bt_component_class_freeze(comp_cls);
- BT_LIB_LOGD("Added component to graph: "
+ 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);