X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent.c;h=11144fb42c400eb531b8fa8340f43ef3d0a1eaec;hp=825d8963a96a4726f82e019de765647b8262c01a;hb=9b4f9b425f2efce9a6ccc25f7ae062ebc1116a7d;hpb=d24d56638469189904fb6ddbb3c725817b3e9417

diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c
index 825d8963..11144fb4 100644
--- a/src/lib/graph/component.c
+++ b/src/lib/graph/component.c
@@ -190,7 +190,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 +208,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 +221,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 +270,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,7 +299,8 @@ 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;
 	}
@@ -313,7 +311,7 @@ int bt_component_create(struct bt_component_class *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 +320,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 +328,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 +336,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 +352,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 +367,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 +376,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 +389,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 +401,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 +422,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 +438,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 +448,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);
 }
@@ -491,7 +483,7 @@ bt_component_port_connected(
 	typedef enum bt_component_class_port_connected_method_status (*method_t)(
 		void *, void *, const void *);
 
-	enum bt_self_component_add_port_status status =
+	enum bt_component_class_port_connected_method_status status =
 		BT_FUNC_STATUS_OK;
 	method_t method = NULL;
 
@@ -609,7 +601,7 @@ 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;
 }