[WSD] Refix building with IBSP_LOGGING enabled.

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

diff --git a/trunk/ulp/wsd/user/ibsp_perfmon.c b/trunk/ulp/wsd/user/ibsp_perfmon.c
index 0636afb44454fa848b48b5e6fb5cd52fb96eff3b..bbfb56ca9be8bc3ce6c8ec37a1a94bbf3dda6cf0 100644 (file)
--- a/trunk/ulp/wsd/user/ibsp_perfmon.c
+++ b/trunk/ulp/wsd/user/ibsp_perfmon.c
@@ -31,7 +31,7 @@
 \r
 \r
 #include <string.h>\r
-#include "ibspdebug.h"\r
+#include "ibspdll.h"\r
 #include "ibsp_perfmon.h"\r
 \r
 \r

diff --git a/trunk/ulp/wsd/user/ibspdebug.h b/trunk/ulp/wsd/user/ibspdebug.h
index 44ba882b705abcfa056a9cd4c6636e59233fa2c1..cd5aa6e1aceeec72a437024962331da0f4932587 100644 (file)
--- a/trunk/ulp/wsd/user/ibspdebug.h
+++ b/trunk/ulp/wsd/user/ibspdebug.h
@@ -29,8 +29,9 @@
  * $Id$\r
  */\r
 \r
-#ifndef IBSPDEBUG_H\r
-#define IBSPDEBUG_H\r
+#ifndef _IBSP_DEBUG_H_\r
+#define _IBSP_DEBUG_H_\r
+\r
 \r
 #include "ibspdll.h"\r
 #include <complib/cl_atomic.h>\r
@@ -143,7 +144,7 @@ debug_dump_overlapped(
 \r
 #ifdef IBSP_LOGGING\r
 \r
-typedef struct DataLogger\r
+typedef struct _DataLogger\r
 {\r
        char                            *BufferStart;\r
        size_t                          TotalSize;\r
@@ -152,7 +153,7 @@ typedef struct DataLogger
        BOOL                            ShutdownClosed;\r
        HANDLE                          hMapFile;\r
 \r
-}DataLogger;\r
+}      DataLogger;\r
 \r
 \r
 VOID DataLogger_Init(\r
@@ -172,4 +173,5 @@ VOID DataLogger_Shutdown(
                                        DataLogger                                      *pLoger );\r
 \r
 #endif /* IBSP_LOGGING */\r
-#endif /* IBSPDEBUG_H  */\r
+\r
+#endif /* _IBSP_DEBUG_H_ */\r

diff --git a/trunk/ulp/wsd/user/ibspstruct.h b/trunk/ulp/wsd/user/ibspstruct.h
index 2d2bb99d54e6ebcb448f5b874ac229ae238635a2..76c9550069b9896d074bd9e3bb877a242af3ed4e 100644 (file)
--- a/trunk/ulp/wsd/user/ibspstruct.h
+++ b/trunk/ulp/wsd/user/ibspstruct.h
@@ -334,7 +334,36 @@ ibsp_css(
                                        char                                            *calling_func,\r
                                        int                                                     line,\r
                                        struct ibsp_socket_info         *s,\r
-                                       enum ibsp_socket_state          new_state );\r
+                                       enum ibsp_socket_state          new_state )\r
+{\r
+       enum ibsp_socket_state old_state;\r
+\r
+       UNUSED_PARAM( calling_func );\r
+       UNUSED_PARAM( line );\r
+\r
+       old_state = s->socket_state;\r
+\r
+       if( old_state == new_state )\r
+       {\r
+               /* Nothing to change */\r
+               return;\r
+       }\r
+\r
+       /* IBSP_CLOSED is a dead end state */\r
+       if( old_state == IBSP_CLOSED )\r
+       {\r
+               fzprint(("%s():0x%x:0x%x: socket=0x%p cannot change from %s to %s, called by %s():%d\n", __FUNCTION__, GetCurrentProcessId(), GetCurrentThreadId(), s, IBSP_SOCKET_STATE_STR(old_state), IBSP_SOCKET_STATE_STR(new_state), calling_func, line));\r
+               return;\r
+       }\r
+\r
+       fzprint(("%s():0x%x:0x%x: socket=0x%p %s to %s, called by %s():%d\n", __FUNCTION__,\r
+                        GetCurrentProcessId(),\r
+                        GetCurrentThreadId(), s,\r
+                        IBSP_SOCKET_STATE_STR(old_state),\r
+                        IBSP_SOCKET_STATE_STR(new_state), calling_func, line));\r
+\r
+       s->socket_state = new_state;\r
+}\r
 \r
 #define IBSP_CHANGE_SOCKET_STATE(socket_info, new_state) \\r
        ibsp_css(__FUNCTION__, __LINE__, socket_info, new_state)\r