[MTHCA] added event logging to release builds (maybe - a temporary solution)

git-svn-id: svn://openib.tc.cornell.edu/gen1@300 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mthca/kernel/SOURCES b/trunk/hw/mthca/kernel/SOURCES
index 01c6ded67972c016579e43bf118f4e09ba228295..b1e5fb5e21412ba7bb237f9b7e2d76c9fbbca82e 100644 (file)
--- a/trunk/hw/mthca/kernel/SOURCES
+++ b/trunk/hw/mthca/kernel/SOURCES
@@ -77,9 +77,10 @@ C_DEFINES = $(C_DEFINES) -DEVENT_TRACING
 RUN_WPP= $(SOURCES) -km -ext: .c .h .C .H \\r
        -scan:hca_debug.h \\r
        -func:HCA_PRINT(LEVEL,FLAGS,(MSG,...)) \\r
-       -func:HCA_PRINT_EV(LEVEL,FLAGS,(MSG,...)) \\r
        -func:HCA_PRINT_EXIT(LEVEL,FLAGS,(MSG,...)) \r
 !ENDIF\r
 \r
+#      -func:HCA_PRINT_EV(LEVEL,FLAGS,(MSG,...)) \\r
+\r
 MSC_OPTIMIZATION=/Oi\r
 MSC_WARNING_LEVEL= /W4\r

diff --git a/trunk/hw/mthca/kernel/hca_debug.h b/trunk/hw/mthca/kernel/hca_debug.h
index a60b1b1b3d1aceaaeb1b429a748cb4bf1ea63966..a8af369f35fe35cb4af190a75baa5308350a791a 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_debug.h
+++ b/trunk/hw/mthca/kernel/hca_debug.h
@@ -40,6 +40,30 @@ extern uint32_t              g_mthca_dbg_flags;
 extern WCHAR g_wlog_buf[ MAX_LOG_BUF_LEN ]; \r
 extern UCHAR g_slog_buf[ MAX_LOG_BUF_LEN ];  \r
 \r
+static void _build_str( const char *   format, ... )\r
+{\r
+       va_list p_arg;\r
+       va_start(p_arg, format);\r
+       vsprintf((char *)g_slog_buf , format , p_arg);\r
+       swprintf(g_wlog_buf, L"%S", g_slog_buf);\r
+       va_end(p_arg);\r
+}\r
+\r
+#define HCA_PRINT_TO_EVENT_LOG(_obj_,_level_,_flag_,_msg_)  \\r
+       { \\r
+               NTSTATUS event_id; \\r
+               switch (_level_) { \\r
+                       case TRACE_LEVEL_FATAL: case TRACE_LEVEL_ERROR: event_id = EVENT_MTHCA_ANY_ERROR; break; \\r
+                       case TRACE_LEVEL_WARNING: event_id = EVENT_MTHCA_ANY_WARN; break; \\r
+                       default: event_id = EVENT_MTHCA_ANY_INFO; break; \\r
+               } \\r
+               _build_str _msg_; \\r
+               WriteEventLogEntryStr( _obj_, (ULONG)event_id, 0, 0, g_wlog_buf, 0, 0 ); \\r
+       }\r
+\r
+#define HCA_PRINT_EV_MDEV(_level_,_flag_,_msg_)  \\r
+       HCA_PRINT_TO_EVENT_LOG(mdev->ext->cl_ext.p_self_do,_level_,_flag_,_msg_)\r
+\r
 \r
 #if defined(EVENT_TRACING)\r
 //\r
@@ -78,6 +102,11 @@ extern UCHAR g_slog_buf[ MAX_LOG_BUF_LEN ];
 // end_wpp\r
 \r
 \r
+#define HCA_PRINT_EV(_level_,_flag_,_msg_)  \\r
+    { \\r
+           HCA_PRINT_EV_MDEV(_level_,_flag_,_msg_) \\r
+       }\r
+\r
 \r
 #else\r
 \r
@@ -101,30 +130,6 @@ extern UCHAR g_slog_buf[ MAX_LOG_BUF_LEN ];
 #define HCA_DBG_LOW    (1 << 9)\r
 #define HCA_DBG_SHIM   (1 << 10)\r
 \r
-static void _build_str( const char *   format, ... )\r
-{\r
-       va_list p_arg;\r
-       va_start(p_arg, format);\r
-       vsprintf((char *)g_slog_buf , format , p_arg);\r
-       swprintf(g_wlog_buf, L"%S", g_slog_buf);\r
-       va_end(p_arg);\r
-}\r
-\r
-#define HCA_PRINT_TO_EVENT_LOG(_obj_,_level_,_flag_,_msg_)  \\r
-       { \\r
-               NTSTATUS event_id; \\r
-               switch (_level_) { \\r
-                       case TRACE_LEVEL_FATAL: case TRACE_LEVEL_ERROR: event_id = EVENT_MTHCA_ANY_ERROR; break; \\r
-                       case TRACE_LEVEL_WARNING: event_id = EVENT_MTHCA_ANY_WARN; break; \\r
-                       default: event_id = EVENT_MTHCA_ANY_INFO; break; \\r
-               } \\r
-               _build_str _msg_; \\r
-               WriteEventLogEntryStr( _obj_, (ULONG)event_id, 0, 0, g_wlog_buf, 0, 0 ); \\r
-       }\r
-\r
-#define HCA_PRINT_EV_MDEV(_level_,_flag_,_msg_)  \\r
-       HCA_PRINT_TO_EVENT_LOG(mdev->ext->cl_ext.p_self_do,_level_,_flag_,_msg_)\r
-\r
 \r
 #if DBG\r
 \r
@@ -170,8 +175,6 @@ static void _build_str( const char *        format, ... )
 #endif //EVENT_TRACING\r
 \r
 \r
-\r
-\r
 #endif /*_HCA_DEBUG_H_ */\r
 \r
 \r