diff options
| author |   d <d@openbsd.org> | 2000-02-10 11:42:46 +0000 |
|---|---|---|
| committer | d <d@openbsd.org> | 2000-02-10 11:42:46 +0000 |
| commit | 9fa6c309fcb9b56529f3193bd95af88a8e95600e (patch) | |
| tree | 31dce3286a0dfedd377e74fade85ecb377a93b12 | |
| parent | ident. fix comment. (diff) | |
| download | wireguard-openbsd-9fa6c309fcb9b56529f3193bd95af88a8e95600e.tar.xz wireguard-openbsd-9fa6c309fcb9b56529f3193bd95af88a8e95600e.zip | |
add DUMP_INFO helper macro
| -rw-r--r-- | lib/libc_r/TEST/test.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/libc_r/TEST/test.h b/lib/libc_r/TEST/test.h index 51481bc68f6..10eb0c181e3 100644 --- a/lib/libc_r/TEST/test.h +++ b/lib/libc_r/TEST/test.h @@ -10,7 +10,6 @@ int _thread_sys_write __P((int, const char*, size_t)); __dead void _thread_sys__exit __P((int)) __attribute__((noreturn)); -void _thread_dump_info __P((void)); static __dead void __vpanic __P((const char *, const char *, const char *, int, const char *, va_list)) __attribute__((noreturn)); @@ -20,9 +19,12 @@ static __dead void __panic __P((const char *, const char *, const char *, #if defined(__OpenBSD__) || defined(__FreeBSD__) #include <pthread.h> #include <pthread_np.h> +void _thread_dump_info __P((void)); #define SET_NAME(x) pthread_set_name_np(pthread_self(), x) +#define DUMP_INFO() _thread_dump_info() #else #define SET_NAME(x) /* nada */ +#define DUMP_INFO() /* nada */ #endif static void @@ -47,7 +49,7 @@ __vpanic(type, errstr, filenm, lineno, fmt, ap) strlcat(buf, "\n", sizeof buf); _thread_sys_write(2, buf, strlen(buf)); - _thread_dump_info(); + DUMP_INFO(); _thread_sys__exit(1); _thread_sys_write(2, "[locking]\n", 10); @@ -83,9 +85,14 @@ __panic(type, errstr, filenm, lineno, fmt) #define ASSERTe(x,rhs) do { \ int _x; \ _x = (x); \ - if (!(_x rhs)) \ + if (!(_x rhs)) { \ + if (_x == -1) \ __panic("assert failed", strerror(_x), __FILE__, __LINE__, \ - "%s %s", #x, #rhs); \ + "%s %s", #x, #rhs); \ + else \ + __panic("assert failed", NULL, __FILE__, __LINE__, \ + "%s [=%d] %s", #x, _x, #rhs); \ + } \ } while(0) #define _CHECK(x, rhs, efn) do { \ |