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

Update debug.h to standardize VERIFY3_IMPL error messages in debug and non-debug mode

This commit is contained in:
Brian Behlendorf 2009-01-22 09:41:47 -08:00
parent 064bbffb63
commit 511176398c
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/sys/debug.h
View File

@ -191,9 +191,9 @@ struct trace_page {
}; };
struct page_collection { struct page_collection {
struct list_head pc_pages; struct list_head pc_pages;
spinlock_t pc_lock; spinlock_t pc_lock;
int pc_want_daemon_pages; int pc_want_daemon_pages;
}; };
#define SBUG() spl_debug_bug(__FILE__, __FUNCTION__, __LINE__, 0); #define SBUG() spl_debug_bug(__FILE__, __FUNCTION__, __LINE__, 0);
@ -201,8 +201,8 @@ struct page_collection {
#ifdef NDEBUG #ifdef NDEBUG
#define CDEBUG_STACK() (0) #define CDEBUG_STACK() (0)
#define CDEBUG_LIMIT(x, y, z, a...) ((void)0) #define CDEBUG_LIMIT(x, y, z, a...) ((void)0)
#define __CDEBUG_LIMIT(x, y, z, a...) ((void)0) #define __CDEBUG_LIMIT(x, y, z, a...) ((void)0)
#define CDEBUG(mask, format, a...) ((void)0) #define CDEBUG(mask, format, a...) ((void)0)
#define CWARN(fmt, a...) ((void)0) #define CWARN(fmt, a...) ((void)0)
#define CERROR(fmt, a...) ((void)0) #define CERROR(fmt, a...) ((void)0)
@ -217,7 +217,7 @@ struct page_collection {
#define __ASSERT(x) ((void)0) #define __ASSERT(x) ((void)0)
#define __ASSERT_TAGE_INVARIANT(x) ((void)0) #define __ASSERT_TAGE_INVARIANT(x) ((void)0)
#define ASSERT(x) ((void)0) #define ASSERT(x) ((void)0)
#define ASSERTF(x, y, z...) ((void)0) #define ASSERTF(x, y, z...) ((void)0)
#define VERIFY(cond) \ #define VERIFY(cond) \
do { \ do { \
if (unlikely(!(cond))) { \ if (unlikely(!(cond))) { \
@ -229,9 +229,10 @@ do { \
#define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \ #define VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST) \
do { \ do { \
if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \ if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \
printk(KERN_ERR "VERIFY3(" #LEFT " " #OP " " #RIGHT \ printk(KERN_ERR \
" failed (" FMT ", " FMT ")\n", CAST (LEFT), \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
CAST (RIGHT)); \ "failed (" FMT " " #OP " " FMT ")\n", \
CAST (LEFT), CAST (RIGHT)); \
SBUG(); \ SBUG(); \
} \ } \
} while (0) } while (0)
@ -331,7 +332,8 @@ do { \
if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \ if (!((TYPE)(LEFT) OP (TYPE)(RIGHT))) { \
spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \ spl_debug_msg(NULL, DEBUG_SUBSYSTEM, D_EMERG, \
__FILE__, __FUNCTION__, __LINE__, \ __FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" FMT " " #OP " " FMT ")\n", \ "VERIFY3(" #LEFT " " #OP " " #RIGHT ") " \
"failed (" FMT " " #OP " " FMT ")\n", \
CAST (LEFT), CAST (RIGHT)); \ CAST (LEFT), CAST (RIGHT)); \
SBUG(); \ SBUG(); \
} \ } \
@ -405,7 +407,7 @@ do { \
__CDEBUG(NULL, subsys, D_TRACE, "Process leaving\n"); \ __CDEBUG(NULL, subsys, D_TRACE, "Process leaving\n"); \
} while(0) } while(0)
#define ENTRY __ENTRY(DEBUG_SUBSYSTEM) #define ENTRY __ENTRY(DEBUG_SUBSYSTEM)
#define EXIT __EXIT(DEBUG_SUBSYSTEM) #define EXIT __EXIT(DEBUG_SUBSYSTEM)
#endif /* NDEBUG */ #endif /* NDEBUG */

2
libtool
View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
# libtoolT - Provide generalized library-building support services. # libtoolT - Provide generalized library-building support services.
# Generated automatically by (GNU spl 0.4.0) # Generated automatically by (GNU spl 0.4.1)
# NOTE: Changes made to this file will be lost: look at ltmain.sh. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
# #
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001