X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent.c;h=7660425c91c9d38b76f5ba8ee5fd4328b8816d05;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=22119689dd4873fea9a94c55c682b6d741f0fa42;hpb=2242b43d4f50ebdeabb124154fb8ac602c563536;p=babeltrace.git diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c index 22119689..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); + } } } @@ -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: " @@ -310,7 +296,7 @@ int bt_component_create(struct bt_component_class *component_class, 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) { @@ -392,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) @@ -483,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( @@ -510,7 +511,7 @@ bt_component_port_connected( method = (method_t) src_cc->methods.output_port_connected; break; default: - abort(); + bt_common_abort(); } break; @@ -527,7 +528,7 @@ bt_component_port_connected( method = (method_t) flt_cc->methods.output_port_connected; break; default: - abort(); + bt_common_abort(); } break; @@ -541,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) { @@ -562,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; @@ -614,6 +616,15 @@ bt_logging_level bt_component_get_logging_level( 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);