X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ferror.c;h=bd8259ab71057103385d75b711ffd59a5508007a;hb=6ef39fe95fc5956397585fedb4424376b08d8d0e;hp=3ae2db988865b5416abcaabaeb648bed81d95528;hpb=6c373cc905e907ecbad698fee38db1d47a981b14;p=babeltrace.git

diff --git a/src/lib/error.c b/src/lib/error.c
index 3ae2db98..bd8259ab 100644
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -1,23 +1,7 @@
 /*
- * Copyright (c) 2019 Philippe Proulx <pproulx@efficios.com>
- *
- * 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.
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * Copyright (c) 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/ERROR"
@@ -32,11 +16,12 @@
 #include "graph/component.h"
 #include "graph/component-class.h"
 #include "common/assert.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "lib/func-status.h"
 
-#define BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(_cause, _exp_type)		\
-	BT_ASSERT_PRE(((const struct bt_error_cause *) (_cause))->actor_type == _exp_type, \
+#define BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(_cause, _exp_type_name, _exp_type) \
+	BT_ASSERT_PRE("error-cause-has-" _exp_type_name "-actor",	\
+		((const struct bt_error_cause *) (_cause))->actor_type == _exp_type, \
 		"Unexpected error cause's actor type: type=%s, exp-type=%s", \
 		bt_error_cause_actor_type_string(((const struct bt_error_cause *) (_cause))->actor_type), \
 		bt_error_cause_actor_type_string(_exp_type))
@@ -261,7 +246,7 @@ void append_component_class_id_str(GString *str,
 		type_str = "sink";
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	if (comp_class_id->plugin_name->len > 0) {
@@ -315,8 +300,10 @@ struct bt_error_cause_component_actor *create_error_cause_component_actor(
 	goto end;
 
 error:
-	destroy_error_cause(&cause->base);
-	cause = NULL;
+	if (cause) {
+		destroy_error_cause(&cause->base);
+		cause = NULL;
+	}
 
 end:
 	return cause;
@@ -356,19 +343,22 @@ create_error_cause_component_class_actor(struct bt_component_class *comp_cls,
 	goto end;
 
 error:
-	destroy_error_cause(&cause->base);
-	cause = NULL;
+	if (cause) {
+		destroy_error_cause(&cause->base);
+		cause = NULL;
+	}
 
 end:
 	return cause;
 }
 
+static
 struct bt_error_cause_message_iterator_actor *
 create_error_cause_message_iterator_actor(struct bt_message_iterator *iter,
 		const char *file_name, uint64_t line_no)
 {
 	struct bt_error_cause_message_iterator_actor *cause;
-	struct bt_self_component_port_input_message_iterator *input_port_iter;
+	struct bt_message_iterator *input_port_iter;
 	int ret;
 
 	BT_LOGD_STR("Creating error cause object (message iterator actor).");
@@ -421,8 +411,10 @@ create_error_cause_message_iterator_actor(struct bt_message_iterator *iter,
 	goto end;
 
 error:
-	destroy_error_cause(&cause->base);
-	cause = NULL;
+	if (cause) {
+		destroy_error_cause(&cause->base);
+		cause = NULL;
+	}
 
 end:
 	return cause;
@@ -537,7 +529,10 @@ int bt_error_append_cause_from_component(
 	cause = NULL;
 
 end:
-	destroy_error_cause(&cause->base);
+	if (cause) {
+		destroy_error_cause(&cause->base);
+	}
+
 	return status;
 }
 
@@ -571,7 +566,10 @@ int bt_error_append_cause_from_component_class(
 	cause = NULL;
 
 end:
-	destroy_error_cause(&cause->base);
+	if (cause) {
+		destroy_error_cause(&cause->base);
+	}
+
 	return status;
 }
 
@@ -604,7 +602,10 @@ int bt_error_append_cause_from_message_iterator(
 	cause = NULL;
 
 end:
-	destroy_error_cause(&cause->base);
+	if (cause) {
+		destroy_error_cause(&cause->base);
+	}
+
 	return status;
 }
 
@@ -616,20 +617,20 @@ uint64_t error_cause_count(const bt_error *error)
 
 uint64_t bt_error_get_cause_count(const bt_error *error)
 {
-	BT_ASSERT_PRE_NON_NULL(error, "Error");
+	BT_ASSERT_PRE_ERROR_NON_NULL(error);
 	return error_cause_count(error);
 }
 
 void bt_error_release(const struct bt_error *error)
 {
-	BT_ASSERT_PRE_NON_NULL(error, "Error");
+	BT_ASSERT_PRE_ERROR_NON_NULL(error);
 	bt_error_destroy((void *) error);
 }
 
 const struct bt_error_cause *bt_error_borrow_cause_by_index(
 		const bt_error *error, uint64_t index)
 {
-	BT_ASSERT_PRE_NON_NULL(error, "Error");
+	BT_ASSERT_PRE_ERROR_NON_NULL(error);
 	BT_ASSERT_PRE_VALID_INDEX(index, error_cause_count(error));
 	return error->causes->pdata[index];
 }
@@ -637,31 +638,31 @@ const struct bt_error_cause *bt_error_borrow_cause_by_index(
 enum bt_error_cause_actor_type bt_error_cause_get_actor_type(
 		const struct bt_error_cause *cause)
 {
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
 	return cause->actor_type;
 }
 
 const char *bt_error_cause_get_message(const struct bt_error_cause *cause)
 {
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
 	return cause->message->str;
 }
 
 const char *bt_error_cause_get_module_name(const struct bt_error_cause *cause)
 {
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
 	return cause->module_name->str;
 }
 
 const char *bt_error_cause_get_file_name(const struct bt_error_cause *cause)
 {
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
 	return cause->file_name->str;
 }
 
 uint64_t bt_error_cause_get_line_number(const bt_error_cause *cause)
 {
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
 	return cause->line_no;
 }
 
@@ -671,8 +672,8 @@ const char *bt_error_cause_component_actor_get_component_name(
 	const struct bt_error_cause_component_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "component",
 		BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT);
 	return spec_cause->comp_name->str;
 }
@@ -683,8 +684,8 @@ bt_component_class_type bt_error_cause_component_actor_get_component_class_type(
 	const struct bt_error_cause_component_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "component",
 		BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT);
 	return spec_cause->comp_class_id.type;
 }
@@ -695,8 +696,8 @@ const char *bt_error_cause_component_actor_get_component_class_name(
 	const struct bt_error_cause_component_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "component",
 		BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT);
 	return spec_cause->comp_class_id.name->str;
 }
@@ -707,8 +708,8 @@ const char *bt_error_cause_component_actor_get_plugin_name(
 	const struct bt_error_cause_component_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "component",
 		BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT);
 	return spec_cause->comp_class_id.plugin_name->len > 0 ?
 		spec_cause->comp_class_id.plugin_name->str : NULL;
@@ -721,8 +722,8 @@ bt_error_cause_component_class_actor_get_component_class_type(
 	const struct bt_error_cause_component_class_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "component-class",
 		BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS);
 	return spec_cause->comp_class_id.type;
 }
@@ -733,8 +734,8 @@ const char *bt_error_cause_component_class_actor_get_component_class_name(
 	const struct bt_error_cause_component_class_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "component-class",
 		BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS);
 	return spec_cause->comp_class_id.name->str;
 }
@@ -745,8 +746,8 @@ const char *bt_error_cause_component_class_actor_get_plugin_name(
 	const struct bt_error_cause_component_class_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "component-class",
 		BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS);
 	return spec_cause->comp_class_id.plugin_name->len > 0 ?
 		spec_cause->comp_class_id.plugin_name->str : NULL;
@@ -758,8 +759,8 @@ const char *bt_error_cause_message_iterator_actor_get_component_name(
 	const struct bt_error_cause_message_iterator_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "message-iterator",
 		BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR);
 	return spec_cause->comp_name->str;
 }
@@ -771,8 +772,8 @@ bt_error_cause_message_iterator_actor_get_component_output_port_name(
 	const struct bt_error_cause_message_iterator_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "message-iterator",
 		BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR);
 	return spec_cause->output_port_name->str;
 }
@@ -784,8 +785,8 @@ bt_error_cause_message_iterator_actor_get_component_class_type(
 	const struct bt_error_cause_message_iterator_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "message-iterator",
 		BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR);
 	return spec_cause->comp_class_id.type;
 }
@@ -796,8 +797,8 @@ const char *bt_error_cause_message_iterator_actor_get_component_class_name(
 	const struct bt_error_cause_message_iterator_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "message-iterator",
 		BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR);
 	return spec_cause->comp_class_id.name->str;
 }
@@ -808,8 +809,8 @@ const char *bt_error_cause_message_iterator_actor_get_plugin_name(
 	const struct bt_error_cause_message_iterator_actor *spec_cause =
 		(const void *) cause;
 
-	BT_ASSERT_PRE_NON_NULL(cause, "Error cause");
-	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause,
+	BT_ASSERT_PRE_ERROR_CAUSE_NON_NULL(cause);
+	BT_ASSERT_PRE_CAUSE_HAS_ACTOR_TYPE(cause, "message-iterator",
 		BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR);
 	return spec_cause->comp_class_id.plugin_name->len > 0 ?
 		spec_cause->comp_class_id.plugin_name->str : NULL;