|
@@ -46,13 +46,58 @@
|
|
|
} STMT_END
|
|
|
#endif
|
|
|
|
|
|
+#define tor_assert_unreached() tor_assert(0)
|
|
|
+
|
|
|
+/* Non-fatal bug assertions. The "unreached" variants mean "this line should
|
|
|
+ * never be reached." The "once" variants mean "Don't log a warning more than
|
|
|
+ * once".
|
|
|
+ */
|
|
|
+
|
|
|
+#ifdef ALL_BUGS_ARE_FATAL
|
|
|
+#define tor_assert_nonfatal_unreached() tor_assert(0)
|
|
|
+#define tor_assert_nonfatal(cond) tor_assert((cond))
|
|
|
+#define tor_assert_nonfatal_unreached_once() tor_assert(0)
|
|
|
+#define tor_assert_nonfatal_once(cond) tor_assert((cond))
|
|
|
+#elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS)
|
|
|
+#define tor_assert_nonfatal_unreached() STMT_NIL
|
|
|
+#define tor_assert_nonfatal(cond) ((void)(cond))
|
|
|
+#define tor_assert_nonfatal_unreached_once() STMT_NIL
|
|
|
+#define tor_assert_nonfatal_once(cond) ((void)(cond))
|
|
|
+#else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */
|
|
|
+#define tor_assert_nonfatal_unreached() STMT_BEGIN \
|
|
|
+ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0); \
|
|
|
+ STMT_END
|
|
|
+#define tor_assert_nonfatal(cond) STMT_BEGIN \
|
|
|
+ if (PREDICT_UNLIKELY(!(cond))) { \
|
|
|
+ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \
|
|
|
+ } \
|
|
|
+ STMT_END
|
|
|
+#define tor_assert_nonfatal_unreached_once() STMT_BEGIN \
|
|
|
+ static int warning_logged__ = 0; \
|
|
|
+ if (!warning_logged__) { \
|
|
|
+ warning_logged__ = 1; \
|
|
|
+ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 1); \
|
|
|
+ } \
|
|
|
+ STMT_END
|
|
|
+#define tor_assert_nonfatal_once(cond) STMT_BEGIN \
|
|
|
+ static int warning_logged__ = 0; \
|
|
|
+ if (!warning_logged__ && PREDICT_UNLIKELY(!(cond))) { \
|
|
|
+ warning_logged__ = 1; \
|
|
|
+ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \
|
|
|
+ } \
|
|
|
+ STMT_END
|
|
|
+#endif
|
|
|
+
|
|
|
/** Define this if you want Tor to crash when any problem comes up,
|
|
|
* so you can get a coredump and track things down. */
|
|
|
-// #define tor_fragile_assert() tor_assert(0)
|
|
|
-#define tor_fragile_assert()
|
|
|
+// #define tor_fragile_assert() tor_assert_unreached(0)
|
|
|
+#define tor_fragile_assert() tor_assert_nonfatal_unreached_once()
|
|
|
|
|
|
void tor_assertion_failed_(const char *fname, unsigned int line,
|
|
|
const char *func, const char *expr);
|
|
|
+void tor_bug_occurred_(const char *fname, unsigned int line,
|
|
|
+ const char *func, const char *expr,
|
|
|
+ int once);
|
|
|
|
|
|
#endif
|
|
|
|