X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fdebug.h;h=9529c3c82287b426f05a0cf790c529ec26ce0588;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=15b52c9306ecd1d1c2c6da9666e33346196f8fd6;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/include/linux/vserver/debug.h b/include/linux/vserver/debug.h
index 15b52c930..9529c3c82 100644
--- a/include/linux/vserver/debug.h
+++ b/include/linux/vserver/debug.h
@@ -2,6 +2,21 @@
 #define _VX_DEBUG_H
 
 
+#define VXD_CBIT(n,m)	(vx_debug_ ## n & (1 << (m)))
+#define VXD_CMIN(n,m)	(vx_debug_ ## n > (m))
+#define VXD_MASK(n,m)	(vx_debug_ ## n & (m))
+
+#define VXD_QPOS(v,p)	(((uint32_t)(v) >> ((p)*8)) & 0xFF)
+#define VXD_QUAD(v)	VXD_QPOS(v,0), VXD_QPOS(v,1),		\
+			VXD_QPOS(v,2), VXD_QPOS(v,3)
+
+// #define	VXD_HERE	__FILE__, __LINE__
+
+#define __FUNC__	__func__
+
+
+#ifdef	CONFIG_VSERVER_DEBUG
+
 extern unsigned int vx_debug_switch;
 extern unsigned int vx_debug_xid;
 extern unsigned int vx_debug_nid;
@@ -11,33 +26,39 @@ extern unsigned int vx_debug_dlim;
 extern unsigned int vx_debug_cvirt;
 
 
-#define	VXD_CBIT(n,m)	(vx_debug_ ## n & (1 << (m)))
-#define	VXD_CMIN(n,m)	(vx_debug_ ## n > (m))
-#define	VXD_MASK(n,m)	(vx_debug_ ## n & (m))
-
-// #define	VXD_HERE	__FILE__, __LINE__
-
-
-#ifdef	CONFIG_VSERVER_DEBUG
-
-#define	VX_LOGLEVEL	"vxD: "
+#define VX_LOGLEVEL	"vxD: "
 
 #define vxdprintk(c,f,x...)					\
 	do {							\
 		if (c)						\
 			printk(VX_LOGLEVEL f "\n", x);		\
-	} while (0)	
+	} while (0)
 
 #define vxlprintk(c,f,x...)					\
 	do {							\
 		if (c)						\
 			printk(VX_LOGLEVEL f " @%s:%d\n", x);	\
-	} while (0)	
+	} while (0)
+
+#define vxfprintk(c,f,x...)					\
+	do {							\
+		if (c)						\
+			printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
+	} while (0)
 
 #else
 
-#define vxdprintk(x...)	do { } while (0)
-#define vxlprintk(x...)	do { } while (0)
+#define vx_debug_switch 0
+#define vx_debug_xid	0
+#define vx_debug_nid	0
+#define vx_debug_net	0
+#define vx_debug_limit	0
+#define vx_debug_dlim	0
+#define vx_debug_cvirt	0
+
+#define vxdprintk(x...) do { } while (0)
+#define vxlprintk(x...) do { } while (0)
+#define vxfprintk(x...) do { } while (0)
 
 #endif