nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also add tor_assertf_nonfatal()

Browse Source
This commit is contained in:
rl1987 2019-03-05 16:37:14 +02:00
parent f236c9e7f9
commit b6813845cf
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/log/util_bug.c
View File

@ -96,7 +96,7 @@ tor_assertion_failed_(const char *fname, unsigned int line,
void void
tor_bug_occurred_(const char *fname, unsigned int line, tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr, const char *func, const char *expr,
int once) int once, const char *fmt, ...)
{ {
char buf[256]; char buf[256];
const char *once_str = once ? const char *once_str = once ?
@ -116,11 +116,22 @@ tor_bug_occurred_(const char *fname, unsigned int line,
add_captured_bug(expr); add_captured_bug(expr);
return; return;
} }
va_list ap;
char *extra = NULL;
if (fmt) {
va_start(ap,fmt);
tor_vasprintf(&extra, fmt, ap);
va_end(ap);
}
log_warn(LD_BUG, "%s:%u: %s: Non-fatal assertion %s failed.%s", log_warn(LD_BUG, "%s:%u: %s: Non-fatal assertion %s failed.%s",
fname, line, func, expr, once_str); fname, line, func, expr, once_str);
tor_snprintf(buf, sizeof(buf), tor_snprintf(buf, sizeof(buf),
"Non-fatal assertion %s failed in %s at %s:%u", "Non-fatal assertion %s failed in %s at %s:%u%s%s",
expr, func, fname, line); expr, func, fname, line, fmt ? " : " : "", extra);
tor_free(extra);
} }
log_backtrace(LOG_WARN, LD_BUG, buf); log_backtrace(LOG_WARN, LD_BUG, buf);

28
src/lib/log/util_bug.h
View File

@ -143,6 +143,7 @@
#ifdef ALL_BUGS_ARE_FATAL #ifdef ALL_BUGS_ARE_FATAL
#define tor_assert_nonfatal_unreached() tor_assert(0) #define tor_assert_nonfatal_unreached() tor_assert(0)
#define tor_assert_nonfatal(cond) tor_assert((cond)) #define tor_assert_nonfatal(cond) tor_assert((cond))
#define tor_assertf_nonfatal(cond, fmt, ...) tor_assertf(cond, fmt, ...)
#define tor_assert_nonfatal_unreached_once() tor_assert(0) #define tor_assert_nonfatal_unreached_once() tor_assert(0)
#define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define tor_assert_nonfatal_once(cond) tor_assert((cond))
#define BUG(cond) \ #define BUG(cond) \
@ -153,24 +154,35 @@
#elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS)
#define tor_assert_nonfatal_unreached() STMT_NIL #define tor_assert_nonfatal_unreached() STMT_NIL
#define tor_assert_nonfatal(cond) ((void)(cond)) #define tor_assert_nonfatal(cond) ((void)(cond))
#define tor_assertf_nonfatal(cond, fmt, ...) STMT_BEGIN \
(void)cond; \
(void)fmt; \
STMT_END
#define tor_assert_nonfatal_unreached_once() STMT_NIL #define tor_assert_nonfatal_unreached_once() STMT_NIL
#define tor_assert_nonfatal_once(cond) ((void)(cond)) #define tor_assert_nonfatal_once(cond) ((void)(cond))
#define BUG(cond) (ASSERT_PREDICT_UNLIKELY_(cond) ? 1 : 0) #define BUG(cond) (ASSERT_PREDICT_UNLIKELY_(cond) ? 1 : 0)
#else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */ #else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */
#define tor_assert_nonfatal_unreached() STMT_BEGIN \ #define tor_assert_nonfatal_unreached() STMT_BEGIN \
tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0); \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0, NULL); \
STMT_END STMT_END
#define tor_assert_nonfatal(cond) STMT_BEGIN \ #define tor_assert_nonfatal(cond) STMT_BEGIN \
if (ASSERT_PREDICT_LIKELY_(cond)) { \ if (ASSERT_PREDICT_LIKELY_(cond)) { \
} else { \ } else { \
tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0, NULL);\
} \
STMT_END
#define tor_assertf_nonfatal(cond, fmt, ...) STMT_BEGIN \
if (ASSERT_PREDICT_UNLIKELY_(cond)) { \
} else { \
tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0, \
fmt, ##__VA_ARGS__); \
} \ } \
STMT_END STMT_END
#define tor_assert_nonfatal_unreached_once() STMT_BEGIN \ #define tor_assert_nonfatal_unreached_once() STMT_BEGIN \
static int warning_logged__ = 0; \ static int warning_logged__ = 0; \
if (!warning_logged__) { \ if (!warning_logged__) { \
warning_logged__ = 1; \ warning_logged__ = 1; \
tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 1); \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 1, NULL); \
} \ } \
STMT_END STMT_END
#define tor_assert_nonfatal_once(cond) STMT_BEGIN \ #define tor_assert_nonfatal_once(cond) STMT_BEGIN \
@ -178,12 +190,12 @@
if (ASSERT_PREDICT_LIKELY_(cond)) { \ if (ASSERT_PREDICT_LIKELY_(cond)) { \
} else if (!warning_logged__) { \ } else if (!warning_logged__) { \
warning_logged__ = 1; \ warning_logged__ = 1; \
tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1, NULL);\
} \ } \
STMT_END STMT_END
#define BUG(cond) \ #define BUG(cond) \
(ASSERT_PREDICT_UNLIKELY_(cond) ? \ (ASSERT_PREDICT_UNLIKELY_(cond) ? \
(tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",0), 1) \ (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",1,NULL),1) \
: 0) : 0)
#endif /* defined(ALL_BUGS_ARE_FATAL) || ... */ #endif /* defined(ALL_BUGS_ARE_FATAL) || ... */
@ -195,7 +207,7 @@
if (bool_result && !var) { \ if (bool_result && !var) { \
var = 1; \ var = 1; \
tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \
"!("#cond")", 1); \ "!("#cond")", 1, NULL); \
} \ } \
bool_result; } )) bool_result; } ))
#else /* !(defined(__GNUC__)) */ #else /* !(defined(__GNUC__)) */
@ -205,7 +217,7 @@
(var ? 1 : \ (var ? 1 : \
(var=1, \ (var=1, \
tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \
"!("#cond")", 1), \ "!("#cond")", 1, NULL), \
1)) \ 1)) \
: 0) : 0)
#endif /* defined(__GNUC__) */ #endif /* defined(__GNUC__) */
@ -232,7 +244,7 @@ void tor_assertion_failed_(const char *fname, unsigned int line,
const char *fmt, ...); const char *fmt, ...);
void tor_bug_occurred_(const char *fname, unsigned int line, void tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr, const char *func, const char *expr,
int once); int once, const char *fmt, ...);
#ifdef _WIN32 #ifdef _WIN32
#define SHORT_FILE__ (tor_fix_source_file(__FILE__)) #define SHORT_FILE__ (tor_fix_source_file(__FILE__))