X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent.c;h=7660425c91c9d38b76f5ba8ee5fd4328b8816d05;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=24d7deded596ae5d9ab50e4567702a3f45825250;hpb=9275bef4a2fa8fdcec24f4d9953b772c802897f9;p=babeltrace.git diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c index 24d7dede..7660425c 100644 --- a/src/lib/graph/component.c +++ b/src/lib/graph/component.c @@ -1,24 +1,8 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright 2017-2018 Philippe Proulx * Copyright 2015 Jérémie Galarneau - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #define BT_LOG_TAG "LIB/COMPONENT" @@ -26,14 +10,10 @@ #include "common/common.h" #include "common/assert.h" -#include "lib/assert-pre.h" -#include "lib/assert-post.h" +#include "lib/assert-cond.h" #include -#include -#include -#include -#include -#include +#include +#include #include "common/macros.h" #include "compat/compiler.h" #include @@ -100,13 +80,22 @@ void finalize_component(struct bt_component *comp) break; } default: - abort(); + bt_common_abort(); } if (method) { + const struct bt_error *saved_error; + + saved_error = bt_current_thread_take_error(); + BT_LIB_LOGI("Calling user's component finalization method: " "%![comp-]+c", comp); method(comp); + BT_ASSERT_POST_NO_ERROR(); + + if (saved_error) { + BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error); + } } } @@ -190,7 +179,7 @@ void destroy_component(struct bt_object *obj) enum bt_component_class_type bt_component_get_class_type( const struct bt_component *component) { - BT_ASSERT_PRE_NON_NULL(component, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(component, "Component"); return component->class->type; } @@ -208,9 +197,6 @@ enum bt_self_component_add_port_status add_port( BT_ASSERT_PRE_NON_NULL(name, "Name"); BT_ASSERT_PRE(strlen(name) > 0, "Name is empty"); graph = bt_component_borrow_graph(component); - BT_ASSERT_PRE(graph && !bt_graph_is_canceled(graph), - "Component's graph is canceled: %![comp-]+c, %![graph-]+g", - component, graph); BT_ASSERT_PRE( graph->config_state == BT_GRAPH_CONFIGURATION_STATE_CONFIGURING, "Component's graph is already configured: " @@ -224,7 +210,7 @@ enum bt_self_component_add_port_status add_port( new_port = bt_port_create(component, port_type, name, user_data); if (!new_port) { - BT_LOGE_STR("Cannot create port object."); + BT_LIB_LOGE_APPEND_CAUSE("Cannot create port object."); status = BT_FUNC_STATUS_MEMORY_ERROR; goto error; } @@ -273,14 +259,14 @@ end: BT_HIDDEN uint64_t bt_component_get_input_port_count(const struct bt_component *comp) { - BT_ASSERT_PRE_NON_NULL(comp, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component"); return (uint64_t) comp->input_ports->len; } BT_HIDDEN uint64_t bt_component_get_output_port_count(const struct bt_component *comp) { - BT_ASSERT_PRE_NON_NULL(comp, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component"); return (uint64_t) comp->output_ports->len; } @@ -302,18 +288,19 @@ int bt_component_create(struct bt_component_class *component_class, bt_common_logging_level_string(log_level)); component = component_create_funcs[type](component_class); if (!component) { - BT_LOGE_STR("Cannot create specific component object."); + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot create specific component object."); ret = -1; goto end; } bt_object_init_shared_with_parent(&component->base, destroy_component); component->class = component_class; - bt_object_get_no_null_check(component->class); + bt_object_get_ref_no_null_check(component->class); component->destroy = component_destroy_funcs[type]; component->name = g_string_new(name); if (!component->name) { - BT_LOGE_STR("Failed to allocate one GString."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GString."); ret = -1; goto end; } @@ -322,7 +309,7 @@ int bt_component_create(struct bt_component_class *component_class, component->input_ports = g_ptr_array_new_with_free_func( (GDestroyNotify) bt_object_try_spec_release); if (!component->input_ports) { - BT_LOGE_STR("Failed to allocate one GPtrArray."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray."); ret = -1; goto end; } @@ -330,7 +317,7 @@ int bt_component_create(struct bt_component_class *component_class, component->output_ports = g_ptr_array_new_with_free_func( (GDestroyNotify) bt_object_try_spec_release); if (!component->output_ports) { - BT_LOGE_STR("Failed to allocate one GPtrArray."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray."); ret = -1; goto end; } @@ -338,7 +325,7 @@ int bt_component_create(struct bt_component_class *component_class, component->destroy_listeners = g_array_new(FALSE, TRUE, sizeof(struct bt_component_destroy_listener)); if (!component->destroy_listeners) { - BT_LOGE_STR("Failed to allocate one GArray."); + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GArray."); ret = -1; goto end; } @@ -354,14 +341,14 @@ end: const char *bt_component_get_name(const struct bt_component *component) { - BT_ASSERT_PRE_NON_NULL(component, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(component, "Component"); return component->name->str; } const struct bt_component_class *bt_component_borrow_class_const( const struct bt_component *component) { - BT_ASSERT_PRE_NON_NULL(component, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(component, "Component"); return component->class; } @@ -369,7 +356,7 @@ void *bt_self_component_get_data(const struct bt_self_component *self_comp) { struct bt_component *component = (void *) self_comp; - BT_ASSERT_PRE_NON_NULL(component, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(component, "Component"); return component->user_data; } @@ -378,7 +365,7 @@ void bt_self_component_set_data(struct bt_self_component *self_comp, { struct bt_component *component = (void *) self_comp; - BT_ASSERT_PRE_NON_NULL(component, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(component, "Component"); component->user_data = data; BT_LIB_LOGD("Set component's user data: %!+c", component); } @@ -391,12 +378,6 @@ void bt_component_set_graph(struct bt_component *component, graph ? &graph->base : NULL); } -bt_bool bt_component_graph_is_canceled(const struct bt_component *component) -{ - return bt_graph_is_canceled( - (void *) bt_object_borrow_parent(&component->base)); -} - static struct bt_port *borrow_port_by_name(GPtrArray *ports, const char *name) @@ -409,7 +390,7 @@ struct bt_port *borrow_port_by_name(GPtrArray *ports, for (i = 0; i < ports->len; i++) { struct bt_port *port = g_ptr_array_index(ports, i); - if (!strcmp(name, port->name->str)) { + if (strcmp(name, port->name->str) == 0) { ret_port = port; break; } @@ -430,7 +411,7 @@ BT_HIDDEN struct bt_port_output *bt_component_borrow_output_port_by_name( struct bt_component *comp, const char *name) { - BT_ASSERT_PRE_NON_NULL(comp, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component"); return (void *) borrow_port_by_name(comp->output_ports, name); } @@ -446,8 +427,8 @@ BT_HIDDEN struct bt_port_input *bt_component_borrow_input_port_by_index( struct bt_component *comp, uint64_t index) { - BT_ASSERT_PRE_NON_NULL(comp, "Component"); - BT_ASSERT_PRE_VALID_INDEX(index, comp->input_ports->len); + BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component"); + BT_ASSERT_PRE_DEV_VALID_INDEX(index, comp->input_ports->len); return (void *) borrow_port_by_index(comp->input_ports, index); } @@ -456,8 +437,8 @@ BT_HIDDEN struct bt_port_output *bt_component_borrow_output_port_by_index( struct bt_component *comp, uint64_t index) { - BT_ASSERT_PRE_NON_NULL(comp, "Component"); - BT_ASSERT_PRE_VALID_INDEX(index, comp->output_ports->len); + BT_ASSERT_PRE_DEV_NON_NULL(comp, "Component"); + BT_ASSERT_PRE_DEV_VALID_INDEX(index, comp->output_ports->len); return (void *) borrow_port_by_index(comp->output_ports, index); } @@ -482,6 +463,27 @@ enum bt_self_component_add_port_status bt_component_add_output_port( BT_PORT_TYPE_OUTPUT, name, user_data, port); } +BT_HIDDEN +bool bt_component_port_name_is_unique(GPtrArray *ports, const char *name) +{ + guint i; + bool unique; + + for (i = 0; i < ports->len; i++) { + struct bt_port *port = g_ptr_array_index(ports, i); + + if (strcmp(port->name->str, name) == 0) { + unique = false; + goto end; + } + } + + unique = true; + +end: + return unique; +} + BT_HIDDEN enum bt_component_class_port_connected_method_status bt_component_port_connected( @@ -509,7 +511,7 @@ bt_component_port_connected( method = (method_t) src_cc->methods.output_port_connected; break; default: - abort(); + bt_common_abort(); } break; @@ -526,7 +528,7 @@ bt_component_port_connected( method = (method_t) flt_cc->methods.output_port_connected; break; default: - abort(); + bt_common_abort(); } break; @@ -540,13 +542,13 @@ bt_component_port_connected( method = (method_t) sink_cc->methods.input_port_connected; break; default: - abort(); + bt_common_abort(); } break; } default: - abort(); + bt_common_abort(); } if (method) { @@ -561,6 +563,7 @@ bt_component_port_connected( status == BT_FUNC_STATUS_MEMORY_ERROR, "Unexpected returned component status: status=%s", bt_common_func_status_string(status)); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); } return status; @@ -609,10 +612,19 @@ void bt_component_remove_destroy_listener(struct bt_component *component, bt_logging_level bt_component_get_logging_level( const struct bt_component *component) { - BT_ASSERT_PRE_NON_NULL(component, "Component"); + BT_ASSERT_PRE_DEV_NON_NULL(component, "Component"); return component->log_level; } +uint64_t bt_self_component_get_graph_mip_version( + bt_self_component *self_component) +{ + struct bt_component *comp = (void *) self_component; + + BT_ASSERT_PRE_NON_NULL(self_component, "Component"); + return bt_component_borrow_graph(comp)->mip_version; +} + void bt_component_get_ref(const struct bt_component *component) { bt_object_get_ref(component);