X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fassert-pre.h;h=d361d354d1d99da84cd1b6683364355d117e77e9;hb=473e4d2acf7f005953af3893bb318222b728412e;hp=0b85d861f695244c8450f8644dadf4dc00701531;hpb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;p=babeltrace.git

diff --git a/src/lib/assert-pre.h b/src/lib/assert-pre.h
index 0b85d861..d361d354 100644
--- a/src/lib/assert-pre.h
+++ b/src/lib/assert-pre.h
@@ -1,29 +1,13 @@
-#ifndef BABELTRACE_ASSERT_PRE_INTERNAL_H
-#define BABELTRACE_ASSERT_PRE_INTERNAL_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright (c) 2018 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2018 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.
- *
- * 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.
  */
 
+#ifndef BABELTRACE_ASSERT_PRE_INTERNAL_H
+#define BABELTRACE_ASSERT_PRE_INTERNAL_H
+
 /*
  * The macros in this header use macros defined in "lib/logging.h".
  * We don't want this header to automatically include
@@ -42,6 +26,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <inttypes.h>
+#include "common/common.h"
 #include "common/macros.h"
 
 /*
@@ -95,7 +80,7 @@
 			BT_ASSERT_PRE_MSG("Babeltrace 2 library precondition not satisfied; error is:"); \
 			BT_ASSERT_PRE_MSG(_fmt, ##__VA_ARGS__);	\
 			BT_ASSERT_PRE_MSG("Aborting...");		\
-			abort();					\
+			bt_common_abort();					\
 		}							\
 	} while (0)
 
@@ -115,6 +100,20 @@
 		"Index is out of bounds: index=%" PRIu64 ", "		\
 		"count=%" PRIu64, (uint64_t) (_index), (uint64_t) (_length))
 
+/*
+ * Asserts that the current thread has no error set.
+ */
+#define BT_ASSERT_PRE_NO_ERROR() \
+	do {									\
+		const struct bt_error *err = bt_current_thread_take_error();	\
+		if (err) {							\
+			bt_current_thread_move_error(err);			\
+		}								\
+		BT_ASSERT_PRE(!err,						\
+			"API function called while current thread has an "	\
+			"error: function=%s", __func__);			\
+	} while (0)
+
 #ifdef BT_DEV_MODE
 /* Developer mode version of BT_ASSERT_PRE_MSG(). */
 # define BT_ASSERT_PRE_DEV_MSG(_fmt, ...)				\
@@ -145,6 +144,10 @@
 # define BT_ASSERT_PRE_DEV_VALID_INDEX(_index, _length)			\
 	BT_ASSERT_PRE_VALID_INDEX((_index), (_length))
 
+/* Developer mode version of BT_ASSERT_PRE_NO_ERROR(). */
+# define BT_ASSERT_PRE_DEV_NO_ERROR() \
+	BT_ASSERT_PRE_NO_ERROR()
+
 /*
  * Marks a function as being only used within a BT_ASSERT_PRE_DEV()
  * context.
@@ -159,6 +162,7 @@
 	((void) sizeof((void) (_obj), (void) (_obj_name), 0))
 # define BT_ASSERT_PRE_DEV_VALID_INDEX(_index, _length)			\
 	((void) sizeof((void) (_index), (void) (_length), 0))
+# define BT_ASSERT_PRE_DEV_NO_ERROR()
 # define BT_ASSERT_PRE_DEV_FUNC		__attribute__((unused))
 #endif /* BT_DEV_MODE */