From 6baaaa1b54cf1e666af48597d3755ae9e6d72f20 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 25 May 2017 18:25:15 -0400 Subject: [PATCH] lib/graph/source.c: add logging MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- lib/graph/source.c | 72 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 10 deletions(-) diff --git a/lib/graph/source.c b/lib/graph/source.c index 96825708..09af6972 100644 --- a/lib/graph/source.c +++ b/lib/graph/source.c @@ -26,6 +26,9 @@ * SOFTWARE. */ +#define BT_LOG_TAG "COMP-SOURCE" +#include + #include #include #include @@ -47,6 +50,7 @@ struct bt_component *bt_component_source_create( source = g_new0(struct bt_component_source, 1); if (!source) { + BT_LOGE_STR("Failed to allocate one source component."); goto end; } @@ -55,17 +59,28 @@ end: } int64_t bt_component_source_get_output_port_count( - struct bt_component *component, uint64_t *count) + struct bt_component *component) { int64_t ret; - if (!component || !count || - component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) { - ret = (int64_t) -1; + if (!component) { + BT_LOGW_STR("Invalid parameter: component is NULL."); + ret = (int64_t) -1; goto end; } + if (component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) { + BT_LOGW("Invalid parameter: component's class is not a source component class: " + "comp-addr=%p, comp-name=\"%s\", comp-class-type=%s", + component, bt_component_get_name(component), + bt_component_class_type_string(component->class->type)); + ret = (int64_t) -1; + goto end; + } + + /* bt_component_get_output_port_count() logs details/errors */ ret = bt_component_get_output_port_count(component); + end: return ret; } @@ -75,12 +90,27 @@ struct bt_port *bt_component_source_get_output_port_by_name( { struct bt_port *port = NULL; - if (!component || !name || - component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) { + if (!component) { + BT_LOGW_STR("Invalid parameter: component is NULL."); + goto end; + } + + if (!name) { + BT_LOGW_STR("Invalid parameter: name is NULL."); + goto end; + } + + if (component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) { + BT_LOGW("Invalid parameter: component's class is not a source component class: " + "comp-addr=%p, comp-name=\"%s\", comp-class-type=%s", + component, bt_component_get_name(component), + bt_component_class_type_string(component->class->type)); goto end; } + /* bt_component_get_output_port_by_name() logs details/errors */ port = bt_component_get_output_port_by_name(component, name); + end: return port; } @@ -90,12 +120,22 @@ struct bt_port *bt_component_source_get_output_port_by_index( { struct bt_port *port = NULL; - if (!component || - component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) { + if (!component) { + BT_LOGW_STR("Invalid parameter: component is NULL."); + goto end; + } + + if (component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) { + BT_LOGW("Invalid parameter: component's class is not a source component class: " + "comp-addr=%p, comp-name=\"%s\", comp-class-type=%s", + component, bt_component_get_name(component), + bt_component_class_type_string(component->class->type)); goto end; } + /* bt_component_get_output_port_by_index() logs details/errors */ port = bt_component_get_output_port_by_index(component, index); + end: return port; } @@ -105,6 +145,7 @@ bt_private_component_source_get_output_private_port_by_name( struct bt_private_component *private_component, const char *name) { + /* bt_component_source_get_output_port_by_name() logs details/errors */ return bt_private_port_from_port( bt_component_source_get_output_port_by_name( bt_component_from_private(private_component), name)); @@ -114,6 +155,7 @@ struct bt_private_port * bt_private_component_source_get_output_private_port_by_index( struct bt_private_component *private_component, uint64_t index) { + /* bt_component_source_get_output_port_by_index() logs details/errors */ return bt_private_port_from_port( bt_component_source_get_output_port_by_index( bt_component_from_private(private_component), index)); @@ -127,12 +169,22 @@ struct bt_private_port *bt_private_component_source_add_output_private_port( struct bt_component *component = bt_component_from_private(private_component); - if (!component || - component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) { + if (!component) { + BT_LOGW_STR("Invalid parameter: component is NULL."); goto end; } + if (component->class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) { + BT_LOGW("Invalid parameter: component's class is not a source component class: " + "comp-addr=%p, comp-name=\"%s\", comp-class-type=%s", + component, bt_component_get_name(component), + bt_component_class_type_string(component->class->type)); + goto end; + } + + /* bt_component_add_output_port() logs details and errors */ port = bt_component_add_output_port(component, name, user_data); + end: return bt_private_port_from_port(port); } -- 2.34.1