Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Clean up existing VERIFY*() macros. 

Chiefly:

- Remove unnecessary parentheses around variable names.
- Remove spaces between the type and variable in casts.
- Make the panic message for VERIFY0() reflect how the macro is used.
- Use %p to format pointers, except in Linux kernel code.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Kay Pedersen <mail@mkwg.de>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Dag-Erling Smørgrav <des@FreeBSD.org>
Closes #15225
This commit is contained in:
Dag-Erling Smørgrav 2023-08-30 17:13:06 +02:00 committed by Tony Hutter
parent 6732e223bf
commit d6da6cbd74
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/os/freebsd/spl/sys/debug.h
View File

@ -89,8 +89,8 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (%d " #OP " %d)\n", \ "failed (%d " #OP " %d)\n", \
(boolean_t)(_verify3_left), \ (boolean_t)_verify3_left, \
(boolean_t)(_verify3_right)); \ (boolean_t)_verify3_right); \
} while (0) } while (0)
#define VERIFY3S(LEFT, OP, RIGHT) do { \ #define VERIFY3S(LEFT, OP, RIGHT) do { \
@ -100,8 +100,8 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (%lld " #OP " %lld)\n", \ "failed (%lld " #OP " %lld)\n", \
(long long) (_verify3_left), \ (long long)_verify3_left, \
(long long) (_verify3_right)); \ (long long)_verify3_right); \
} while (0) } while (0)
#define VERIFY3U(LEFT, OP, RIGHT) do { \ #define VERIFY3U(LEFT, OP, RIGHT) do { \
@ -111,8 +111,8 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (%llu " #OP " %llu)\n", \ "failed (%llu " #OP " %llu)\n", \
(unsigned long long) (_verify3_left), \ (unsigned long long)_verify3_left, \
(unsigned long long) (_verify3_right)); \ (unsigned long long)_verify3_right); \
} while (0) } while (0)
#define VERIFY3P(LEFT, OP, RIGHT) do { \ #define VERIFY3P(LEFT, OP, RIGHT) do { \
@ -121,19 +121,18 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
if (unlikely(!(_verify3_left OP _verify3_right))) \ if (unlikely(!(_verify3_left OP _verify3_right))) \
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (%px " #OP " %px)\n", \ "failed (%p " #OP " %p)\n", \
(void *) (_verify3_left), \ (void *)_verify3_left, \
(void *) (_verify3_right)); \ (void *)_verify3_right); \
} while (0) } while (0)
#define VERIFY0(RIGHT) do { \ #define VERIFY0(RIGHT) do { \
const int64_t _verify3_left = (int64_t)(0); \ const int64_t _verify0_right = (int64_t)(RIGHT); \
const int64_t _verify3_right = (int64_t)(RIGHT); \ if (unlikely(!(0 == _verify0_right))) \
if (unlikely(!(_verify3_left == _verify3_right))) \
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY0(0 == " #RIGHT ") " \ "VERIFY0(" #RIGHT ") " \
"failed (0 == %lld)\n", \ "failed (0 == %lld)\n", \
(long long) (_verify3_right)); \ (long long)_verify0_right); \
} while (0) } while (0)
/* /*

25
include/os/linux/spl/sys/debug.h
View File

@ -93,8 +93,8 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (%d " #OP " %d)\n", \ "failed (%d " #OP " %d)\n", \
(boolean_t)(_verify3_left), \ (boolean_t)_verify3_left, \
(boolean_t)(_verify3_right)); \ (boolean_t)_verify3_right); \
} while (0) } while (0)
#define VERIFY3S(LEFT, OP, RIGHT) do { \ #define VERIFY3S(LEFT, OP, RIGHT) do { \
@ -104,8 +104,8 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (%lld " #OP " %lld)\n", \ "failed (%lld " #OP " %lld)\n", \
(long long)(_verify3_left), \ (long long)_verify3_left, \
(long long)(_verify3_right)); \ (long long)_verify3_right); \
} while (0) } while (0)
#define VERIFY3U(LEFT, OP, RIGHT) do { \ #define VERIFY3U(LEFT, OP, RIGHT) do { \
@ -115,8 +115,8 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (%llu " #OP " %llu)\n", \ "failed (%llu " #OP " %llu)\n", \
(unsigned long long)(_verify3_left), \ (unsigned long long)_verify3_left, \
(unsigned long long)(_verify3_right)); \ (unsigned long long)_verify3_right); \
} while (0) } while (0)
#define VERIFY3P(LEFT, OP, RIGHT) do { \ #define VERIFY3P(LEFT, OP, RIGHT) do { \
@ -126,18 +126,17 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (%px " #OP " %px)\n", \ "failed (%px " #OP " %px)\n", \
(void *) (_verify3_left), \ (void *)_verify3_left, \
(void *) (_verify3_right)); \ (void *)_verify3_right); \
} while (0) } while (0)
#define VERIFY0(RIGHT) do { \ #define VERIFY0(RIGHT) do { \
const int64_t _verify3_left = (int64_t)(0); \ const int64_t _verify0_right = (int64_t)(RIGHT); \
const int64_t _verify3_right = (int64_t)(RIGHT); \ if (unlikely(!(0 == _verify0_right))) \
if (unlikely(!(_verify3_left == _verify3_right))) \
spl_panic(__FILE__, __FUNCTION__, __LINE__, \ spl_panic(__FILE__, __FUNCTION__, __LINE__, \
"VERIFY0(0 == " #RIGHT ") " \ "VERIFY0(" #RIGHT ") " \
"failed (0 == %lld)\n", \ "failed (0 == %lld)\n", \
(long long) (_verify3_right)); \ (long long)_verify0_right); \
} while (0) } while (0)
#define VERIFY_IMPLY(A, B) \ #define VERIFY_IMPLY(A, B) \

4
lib/libspl/include/assert.h
View File

@ -110,8 +110,8 @@ do { \
const uintptr_t __right = (uintptr_t)(RIGHT); \ const uintptr_t __right = (uintptr_t)(RIGHT); \
if (!(__left OP __right)) \ if (!(__left OP __right)) \
libspl_assertf(__FILE__, __FUNCTION__, __LINE__, \ libspl_assertf(__FILE__, __FUNCTION__, __LINE__, \
"%s %s %s (0x%llx %s 0x%llx)", #LEFT, #OP, #RIGHT, \ "%s %s %s (%p %s %p)", #LEFT, #OP, #RIGHT, \
(u_longlong_t)__left, #OP, (u_longlong_t)__right); \ (void *)__left, #OP, (void *)__right); \
} while (0) } while (0)
#define VERIFY0(LEFT) \ #define VERIFY0(LEFT) \