Added VERIFYf by request

Signed-off-by: Rich Ercolani <[email protected]>

Author: rincebrain

include/os/freebsd/spl/sys/debug.h

@@ -76,7 +76,7 @@
 __attribute__((__noreturn__))
 #endif
 extern void spl_panic(const char *file, const char *func, int line,
-    const char *fmt, ...) __attribute__((__noreturn__));
+    const char *fmt, ...);
 extern void spl_dumpstack(void);
 
 static inline int
@@ -102,6 +102,11 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
 	    spl_assert("VERIFY(" #cond ") failed\n",			\
 	    __FILE__, __FUNCTION__, __LINE__))
 
+#define	VERIFYf(cond, str, ...)						\
+	(void) (unlikely(!(cond)) &&					\
+	    spl_panic(__FILE__, __FUNCTION__, __LINE__,			\
+	        "VERIFY(" #cond ") failed " str "\n", __VA_ARGS__))
+
 #define	VERIFY3B(LEFT, OP, RIGHT)	do {				\
 		const boolean_t _verify3_left = (boolean_t)(LEFT);	\
 		const boolean_t _verify3_right = (boolean_t)(RIGHT);	\
@@ -274,6 +279,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
 #define	ASSERT3Pf(x, y, z, str, ...)	ASSERT3P(x,y,z)
 #define	ASSERT0Pf(x, str, ...)		ASSERT0P(x)
 #define	ASSERT0f(x, str, ...)		ASSERT0(x)
+#define	ASSERTf(x, str, ...)		ASSERT(x)
 #define	IMPLY(A, B)							\
 	((void) sizeof ((uintptr_t)(A)), (void) sizeof ((uintptr_t)(B)))
 #define	EQUIV(A, B)		\
@@ -296,6 +302,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
 #define	ASSERT3Pf	VERIFY3Pf
 #define	ASSERT0Pf	VERIFY0Pf
 #define	ASSERT0f	VERIFY0f
+#define	ASSERTf		VERIFYf
 #define	ASSERT		VERIFY
 #define	IMPLY		VERIFY_IMPLY
 #define	EQUIV		VERIFY_EQUIV

include/os/linux/spl/sys/debug.h

@@ -76,7 +76,7 @@
 __attribute__((__noreturn__))
 #endif
 extern void spl_panic(const char *file, const char *func, int line,
-    const char *fmt, ...) __attribute__((__noreturn__));
+    const char *fmt, ...);
 extern void spl_dumpstack(void);
 
 static inline int
@@ -102,6 +102,11 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
 	    spl_assert("VERIFY(" #cond ") failed\n",			\
 	    __FILE__, __FUNCTION__, __LINE__))
 
+#define	VERIFYf(cond, str, ...)						\
+	(void) (unlikely(!(cond)) &&					\
+	    spl_panic(__FILE__, __FUNCTION__, __LINE__,			\
+	        "VERIFY(" #cond ") failed " str "\n", __VA_ARGS__))
+
 #define	VERIFY3B(LEFT, OP, RIGHT)	do {				\
 		const boolean_t _verify3_left = (boolean_t)(LEFT);	\
 		const boolean_t _verify3_right = (boolean_t)(RIGHT);	\
@@ -274,6 +279,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
 #define	ASSERT3Pf(x, y, z, str, ...)	ASSERT3P(x,y,z)
 #define	ASSERT0Pf(x, str, ...)		ASSERT0P(x)
 #define	ASSERT0f(x, str, ...)		ASSERT0(x)
+#define	ASSERTf(x, str, ...)		ASSERT(x)
 #define	IMPLY(A, B)							\
 	((void) sizeof ((uintptr_t)(A)), (void) sizeof ((uintptr_t)(B)))
 #define	EQUIV(A, B)		\
@@ -296,6 +302,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
 #define	ASSERT3Pf	VERIFY3Pf
 #define	ASSERT0Pf	VERIFY0Pf
 #define	ASSERT0f	VERIFY0f
+#define	ASSERTf		VERIFYf
 #define	ASSERT		VERIFY
 #define	IMPLY		VERIFY_IMPLY
 #define	EQUIV		VERIFY_EQUIV

lib/libspl/include/assert.h

@@ -70,6 +70,11 @@ libspl_assert(const char *buf, const char *file, const char *func, int line)
 #define	VERIFY(cond)							\
 	(void) ((!(cond)) &&						\
 	    libspl_assert(#cond, __FILE__, __FUNCTION__, __LINE__))
+#define	VERIFYf(cond, str, ...)						\
+	(void) ((!(cond)) &&						\
+	    libspl_assertf(__FILE__, __FUNCTION__, __LINE__, "%s " str, \
+	      #cond, __VA_ARGS__))
+
 #define	verify(cond)							\
 	(void) ((!(cond)) &&						\
 	    libspl_assert(#cond, __FILE__, __FUNCTION__, __LINE__))
@@ -221,6 +226,7 @@ do {									\
 #define	ASSERT0Pf(x, str, ...)		ASSERT0P(x)
 #define	ASSERT0f(x, str, ...)		ASSERT0(x)
 #define	ASSERT(x)		((void) sizeof ((uintptr_t)(x)))
+#define	ASSERTf(x, str, ...)	ASSERT(x)
 #define	assert(x)		((void) sizeof ((uintptr_t)(x)))
 #define	IMPLY(A, B)							\
 	((void) sizeof ((uintptr_t)(A)), (void) sizeof ((uintptr_t)(B)))
@@ -240,6 +246,7 @@ do {									\
 #define	ASSERT0Pf	VERIFY0Pf
 #define	ASSERT0f	VERIFY0f
 #define	ASSERT		VERIFY
+#define	ASSERTf		VERIFYf
 #define	assert		VERIFY
 #define	IMPLY(A, B) \
 	((void)(((!(A)) || (B)) || \