c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Safer debugging and assertion macros.

Browse Source 
Spl's debugging and assertion macros macro used the typical do/while(0)
form for if/else friendliness, however, this limits their use in contexts
where a do loop is not valid; such as within another multi-statement
style macro.

The following macros have been converted to not use do/while(0):
	PANIC, ASSERT, ASSERTF, VERIFY, VERIFY3_IMPL

PANIC has been converted to a wrapper around the new spl_PANIC() function.

The other macros have been converted to use the "&&" operator for the
branch-predicition conditional and also to use spl_PANIC().

The __ASSERT() macro was not touched.  It is only used by the debugging
infrastructure and that code, including this macro, will be retired when
the tracepoint patches are merged.

Signed-off-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #367
This commit is contained in:
Tim Chase
2014-06-18 15:22:50 -05:00
committed by Brian Behlendorf
parent 31cb5383bf
commit f6a869614e
2 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spl/spl-err.c
+21
View File
@@ -39,6 +39,27 @@ static char ce_prefix[CE_IGNORE][10] = { "", "NOTICE: ", "WARNING: ", "" };
static char ce_suffix[CE_IGNORE][2] = { "", "\n", "\n", "" };
#endif
int
spl_PANIC(char *filename, const char *functionname,
int lineno, const char *fmt, ...) {
char msg[MAXMSGLEN];
va_list ap;
va_start(ap, fmt);
if (vsnprintf(msg, sizeof (msg), fmt, ap) == sizeof (msg))
msg[sizeof (msg) - 1] = '\0';
va_end(ap);
#ifdef NDEBUG
printk(KERN_EMERG "%s", msg);
#else
spl_debug_msg(NULL, 0, 0,
filename, functionname, lineno, "%s", msg);
#endif
spl_debug_bug(filename, functionname, lineno, 0);
return 1;
}
EXPORT_SYMBOL(spl_PANIC);
void
vpanic(const char *fmt, va_list ap)
{