X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent.c;h=65978e944cab83f5b1ce18f0070d437ee382ad2a;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=22119689dd4873fea9a94c55c682b6d741f0fa42;hpb=2242b43d4f50ebdeabb124154fb8ac602c563536;p=babeltrace.git

diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c
index 22119689..65978e94 100644
--- a/src/lib/graph/component.c
+++ b/src/lib/graph/component.c
@@ -29,11 +29,8 @@
 #include "lib/assert-pre.h"
 #include "lib/assert-post.h"
 #include <babeltrace2/graph/self-component.h>
-#include <babeltrace2/graph/component-const.h>
-#include <babeltrace2/graph/component-source-const.h>
-#include <babeltrace2/graph/component-filter-const.h>
-#include <babeltrace2/graph/component-sink-const.h>
-#include <babeltrace2/graph/graph-const.h>
+#include <babeltrace2/graph/component.h>
+#include <babeltrace2/graph/graph.h>
 #include "common/macros.h"
 #include "compat/compiler.h"
 #include <babeltrace2/types.h>
@@ -100,13 +97,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 +214,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 +313,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 +395,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)
@@ -510,7 +507,7 @@ bt_component_port_connected(
 			method = (method_t) src_cc->methods.output_port_connected;
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		break;
@@ -527,7 +524,7 @@ bt_component_port_connected(
 			method = (method_t) flt_cc->methods.output_port_connected;
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		break;
@@ -541,13 +538,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 +559,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 +612,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);