X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fgraph.c;h=af6b2b2dc804a973d1ce6540e9013744cc4017bf;hb=1e92035335352f8a67cbc3de28a0ad44b7ee02a1;hp=72e575534087fbae47e5eb17396084de2a55c009;hpb=91d8147391efdc4d42cc4e1c171a65c0372a008f;p=babeltrace.git diff --git a/src/lib/graph/graph.c b/src/lib/graph/graph.c index 72e57553..af6b2b2d 100644 --- a/src/lib/graph/graph.c +++ b/src/lib/graph/graph.c @@ -21,11 +21,12 @@ * SOFTWARE. */ -#define BT_LOG_TAG "GRAPH" -#include "lib/lib-logging.h" +#define BT_LOG_TAG "LIB/GRAPH" +#include "lib/logging.h" #include "common/assert.h" #include "lib/assert-pre.h" +#include "lib/assert-post.h" #include #include #include @@ -48,15 +49,16 @@ #include "message/event.h" #include "message/packet.h" -typedef enum bt_graph_listener_status (*port_added_func_t)( - const void *, const void *, void *); +typedef enum bt_graph_listener_func_status +(*port_added_func_t)(const void *, const void *, void *); -typedef enum bt_graph_listener_status (*ports_connected_func_t)( - const void *, const void *, const void *, const void *, void *); - -typedef enum bt_self_component_status (*comp_init_method_t)(const void *, +typedef enum bt_graph_listener_func_status +(*ports_connected_func_t)(const void *, const void *, const void *, const void *, void *); +typedef enum bt_component_class_init_method_status +(*comp_init_method_t)(const void *, const void *, void *); + struct bt_graph_listener { bt_graph_listener_removed_func removed; void *data; @@ -76,7 +78,8 @@ struct bt_graph_listener_ports_connected { do { \ _listeners = g_array_new(FALSE, TRUE, sizeof(_type)); \ if (!(_listeners)) { \ - BT_LOGE_STR("Failed to allocate one GArray."); \ + BT_LIB_LOGE_APPEND_CAUSE( \ + "Failed to allocate one GArray."); \ } \ } while (0) @@ -128,7 +131,7 @@ void destroy_graph(struct bt_object *obj) * 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++; /* @@ -259,10 +262,10 @@ struct bt_graph *bt_graph_create(void) 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."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one graph."); goto end; } @@ -270,18 +273,18 @@ struct bt_graph *bt_graph_create(void) graph->connections = g_ptr_array_new_with_free_func( (GDestroyNotify) bt_object_try_spec_release); if (!graph->connections) { - BT_LOGE_STR("Failed to allocate one GPtrArray."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray."); goto error; } graph->components = g_ptr_array_new_with_free_func( (GDestroyNotify) bt_object_try_spec_release); if (!graph->components) { - BT_LOGE_STR("Failed to allocate one GPtrArray."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray."); goto error; } graph->sinks_to_consume = g_queue_new(); if (!graph->sinks_to_consume) { - BT_LOGE_STR("Failed to allocate one GQueue."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GQueue."); goto error; } @@ -355,7 +358,8 @@ struct bt_graph *bt_graph_create(void) (bt_object_pool_destroy_object_func) destroy_message_event, graph); if (ret) { - BT_LOGE("Failed to initialize event message pool: ret=%d", + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to initialize event message pool: ret=%d", ret); goto error; } @@ -365,7 +369,8 @@ struct bt_graph *bt_graph_create(void) (bt_object_pool_destroy_object_func) destroy_message_packet_begin, graph); if (ret) { - BT_LOGE("Failed to initialize packet beginning message pool: ret=%d", + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to initialize packet beginning message pool: ret=%d", ret); goto error; } @@ -375,14 +380,15 @@ struct bt_graph *bt_graph_create(void) (bt_object_pool_destroy_object_func) destroy_message_packet_end, graph); if (ret) { - BT_LOGE("Failed to initialize packet end message pool: ret=%d", + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to initialize packet end message pool: ret=%d", ret); goto error; } 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; @@ -392,20 +398,20 @@ error: goto end; } -enum bt_graph_status bt_graph_connect_ports( +enum bt_graph_connect_ports_status bt_graph_connect_ports( struct bt_graph *graph, const struct bt_port_output *upstream_port_out, const struct bt_port_input *downstream_port_in, const struct bt_connection **user_connection) { - enum bt_graph_status status = BT_GRAPH_STATUS_OK; - enum bt_graph_listener_status listener_status; + enum bt_graph_connect_ports_status status = BT_FUNC_STATUS_OK; + enum bt_graph_listener_func_status listener_status; struct bt_connection *connection = NULL; struct bt_port *upstream_port = (void *) upstream_port_out; struct bt_port *downstream_port = (void *) downstream_port_in; struct bt_component *upstream_component = NULL; struct bt_component *downstream_component = NULL; - enum bt_self_component_status component_status; + enum bt_component_class_port_connected_method_status port_connected_status; bool init_can_consume; BT_ASSERT_PRE_NON_NULL(graph, "Graph"); @@ -426,7 +432,7 @@ enum bt_graph_status bt_graph_connect_ports( "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); @@ -435,51 +441,12 @@ enum bt_graph_status bt_graph_connect_ports( 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); if (!connection) { - BT_LOGW("Cannot create connection object."); - status = BT_GRAPH_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE("Cannot create connection object."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } @@ -496,17 +463,22 @@ enum bt_graph_status bt_graph_connect_ports( */ BT_LIB_LOGD("Notifying upstream component that its port is connected: " "%![comp-]+c, %![port-]+p", upstream_component, upstream_port); - component_status = bt_component_port_connected(upstream_component, + port_connected_status = bt_component_port_connected(upstream_component, (void *) upstream_port, (void *) downstream_port); - if (component_status != BT_SELF_COMPONENT_STATUS_OK) { - BT_LIB_LOGW("Error while notifying upstream component that its port is connected: " - "status=%s, %![graph-]+g, %![up-comp-]+c, " - "%![down-comp-]+c, %![up-port-]+p, %![down-port-]+p", - bt_self_component_status_string(component_status), - graph, upstream_component, downstream_component, - upstream_port, downstream_port); + if (port_connected_status != BT_FUNC_STATUS_OK) { + if (port_connected_status < 0) { + BT_LIB_LOGW_APPEND_CAUSE( + "Upstream component's \"port connected\" method failed: " + "status=%s, %![graph-]+g, %![up-comp-]+c, " + "%![down-comp-]+c, %![up-port-]+p, %![down-port-]+p", + bt_common_func_status_string( + port_connected_status), + graph, upstream_component, downstream_component, + upstream_port, downstream_port); + } + bt_connection_end(connection, true); - status = (int) component_status; + status = (int) port_connected_status; goto end; } @@ -514,17 +486,22 @@ enum bt_graph_status bt_graph_connect_ports( BT_LIB_LOGD("Notifying downstream component that its port is connected: " "%![comp-]+c, %![port-]+p", downstream_component, downstream_port); - component_status = bt_component_port_connected(downstream_component, + port_connected_status = bt_component_port_connected(downstream_component, (void *) downstream_port, (void *) upstream_port); - if (component_status != BT_SELF_COMPONENT_STATUS_OK) { - BT_LIB_LOGW("Error while notifying downstream component that its port is connected: " - "status=%s, %![graph-]+g, %![up-comp-]+c, " - "%![down-comp-]+c, %![up-port-]+p, %![down-port-]+p", - bt_self_component_status_string(component_status), - graph, upstream_component, downstream_component, - upstream_port, downstream_port); + if (port_connected_status != BT_FUNC_STATUS_OK) { + if (port_connected_status < 0) { + BT_LIB_LOGW_APPEND_CAUSE( + "Downstream component's \"port connected\" method failed: " + "status=%s, %![graph-]+g, %![up-comp-]+c, " + "%![down-comp-]+c, %![up-port-]+p, %![down-port-]+p", + bt_common_func_status_string( + port_connected_status), + graph, upstream_component, downstream_component, + upstream_port, downstream_port); + } + bt_connection_end(connection, true); - status = (int) component_status; + status = (int) port_connected_status; goto end; } @@ -535,13 +512,23 @@ enum bt_graph_status bt_graph_connect_ports( */ BT_LOGD_STR("Notifying graph's user that new component ports are connected."); listener_status = bt_graph_notify_ports_connected(graph, upstream_port, downstream_port); - if (listener_status != BT_GRAPH_LISTENER_STATUS_OK) { + if (listener_status != BT_FUNC_STATUS_OK) { + if (listener_status < 0) { + BT_LIB_LOGW_APPEND_CAUSE( + "Graph \"ports connected\" listener failed: " + "status=%d, %![graph-]+g, %![up-comp-]+c, " + "%![down-comp-]+c, %![up-port-]+p, %![down-port-]+p", + listener_status, graph, + upstream_component, downstream_component, + upstream_port, downstream_port); + } + status = (int) listener_status; goto end; } 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, @@ -554,7 +541,7 @@ enum bt_graph_status bt_graph_connect_ports( } end: - if (status != BT_GRAPH_STATUS_OK) { + if (status != BT_FUNC_STATUS_OK) { bt_graph_make_faulty(graph); } @@ -565,35 +552,42 @@ end: } static inline -enum bt_graph_status consume_graph_sink(struct bt_component_sink *comp) +int consume_graph_sink(struct bt_component_sink *comp) { - enum bt_self_component_status comp_status; + enum bt_component_class_sink_consume_method_status consume_status; struct bt_component_class_sink *sink_class = NULL; BT_ASSERT(comp); sink_class = (void *) comp->parent.class; BT_ASSERT(sink_class->methods.consume); BT_LIB_LOGD("Calling user's consume method: %!+c", comp); - comp_status = sink_class->methods.consume((void *) comp); + consume_status = sink_class->methods.consume((void *) comp); BT_LOGD("User method returned: status=%s", - bt_self_component_status_string(comp_status)); - BT_ASSERT_PRE(comp_status == BT_SELF_COMPONENT_STATUS_OK || - comp_status == BT_SELF_COMPONENT_STATUS_END || - comp_status == BT_SELF_COMPONENT_STATUS_AGAIN || - comp_status == BT_SELF_COMPONENT_STATUS_ERROR || - comp_status == BT_SELF_COMPONENT_STATUS_NOMEM, + bt_common_func_status_string(consume_status)); + BT_ASSERT_POST_DEV(consume_status == BT_FUNC_STATUS_OK || + consume_status == BT_FUNC_STATUS_END || + consume_status == BT_FUNC_STATUS_AGAIN || + consume_status == BT_FUNC_STATUS_ERROR || + consume_status == BT_FUNC_STATUS_MEMORY_ERROR, "Invalid component status returned by consuming method: " - "status=%s", bt_self_component_status_string(comp_status)); - if (comp_status < 0) { - BT_LOGW_STR("Consume method failed."); + "status=%s", bt_common_func_status_string(consume_status)); + if (consume_status) { + if (consume_status < 0) { + BT_LIB_LOGW_APPEND_CAUSE( + "Component's \"consume\" method failed: " + "status=%s, %![comp-]+c", + bt_common_func_status_string(consume_status), + comp); + } + goto end; } - BT_LIB_LOGV("Consumed from sink: %![comp-]+c, status=%s", - comp, bt_self_component_status_string(comp_status)); + BT_LIB_LOGD("Consumed from sink: %![comp-]+c, status=%s", + comp, bt_common_func_status_string(consume_status)); end: - return (int) comp_status; + return consume_status; } /* @@ -602,14 +596,14 @@ end: * still something to consume afterwards. */ static inline -enum bt_graph_status consume_sink_node(struct bt_graph *graph, GList *node) +int consume_sink_node(struct bt_graph *graph, GList *node) { - enum bt_graph_status status; + int status; struct bt_component_sink *sink; sink = node->data; status = consume_graph_sink(sink); - if (G_UNLIKELY(status != BT_GRAPH_STATUS_END)) { + if (G_UNLIKELY(status != BT_FUNC_STATUS_END)) { g_queue_push_tail_link(graph->sinks_to_consume, node); goto end; } @@ -619,37 +613,38 @@ enum bt_graph_status consume_sink_node(struct bt_graph *graph, GList *node) /* Don't forward an END status if there are sinks left to consume. */ if (!g_queue_is_empty(graph->sinks_to_consume)) { - status = BT_GRAPH_STATUS_OK; + status = BT_FUNC_STATUS_OK; goto end; } end: - BT_LIB_LOGV("Consumed sink node: %![comp-]+c, status=%s", - sink, bt_graph_status_string(status)); + BT_LIB_LOGD("Consumed sink node: %![comp-]+c, status=%s", + sink, bt_common_func_status_string(status)); return status; } BT_HIDDEN -enum bt_graph_status bt_graph_consume_sink_no_check(struct bt_graph *graph, +int bt_graph_consume_sink_no_check(struct bt_graph *graph, struct bt_component_sink *sink) { - enum bt_graph_status status; + int 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."); - status = BT_GRAPH_STATUS_END; + BT_LOGD_STR("Graph's sink queue is empty: end of graph."); + status = BT_FUNC_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."); - status = BT_GRAPH_STATUS_END; + BT_LIB_LOGD("Sink component is not marked as consumable: " + "component sink is ended: %![comp-]+c", sink); + status = BT_FUNC_STATUS_END; goto end; } @@ -662,40 +657,41 @@ end: } static inline -enum bt_graph_status consume_no_check(struct bt_graph *graph) +int consume_no_check(struct bt_graph *graph) { - enum bt_graph_status status = BT_GRAPH_STATUS_OK; + int status = BT_FUNC_STATUS_OK; struct bt_component *sink; GList *current_node; - BT_ASSERT_PRE(graph->has_sink, + BT_ASSERT_PRE_DEV(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 (G_UNLIKELY(g_queue_is_empty(graph->sinks_to_consume))) { - BT_LOGV_STR("Graph's sink queue is empty: end of graph."); - status = BT_GRAPH_STATUS_END; + BT_LOGD_STR("Graph's sink queue is empty: end of graph."); + status = BT_FUNC_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: return status; } -enum bt_graph_status bt_graph_consume(struct bt_graph *graph) +enum bt_graph_consume_status bt_graph_consume(struct bt_graph *graph) { - enum bt_graph_status status; + enum bt_graph_consume_status status; - BT_ASSERT_PRE_NON_NULL(graph, "Graph"); - BT_ASSERT_PRE(!graph->canceled, "Graph is canceled: %!+g", graph); - BT_ASSERT_PRE(graph->can_consume, + BT_ASSERT_PRE_DEV_NON_NULL(graph, "Graph"); + BT_ASSERT_PRE_DEV(!graph->canceled, "Graph is canceled: %!+g", graph); + BT_ASSERT_PRE_DEV(graph->can_consume, "Cannot consume graph in its current state: %!+g", graph); - BT_ASSERT_PRE(graph->config_state != BT_GRAPH_CONFIGURATION_STATE_FAULTY, + BT_ASSERT_PRE_DEV(graph->config_state != + BT_GRAPH_CONFIGURATION_STATE_FAULTY, "Graph is in a faulty state: %!+g", graph); bt_graph_set_can_consume(graph, false); status = bt_graph_configure(graph); @@ -711,9 +707,9 @@ end: return status; } -enum bt_graph_status bt_graph_run(struct bt_graph *graph) +enum bt_graph_run_status bt_graph_run(struct bt_graph *graph) { - enum bt_graph_status status; + enum bt_graph_run_status status; BT_ASSERT_PRE_NON_NULL(graph, "Graph"); BT_ASSERT_PRE(!graph->canceled, "Graph is canceled: %!+g", graph); @@ -728,7 +724,7 @@ enum bt_graph_status bt_graph_run(struct bt_graph *graph) goto end; } - BT_LIB_LOGV("Running graph: %!+g", graph); + BT_LIB_LOGI("Running graph: %!+g", graph); do { /* @@ -738,14 +734,14 @@ enum bt_graph_status bt_graph_run(struct bt_graph *graph) * it was intentional: log with a DEBUG level only. */ if (G_UNLIKELY(graph->canceled)) { - BT_LIB_LOGD("Stopping the graph: graph is canceled: " + BT_LIB_LOGI("Stopping the graph: graph is canceled: " "%!+g", graph); - status = BT_GRAPH_STATUS_CANCELED; + status = BT_FUNC_STATUS_CANCELED; goto end; } status = consume_no_check(graph); - if (G_UNLIKELY(status == BT_GRAPH_STATUS_AGAIN)) { + if (G_UNLIKELY(status == BT_FUNC_STATUS_AGAIN)) { /* * If AGAIN is received and there are multiple * sinks, go ahead and consume from the next @@ -758,23 +754,23 @@ enum bt_graph_status bt_graph_run(struct bt_graph *graph) * sleep for an arbitrary amount of time. */ if (graph->sinks_to_consume->length > 1) { - status = BT_GRAPH_STATUS_OK; + status = BT_FUNC_STATUS_OK; } } - } while (status == BT_GRAPH_STATUS_OK); + } while (status == BT_FUNC_STATUS_OK); if (g_queue_is_empty(graph->sinks_to_consume)) { - status = BT_GRAPH_STATUS_END; + status = BT_FUNC_STATUS_END; } end: - BT_LIB_LOGV("Graph ran: %![graph-]+g, status=%s", graph, - bt_graph_status_string(status)); + BT_LIB_LOGI("Graph ran: %![graph-]+g, status=%s", graph, + bt_common_func_status_string(status)); bt_graph_set_can_consume(graph, true); return status; } -enum bt_graph_status +enum bt_graph_add_listener_status bt_graph_add_source_component_output_port_added_listener( struct bt_graph *graph, bt_graph_source_component_output_port_added_listener_func func, @@ -798,7 +794,7 @@ bt_graph_add_source_component_output_port_added_listener( "%!+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); @@ -806,10 +802,10 @@ bt_graph_add_source_component_output_port_added_listener( *out_listener_id = listener_id; } - return BT_GRAPH_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_graph_status +enum bt_graph_add_listener_status bt_graph_add_filter_component_output_port_added_listener( struct bt_graph *graph, bt_graph_filter_component_output_port_added_listener_func func, @@ -833,7 +829,7 @@ bt_graph_add_filter_component_output_port_added_listener( "%!+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); @@ -841,10 +837,10 @@ bt_graph_add_filter_component_output_port_added_listener( *out_listener_id = listener_id; } - return BT_GRAPH_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_graph_status +enum bt_graph_add_listener_status bt_graph_add_filter_component_input_port_added_listener( struct bt_graph *graph, bt_graph_filter_component_input_port_added_listener_func func, @@ -868,7 +864,7 @@ bt_graph_add_filter_component_input_port_added_listener( "%!+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); @@ -876,10 +872,10 @@ bt_graph_add_filter_component_input_port_added_listener( *out_listener_id = listener_id; } - return BT_GRAPH_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_graph_status +enum bt_graph_add_listener_status bt_graph_add_sink_component_input_port_added_listener( struct bt_graph *graph, bt_graph_sink_component_input_port_added_listener_func func, @@ -903,7 +899,7 @@ bt_graph_add_sink_component_input_port_added_listener( "%!+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); @@ -911,10 +907,10 @@ bt_graph_add_sink_component_input_port_added_listener( *out_listener_id = listener_id; } - return BT_GRAPH_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_graph_status +enum bt_graph_add_listener_status bt_graph_add_source_filter_component_ports_connected_listener( struct bt_graph *graph, bt_graph_source_filter_component_ports_connected_listener_func func, @@ -939,7 +935,7 @@ bt_graph_add_source_filter_component_ports_connected_listener( 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); @@ -947,10 +943,10 @@ bt_graph_add_source_filter_component_ports_connected_listener( *out_listener_id = listener_id; } - return BT_GRAPH_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_graph_status +enum bt_graph_add_listener_status bt_graph_add_source_sink_component_ports_connected_listener( struct bt_graph *graph, bt_graph_source_sink_component_ports_connected_listener_func func, @@ -975,7 +971,7 @@ bt_graph_add_source_sink_component_ports_connected_listener( 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); @@ -983,10 +979,10 @@ bt_graph_add_source_sink_component_ports_connected_listener( *out_listener_id = listener_id; } - return BT_GRAPH_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_graph_status +enum bt_graph_add_listener_status bt_graph_add_filter_filter_component_ports_connected_listener( struct bt_graph *graph, bt_graph_filter_filter_component_ports_connected_listener_func func, @@ -1011,7 +1007,7 @@ bt_graph_add_filter_filter_component_ports_connected_listener( 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); @@ -1019,10 +1015,10 @@ bt_graph_add_filter_filter_component_ports_connected_listener( *out_listener_id = listener_id; } - return BT_GRAPH_STATUS_OK; + return BT_FUNC_STATUS_OK; } -enum bt_graph_status +enum bt_graph_add_listener_status bt_graph_add_filter_sink_component_ports_connected_listener( struct bt_graph *graph, bt_graph_filter_sink_component_ports_connected_listener_func func, @@ -1047,7 +1043,7 @@ bt_graph_add_filter_sink_component_ports_connected_listener( 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); @@ -1055,21 +1051,21 @@ bt_graph_add_filter_sink_component_ports_connected_listener( *out_listener_id = listener_id; } - return BT_GRAPH_STATUS_OK; + return BT_FUNC_STATUS_OK; } BT_HIDDEN -enum bt_graph_listener_status bt_graph_notify_port_added( +enum bt_graph_listener_func_status bt_graph_notify_port_added( struct bt_graph *graph, struct bt_port *port) { uint64_t i; GArray *listeners; struct bt_component *comp; - enum bt_graph_listener_status status = BT_GRAPH_LISTENER_STATUS_OK; + enum bt_graph_listener_func_status status = BT_FUNC_STATUS_OK; 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); @@ -1126,7 +1122,7 @@ enum bt_graph_listener_status bt_graph_notify_port_added( BT_ASSERT(listener->func); status = listener->func(comp, port, listener->base.data); - if (status != BT_GRAPH_LISTENER_STATUS_OK) { + if (status != BT_FUNC_STATUS_OK) { goto end; } } @@ -1136,7 +1132,7 @@ end: } BT_HIDDEN -enum bt_graph_listener_status bt_graph_notify_ports_connected( +enum bt_graph_listener_func_status bt_graph_notify_ports_connected( struct bt_graph *graph, struct bt_port *upstream_port, struct bt_port *downstream_port) { @@ -1144,12 +1140,12 @@ enum bt_graph_listener_status bt_graph_notify_ports_connected( GArray *listeners; struct bt_component *upstream_comp; struct bt_component *downstream_comp; - enum bt_graph_listener_status status = BT_GRAPH_LISTENER_STATUS_OK; + enum bt_graph_listener_func_status status = BT_FUNC_STATUS_OK; 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); @@ -1204,7 +1200,7 @@ enum bt_graph_listener_status bt_graph_notify_ports_connected( BT_ASSERT(listener->func); status = listener->func(upstream_comp, downstream_comp, upstream_port, downstream_port, listener->base.data); - if (status != BT_GRAPH_LISTENER_STATUS_OK) { + if (status != BT_FUNC_STATUS_OK) { goto end; } } @@ -1213,18 +1209,17 @@ end: return status; } -enum bt_graph_status bt_graph_cancel(struct bt_graph *graph) +enum bt_graph_cancel_status bt_graph_cancel(struct bt_graph *graph) { - BT_ASSERT_PRE_NON_NULL(graph, "Graph"); graph->canceled = true; - BT_LIB_LOGV("Canceled graph: %!+i", graph); - return BT_GRAPH_STATUS_OK; + BT_LIB_LOGI("Canceled graph: %!+i", graph); + return BT_FUNC_STATUS_OK; } bt_bool bt_graph_is_canceled(const struct bt_graph *graph) { - BT_ASSERT_PRE_NON_NULL(graph, "Graph"); + BT_ASSERT_PRE_DEV_NON_NULL(graph, "Graph"); return graph->canceled ? BT_TRUE : BT_FALSE; } @@ -1234,12 +1229,11 @@ void bt_graph_remove_connection(struct bt_graph *graph, { 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); } -BT_ASSERT_PRE_FUNC static inline bool component_name_exists(struct bt_graph *graph, const char *name) { @@ -1263,15 +1257,16 @@ end: } static -enum bt_graph_status add_component_with_init_method_data( +int add_component_with_init_method_data( struct bt_graph *graph, 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; + int status = BT_FUNC_STATUS_OK; + enum bt_component_class_init_method_status init_status; struct bt_component *component = NULL; int ret; bool init_can_consume; @@ -1290,27 +1285,31 @@ enum bt_graph_status add_component_with_init_method_data( "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: " - "%![graph-]+g, %![cc-]+C, name=\"%s\", %![params-]+v, " - "init-method-data-addr=%p", - graph, comp_cls, name, params, init_method_data); + BT_LIB_LOGI("Adding component to graph: " + "%![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(); if (!new_params) { - BT_LOGE_STR("Cannot create map value object."); - graph_status = BT_GRAPH_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot create empty map value object."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } 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", + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot create empty component object: ret=%d", ret); - graph_status = BT_GRAPH_STATUS_NOMEM; + status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } @@ -1325,12 +1324,19 @@ enum bt_graph_status add_component_with_init_method_data( if (init_method) { BT_LOGD_STR("Calling user's initialization method."); - comp_status = init_method(component, params, init_method_data); + init_status = init_method(component, params, init_method_data); BT_LOGD("User method returned: status=%s", - bt_self_component_status_string(comp_status)); - if (comp_status != BT_SELF_COMPONENT_STATUS_OK) { - BT_LOGW_STR("Initialization method failed."); - graph_status = (int) comp_status; + bt_common_func_status_string(init_status)); + if (init_status != BT_FUNC_STATUS_OK) { + if (init_status < 0) { + BT_LIB_LOGW_APPEND_CAUSE( + "Component initialization method failed: " + "status=%s, %![comp-]+c", + bt_common_func_status_string(init_status), + component); + } + + status = init_status; bt_component_set_graph(component, NULL); g_ptr_array_remove_fast(graph->components, component); goto end; @@ -1358,10 +1364,12 @@ enum bt_graph_status add_component_with_init_method_data( */ BT_LOGD_STR("Freezing component class."); bt_component_class_freeze(comp_cls); - BT_LIB_LOGD("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); + BT_LIB_LOGI("Added component to graph: " + "%![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 */ @@ -1370,7 +1378,7 @@ enum bt_graph_status add_component_with_init_method_data( } end: - if (graph_status != BT_GRAPH_STATUS_OK) { + if (status != BT_FUNC_STATUS_OK) { bt_graph_make_faulty(graph); } @@ -1378,79 +1386,82 @@ end: bt_object_put_ref(new_params); (void) init_can_consume; bt_graph_set_can_consume(graph, init_can_consume); - return graph_status; + return status; } -enum bt_graph_status +enum bt_graph_add_component_status bt_graph_add_source_component_with_init_method_data( 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( +enum bt_graph_add_component_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 +enum bt_graph_add_component_status bt_graph_add_filter_component_with_init_method_data( 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( +enum bt_graph_add_component_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 +enum bt_graph_add_component_status bt_graph_add_sink_component_with_init_method_data( 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( +enum bt_graph_add_component_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 @@ -1477,7 +1488,8 @@ int bt_graph_remove_unconnected_component(struct bt_graph *graph, BT_ASSERT(port); if (bt_port_is_connected(port)) { - BT_LIB_LOGW("Cannot remove component from graph: " + BT_LIB_LOGW_APPEND_CAUSE( + "Cannot remove component from graph: " "an input port is connected: " "%![graph-]+g, %![comp-]+c, %![port-]+p", graph, component, port); @@ -1494,7 +1506,8 @@ int bt_graph_remove_unconnected_component(struct bt_graph *graph, BT_ASSERT(port); if (bt_port_is_connected(port)) { - BT_LIB_LOGW("Cannot remove component from graph: " + BT_LIB_LOGW_APPEND_CAUSE( + "Cannot remove component from graph: " "an output port is connected: " "%![graph-]+g, %![comp-]+c, %![port-]+p", graph, component, port);