[IPoIB] Make WPP output look like DbgPrint output.

Signed-off-by: Yossi Leybovich (sleybo@mellanox.co.il)
git-svn-id: svn://openib.tc.cornell.edu/gen1@352 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/ipoib/kernel/ipoib_debug.h b/trunk/ulp/ipoib/kernel/ipoib_debug.h
index 3826a978673020f603d36f782a283f6dbb2fa4b5..dc27bad6bb3f44c152755f3b60463d36be8f725f 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_debug.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_debug.h
@@ -83,11 +83,11 @@ extern uint32_t             g_ipoib_dbg_flags;
 // begin_wpp config\r
 // IPOIB_ENTER(FLAG);\r
 // IPOIB_EXIT(FLAG);\r
-// USEPREFIX(IPOIB_PRINT, "%!STDPREFIX!%!FUNC!() :");\r
-// USEPREFIX(IPOIB_PRINT_EXIT, "%!STDPREFIX!%!FUNC!() :");\r
-// USESUFFIX(IPOIB_PRINT_EXIT, "\n %!FUNC!():<===");\r
-// USESUFFIX(IPOIB_ENTER, " %!FUNC!():===>");\r
-// USESUFFIX(IPOIB_EXIT, " %!FUNC!():<===");\r
+// USEPREFIX(IPOIB_PRINT, "%!STDPREFIX! [IPoIB] :%!FUNC!() :");\r
+// USEPREFIX(IPOIB_PRINT_EXIT, "%!STDPREFIX! [IPoIB] :%!FUNC!() :");\r
+// USESUFFIX(IPOIB_PRINT_EXIT, "[IpoIB] :%!FUNC!():]");\r
+// USESUFFIX(IPOIB_ENTER, " [IPoIB] :%!FUNC!():[");\r
+// USESUFFIX(IPOIB_EXIT, " [IPoIB] :%!FUNC!():]");\r
 // end_wpp\r
 \r
 #else\r
@@ -98,20 +98,21 @@ extern uint32_t             g_ipoib_dbg_flags;
 /*\r
  * Debug macros\r
  */\r
-#define IPOIB_DBG_INIT (1 << 0)\r
-#define IPOIB_DBG_PNP  (1 << 1)\r
-#define IPOIB_DBG_SEND (1 << 2)\r
-#define IPOIB_DBG_RECV (1 << 3)\r
-#define IPOIB_DBG_ENDPT        (1 << 4)\r
-#define IPOIB_DBG_IB   (1 << 5)\r
-#define IPOIB_DBG_BUF  (1 << 6)\r
-#define IPOIB_DBG_MCAST        (1 << 7)\r
-#define IPOIB_DBG_ALLOC        (1 << 8)\r
-#define IPOIB_DBG_OID  (1 << 9)\r
-#define IPOIB_DBG_IOCTL        (1 << 10)\r
-#define IPOIB_DBG_STAT (1 << 11)\r
-\r
-#define IPOIB_DBG_ERROR        CL_DBG_ERROR\r
+#define IPOIB_DBG_ERR  (1 << 0)\r
+#define IPOIB_DBG_INIT (1 << 1)\r
+#define IPOIB_DBG_PNP  (1 << 2)\r
+#define IPOIB_DBG_SEND (1 << 3)\r
+#define IPOIB_DBG_RECV (1 << 4)\r
+#define IPOIB_DBG_ENDPT        (1 << 5)\r
+#define IPOIB_DBG_IB   (1 << 6)\r
+#define IPOIB_DBG_BUF  (1 << 7)\r
+#define IPOIB_DBG_MCAST        (1 << 8)\r
+#define IPOIB_DBG_ALLOC        (1 << 9)\r
+#define IPOIB_DBG_OID  (1 << 10)\r
+#define IPOIB_DBG_IOCTL        (1 << 11)\r
+#define IPOIB_DBG_STAT (1 << 12)\r
+\r
+#define IPOIB_DBG_ERROR        (CL_DBG_ERROR | IPOIB_DBG_ERR)\r
 #define IPOIB_DBG_ALL  CL_DBG_ALL\r
 \r
 \r
@@ -126,9 +127,9 @@ extern uint32_t             g_ipoib_dbg_flags;
 \r
 #define IPOIB_PRINT_EXIT(_level_,_flag_,_msg_) \\r
        { \\r
-               UNREFERENCED_PARAMETER( _level_ ); \\r
-               if( g_ipoib_dbg_level >= TRACE_LEVEL_VERBOSE ) \\r
-                       CL_TRACE_EXIT( _flag_, g_ipoib_dbg_flags, _msg_ ); \\r
+               if( g_ipoib_dbg_level >= (_level_) ) \\r
+                       CL_TRACE( _flag_, g_ipoib_dbg_flags, _msg_ );\\r
+               IPOIB_EXIT(_flag_);\\r
        }\r
 \r
 #define IPOIB_ENTER(_flag_) \\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.c b/trunk/ulp/ipoib/kernel/ipoib_driver.c
index 51857cce5f21ead9f24bb086447e04771e0489ff..01afadca31b58b6edbd1e4fd8f12f0bc3d65cca4 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.c
@@ -369,6 +369,9 @@ __ipoib_read_registry(
                        g_ipoib_dbg_level,\r
                        g_ipoib_dbg_flags));\r
 \r
+       if( g_ipoib_dbg_flags & IPOIB_DBG_ERR )\r
+               g_ipoib_dbg_flags |= CL_DBG_ERROR;\r
+\r
        cl_free( param_path.Buffer );\r
        IPOIB_EXIT( IPOIB_DBG_INIT );\r
        return status;\r