From 30c3defa047a4a8cd5e5c7454795b6fde4b5187e Mon Sep 17 00:00:00 2001 From: ftillier Date: Tue, 27 Sep 2005 00:20:06 +0000 Subject: [PATCH] [WSD] Changed all debug macros to use IBSP_XXX instead of CL_XXX - it makes the code much easier to read. Re-applied changes to ibspdll.rc resource file lost in previous checkin. Signed-off-by: Fab Tillier (ftillier@silverstorm.com) git-svn-id: svn://openib.tc.cornell.edu/gen1@86 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/ulp/wsd/user/extensions.c | 34 +++--- trunk/ulp/wsd/user/ib_cm.c | 60 +++++----- trunk/ulp/wsd/user/ibsp_duplicate.c | 32 ++--- trunk/ulp/wsd/user/ibsp_iblow.c | 110 ++++++++--------- trunk/ulp/wsd/user/ibsp_ip.c | 80 ++++++------- trunk/ulp/wsd/user/ibsp_mem.c | 43 +++---- trunk/ulp/wsd/user/ibsp_pnp.c | 64 +++++----- trunk/ulp/wsd/user/ibspdll.c | 179 ++++++++++++++-------------- trunk/ulp/wsd/user/ibspdll.rc | 14 ++- trunk/ulp/wsd/user/misc.c | 2 +- 10 files changed, 312 insertions(+), 306 deletions(-) diff --git a/trunk/ulp/wsd/user/extensions.c b/trunk/ulp/wsd/user/extensions.c index 1aac9beb..ff8456b4 100644 --- a/trunk/ulp/wsd/user/extensions.c +++ b/trunk/ulp/wsd/user/extensions.c @@ -48,22 +48,21 @@ IBSPRegisterMemory( ib_access_t access_ctrl; struct memory_node *node; - CL_ENTER( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_MEM ); fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s)); if( lpBuffer == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("invalid buffer %p\n", lpBuffer) ); + IBSP_ERROR_EXIT( ("invalid buffer %p\n", lpBuffer) ); *lpErrno = WSAEFAULT; return NULL; } if( dwBufferLength > socket_info->socket_options.max_msg_size ) { - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, - ("invalid buffer length %d\n", dwBufferLength) ); + IBSP_ERROR_EXIT( ("invalid buffer length %d\n", dwBufferLength) ); *lpErrno = WSAEFAULT; return NULL; } @@ -83,7 +82,7 @@ IBSPRegisterMemory( break; default: - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("invalid flags %x\n", dwFlags) ); + IBSP_ERROR_EXIT( ("invalid flags %x\n", dwFlags) ); *lpErrno = WSAEINVAL; return NULL; } @@ -98,17 +97,17 @@ IBSPRegisterMemory( if( node == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, + IBSP_ERROR_EXIT( ("ib_register_memory failed (pd=%p)\n", socket_info->hca_pd) ); *lpErrno = WSAENOBUFS; } else { - CL_TRACE_EXIT( IBSP_DBG_MEM, gdbg_lvl, ("returning node %p\n", node) ); + IBSP_TRACE_EXIT( IBSP_DBG_MEM, ("returning node %p\n", node) ); *lpErrno = 0; } - CL_EXIT( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_MEM ); return (HANDLE) node; } @@ -172,7 +171,7 @@ IBSPRegisterRdmaMemory( ib_access_t access_ctrl; struct ibsp_hca *hca; - CL_ENTER( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_MEM ); fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s)); @@ -180,7 +179,7 @@ IBSPRegisterRdmaMemory( if( *lpdwDescriptorLength < sizeof(struct rdma_memory_desc) ) { /* This is the probe from the switch to learn the length of the descriptor. */ - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, + IBSP_ERROR_EXIT( ("invalid descriptor length %d (usually not an error)\n", *lpdwDescriptorLength) ); *lpdwDescriptorLength = sizeof(struct rdma_memory_desc); @@ -190,15 +189,14 @@ IBSPRegisterRdmaMemory( if( lpBuffer == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("invalid buffer %p\n", lpBuffer) ); + IBSP_ERROR_EXIT( ("invalid buffer %p\n", lpBuffer) ); *lpErrno = WSAEFAULT; return SOCKET_ERROR; } if( dwBufferLength > socket_info->socket_options.max_msg_size ) { - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, - ("invalid buffer length %d\n", dwBufferLength) ); + IBSP_ERROR_EXIT( ("invalid buffer length %d\n", dwBufferLength) ); *lpErrno = WSAEFAULT; return SOCKET_ERROR; } @@ -220,7 +218,7 @@ IBSPRegisterRdmaMemory( break; default: - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("invalid flags %x\n", dwFlags) ); + IBSP_ERROR_EXIT( ("invalid flags %x\n", dwFlags) ); *lpErrno = WSAEINVAL; return SOCKET_ERROR; } @@ -232,8 +230,7 @@ IBSPRegisterRdmaMemory( if( node == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, - ("ib_register_memory failed %d\n", *lpErrno) ); + IBSP_ERROR_EXIT( ("ib_register_memory failed %d\n", *lpErrno) ); *lpErrno = WSAENOBUFS; return SOCKET_ERROR; } @@ -251,7 +248,7 @@ IBSPRegisterRdmaMemory( __FUNCTION__, lpBuffer, (unsigned char *)lpBuffer + dwBufferLength, dwBufferLength, node)); - CL_EXIT( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_MEM ); return 0; } @@ -343,7 +340,8 @@ do_rdma_op( if( socket_info->socket_state != IBSP_CONNECTED ) { IBSP_ERROR_EXIT( - ("Socket is not in connected socket_state \n") ); + ("Socket is not in connected socket_state state=%s\n", + IBSP_SOCKET_STATE_STR( socket_info->socket_state )) ); *lpErrno = WSAENOTCONN; return SOCKET_ERROR; } diff --git a/trunk/ulp/wsd/user/ib_cm.c b/trunk/ulp/wsd/user/ib_cm.c index d3f64353..82d8057f 100644 --- a/trunk/ulp/wsd/user/ib_cm.c +++ b/trunk/ulp/wsd/user/ib_cm.c @@ -174,7 +174,7 @@ cm_req_callback( #if 0 cl_spinlock_release( &socket_info->mutex ); - CL_EXIT_ERROR( IBSP_DBG_CM, gdbg_lvl, ("rejecting\n") ); + IBSP_ERROR_EXIT( ("rejecting\n") ); ib_reject( p_cm_req_rec->h_cm_req, IB_REJ_USER_DEFINED ); ibsp_dup_overlap_abort( socket_info ); return; @@ -225,7 +225,7 @@ cm_rep_callback( ib_cm_rtu_t cm_rtu; ib_api_status_t status; - CL_ENTER( IBSP_DBG_CM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CM ); memset( &cm_rtu, 0, sizeof(cm_rtu) ); @@ -247,7 +247,7 @@ cm_rep_callback( if( status != IB_SUCCESS ) { /* Note: a REJ has been automatically sent. */ - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("ib_cm_rtu failed (0x%d)\n", status) ); + IBSP_ERROR( ("ib_cm_rtu failed (0x%d)\n", status) ); IBSP_CHANGE_SOCKET_STATE( socket_info, IBSP_BIND ); ibsp_post_select_event( socket_info, FD_CONNECT, WSAETIMEDOUT ); } @@ -263,7 +263,7 @@ cm_rep_callback( if( status != IB_SUCCESS ) { /* Note: a REJ has been automatically sent. */ - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("ib_cm_rtu failed (0x%d)\n", status) ); + IBSP_ERROR( ("ib_cm_rtu failed (0x%d)\n", status) ); } else { @@ -273,7 +273,7 @@ cm_rep_callback( default: /* The socket might be closing */ - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("socket %x not in connecting state (%s)\n", + IBSP_ERROR( ("socket %x not in connecting state (%s)\n", socket_info, IBSP_SOCKET_STATE_STR( socket_info->socket_state )) ); ib_reject( p_cm_rep_rec->h_cm_rep, IB_REJ_USER_DEFINED ); @@ -281,7 +281,7 @@ cm_rep_callback( cl_spinlock_release( &socket_info->mutex ); - CL_EXIT( IBSP_DBG_CM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CM ); } @@ -296,7 +296,7 @@ cm_rtu_callback( struct ibsp_socket_info *socket_info = (struct ibsp_socket_info * __ptr64)p_cm_rtu_rec->qp_context; - CL_ENTER( IBSP_DBG_CM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CM ); cl_spinlock_acquire( &socket_info->mutex ); @@ -371,7 +371,7 @@ cm_rtu_callback( } else { - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, + IBSP_ERROR( ("ib_post_recv returned %s for reposted buffer\n", ib_get_err_str( status )) ); @@ -390,7 +390,7 @@ cm_rtu_callback( else { /* The Socket might be closing */ - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, + IBSP_ERROR( ("Got RTU while in socket_state %s - ignoring\n", IBSP_SOCKET_STATE_STR( socket_info->socket_state )) ); } @@ -467,11 +467,11 @@ cm_mra_callback( IN ib_cm_mra_rec_t *p_cm_mra_rec ) { /* TODO */ - CL_ENTER( IBSP_DBG_CM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CM ); UNUSED_PARAM( p_cm_mra_rec ); - CL_EXIT( IBSP_DBG_CM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CM ); } @@ -553,9 +553,9 @@ static void AL_API cm_drep_callback( IN ib_cm_drep_rec_t *p_cm_drep_rec ) { - CL_ENTER( IBSP_DBG_CM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CM ); UNUSED_PARAM( p_cm_drep_rec ); - CL_EXIT( IBSP_DBG_CM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CM ); } @@ -568,15 +568,15 @@ listen_err_callback( IN ib_listen_err_rec_t *p_listen_err_rec ) { /* TODO */ - CL_ENTER( IBSP_DBG_CM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CM ); UNUSED_PARAM( p_listen_err_rec ); - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("not implemented") ); + IBSP_ERROR( ("not implemented") ); CL_ASSERT( 0 ); - CL_EXIT( IBSP_DBG_CM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CM ); } @@ -589,15 +589,15 @@ cm_apr_callback( IN ib_cm_apr_rec_t *p_cm_apr_rec ) { /* TODO */ - CL_ENTER( IBSP_DBG_CM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CM ); UNUSED_PARAM( p_cm_apr_rec ); - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("not implemented")); + IBSP_ERROR( ("not implemented")); CL_ASSERT( 0 ); - CL_EXIT( IBSP_DBG_CM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CM ); } @@ -612,15 +612,15 @@ cm_lap_callback( IN ib_cm_lap_rec_t *p_cm_lap_rec ) { /* TODO */ - CL_ENTER( IBSP_DBG_CM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CM ); UNUSED_PARAM( p_cm_lap_rec ); - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("not implemented")); + IBSP_ERROR( ("not implemented")); CL_ASSERT( 0 ); - CL_EXIT( IBSP_DBG_CM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CM ); } @@ -633,7 +633,7 @@ ib_listen( ib_cm_listen_t param; ib_api_status_t status; - CL_ENTER( IBSP_DBG_CM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CM ); memset( ¶m, 0, sizeof(param) ); @@ -671,14 +671,14 @@ ib_listen( if( status != IB_SUCCESS ) { - CL_EXIT_ERROR( IBSP_DBG_CM, gdbg_lvl, ("ib_cm_listen failed (0x%d)\n", status) ); + IBSP_ERROR_EXIT( ("ib_cm_listen failed (0x%d)\n", status) ); *lpErrno = ibal_to_wsa_error( status ); return SOCKET_ERROR; } STAT_INC( listen_num ); - CL_TRACE_EXIT( IBSP_DBG_CM, gdbg_lvl, + IBSP_TRACE_EXIT( IBSP_DBG_CM, ("started listening for port %d\n", CL_HTON16( socket_info->local_addr.sin_port )) ); @@ -724,7 +724,7 @@ ib_listen_cancel( status = ib_cm_cancel( socket_info->listen.handle, ib_sync_destroy ); if( status ) { - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, + IBSP_ERROR( ("ib_cm_cancel returned %s\n", ib_get_err_str( status )) ); } else @@ -758,9 +758,9 @@ ib_connect( fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), socket_info)); - CL_TRACE( IBSP_DBG_CM, gdbg_lvl, ("From:\n") ); + IBSP_TRACE( IBSP_DBG_CM, ("From:\n") ); DebugPrintSockAddr( IBSP_DBG_CM, gdbg_lvl, &socket_info->local_addr ); - CL_TRACE( IBSP_DBG_CM, gdbg_lvl, ("To:\n") ); + IBSP_TRACE( IBSP_DBG_CM, ("To:\n") ); DebugPrintSockAddr( IBSP_DBG_CM, gdbg_lvl, &socket_info->peer_addr ); /* Insert into the connection map. */ @@ -783,10 +783,10 @@ ib_connect( params.listen_req_param.dwProcessId = socket_info->duplicate.dwProcessId; params.listen_req_param.identifier = socket_info->duplicate.identifier; - CL_TRACE( IBSP_DBG_CM, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_CM, ("ib_connect listen params: %x %x\n", params.listen_req_param.dwProcessId, params.listen_req_param.identifier) ); - CL_TRACE( IBSP_DBG_CM, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_CM, ("connecting to port %d, SID=%016I64x\n", socket_info->peer_addr.sin_port, cm_req.svc_id) ); diff --git a/trunk/ulp/wsd/user/ibsp_duplicate.c b/trunk/ulp/wsd/user/ibsp_duplicate.c index 9497ae7a..e7108f5d 100644 --- a/trunk/ulp/wsd/user/ibsp_duplicate.c +++ b/trunk/ulp/wsd/user/ibsp_duplicate.c @@ -79,7 +79,7 @@ setup_duplicate_socket( fname ); // name of map object if( h == NULL ) { - CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR( ("CreateFileMapping failed with %d\n", GetLastError()) ); ret = WSAENETDOWN; goto done; @@ -89,7 +89,7 @@ setup_duplicate_socket( if( GetLastError() != ERROR_ALREADY_EXISTS ) { CloseHandle( h ); - CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("not mapping for socket duplicate info\n") ); + IBSP_ERROR( ("not mapping for socket duplicate info\n") ); ret = WSAENETDOWN; goto done; } @@ -102,7 +102,7 @@ setup_duplicate_socket( 0 ); // default: map entire file if( dup_info == NULL ) { - CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR( ("MapViewOfFile failed with %d\n", GetLastError()) ); ret = WSAENETDOWN; goto done; @@ -118,7 +118,7 @@ setup_duplicate_socket( if( socket_info->switch_socket == INVALID_SOCKET ) { - CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR( ("WPUCreateSocketHandle() failed: %d", ret) ); goto done; } @@ -143,7 +143,7 @@ setup_duplicate_socket( socket_info->port = get_port_from_ip_address( dup_info->local_addr.sin_addr ); if( socket_info->port == NULL ) { - CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR( ("incoming destination IP address not local (%s)\n", inet_ntoa( dup_info->local_addr.sin_addr )) ); ret = WSAENETDOWN; @@ -153,7 +153,7 @@ setup_duplicate_socket( ret = ib_create_socket( socket_info ); if( ret ) { - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR_EXIT( ("ib_create socket failed with %d\n", ret) ); ret = WSAENOBUFS; goto done; @@ -165,7 +165,7 @@ setup_duplicate_socket( &dest_port_guid ); if( ret ) { - CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("query_guid_address failed for IP %08x\n", + IBSP_ERROR( ("query_guid_address failed for IP %08x\n", socket_info->peer_addr.sin_addr.s_addr) ); ret = WSAEHOSTUNREACH; goto done; @@ -175,7 +175,7 @@ setup_duplicate_socket( ret = query_pr( socket_info->port, dest_port_guid, &path_rec ); if( ret ) { - CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("query_pr failed for IP %08x\n", + IBSP_ERROR( ("query_pr failed for IP %08x\n", socket_info->peer_addr.sin_addr.s_addr) ); ret = WSAEHOSTUNREACH; goto done; @@ -188,20 +188,20 @@ setup_duplicate_socket( ret = ib_connect( socket_info, &path_rec ); if( ret != WSAEWOULDBLOCK ) { - CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("ib_connect failed (%d)\n", ret) ); + IBSP_ERROR( ("ib_connect failed (%d)\n", ret) ); goto done; } if( WaitForSingleObject( socket_info->h_event, INFINITE ) != WAIT_OBJECT_0 ) { - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("WaitForSingleObject failed\n") ); + IBSP_ERROR( ("WaitForSingleObject failed\n") ); } cl_spinlock_acquire( &socket_info->mutex ); if( socket_info->socket_state != IBSP_CONNECTED ) { cl_spinlock_release( &socket_info->mutex ); - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("Failed to connect\n") ); + IBSP_ERROR( ("Failed to connect\n") ); ret = WSAEHOSTUNREACH; goto done; } @@ -219,7 +219,7 @@ done: socket_info->h_event = NULL; } - CL_EXIT( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CONN ); return ret; } @@ -284,7 +284,7 @@ prepare_duplicate_socket( if( socket_info->duplicate.mmap_handle == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR_EXIT( ("CreateFileMapping failed with %d\n", GetLastError()) ); return WSAENETDOWN; } @@ -307,7 +307,7 @@ prepare_duplicate_socket( 0 ); // default: map entire file if( dup_info == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR_EXIT( ("MapViewOfFile failed with %d\n", GetLastError()) ); CloseHandle( socket_info->duplicate.mmap_handle ); socket_info->duplicate.mmap_handle = NULL; @@ -317,7 +317,7 @@ prepare_duplicate_socket( if( dup_info == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("failed to get a unique identifier\n") ); + IBSP_ERROR_EXIT( ("failed to get a unique identifier\n") ); CloseHandle( socket_info->duplicate.mmap_handle ); socket_info->duplicate.mmap_handle = NULL; return WSAENETDOWN; @@ -346,6 +346,6 @@ prepare_duplicate_socket( dup_info->dwProcessId = dwProcessId; /* And that's it */ - CL_EXIT( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CONN ); return 0; } diff --git a/trunk/ulp/wsd/user/ibsp_iblow.c b/trunk/ulp/wsd/user/ibsp_iblow.c index 38103a3b..130d45d3 100644 --- a/trunk/ulp/wsd/user/ibsp_iblow.c +++ b/trunk/ulp/wsd/user/ibsp_iblow.c @@ -308,7 +308,7 @@ ib_cq_comp( int comp_count; #endif - CL_ENTER( IBSP_DBG_WQ, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_WQ ); CL_ASSERT( WC_LIST_SIZE >= 1 ); @@ -326,7 +326,7 @@ ib_cq_comp( status = ib_poll_cq( cq_tinfo->cq, &free_wclist, &done_wclist ); - CL_TRACE( IBSP_DBG_WQ, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_WQ, ("%s():%d:0x%x:0x%x: poll CQ got status %d, free=%p, done=%p\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), status, free_wclist, done_wclist) ); @@ -340,12 +340,12 @@ ib_cq_comp( case IB_INVALID_CQ_HANDLE: /* This happens when the switch closes the socket while the * execution thread was calling lpWPUCompleteOverlappedRequest. */ - CL_ERROR( IBSP_DBG_WQ, gdbg_lvl, + IBSP_ERROR( ("ib_poll_cq returned IB_INVLALID_CQ_HANDLE\n") ); goto done; default: - CL_ERROR( IBSP_DBG_WQ, gdbg_lvl, + IBSP_ERROR( ("ib_poll_cq failed returned %s\n", ib_get_err_str( status )) ); break; } @@ -401,7 +401,7 @@ ib_cq_comp( status = ib_rearm_cq( cq_tinfo->cq, FALSE ); if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_WQ, gdbg_lvl, + IBSP_ERROR( ("ib_rearm_cq returned %s)\n", ib_get_err_str( status )) ); } @@ -414,7 +414,7 @@ done: GetCurrentThreadId(), g_ibsp.overlap_h0_count, g_ibsp.overlap_h1_count)); #endif - CL_EXIT( IBSP_DBG_WQ, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_WQ ); } @@ -426,7 +426,7 @@ ib_cq_thread( struct cq_thread_info *cq_tinfo = (struct cq_thread_info *)lpParameter; cl_status_t cl_status; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); fzprint(("%s():%d:0x%x:0x%x: cq_tinfo=0x%p\n", __FUNCTION__, @@ -437,7 +437,7 @@ ib_cq_thread( cl_status = cl_waitobj_wait_on( cq_tinfo->cq_waitobj, EVENT_NO_TIMEOUT, TRUE ); if( cl_status != CL_SUCCESS ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, + IBSP_ERROR( ("cl_waitobj_wait_on() (%d)\n", cl_status) ); } @@ -461,12 +461,12 @@ ib_cq_thread( cl_status = cl_waitobj_destroy( cq_tinfo->cq_waitobj ); if( cl_status != CL_SUCCESS ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("cl_waitobj_destroy() (%d)\n", cl_status) ); + IBSP_ERROR( ("cl_waitobj_destroy() (%d)\n", cl_status) ); } HeapFree( g_ibsp.heap, 0, cq_tinfo ); /* No special exit code, even on errors. */ - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); ExitThread( 0 ); } @@ -481,13 +481,13 @@ ib_alloc_cq_tinfo( cl_status_t cl_status; int error; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); cq_tinfo = HeapAlloc( g_ibsp.heap, HEAP_ZERO_MEMORY, sizeof(struct cq_thread_info) ); if( cq_tinfo == NULL ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("HeapAlloc() Failed.\n") ); + IBSP_ERROR( ("HeapAlloc() Failed.\n") ); error = TRUE; goto done; } @@ -496,7 +496,7 @@ ib_alloc_cq_tinfo( if( cl_status != CL_SUCCESS ) { cq_tinfo->cq_waitobj = NULL; - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("cl_waitobj_create() (%d)\n", cl_status) ); + IBSP_ERROR( ("cl_waitobj_create() (%d)\n", cl_status) ); error = TRUE; goto done; } @@ -509,7 +509,7 @@ ib_alloc_cq_tinfo( if( cq_tinfo->ib_cq_thread == NULL ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("CreateThread failed.") ); + IBSP_ERROR( ("CreateThread failed.") ); error = TRUE; goto done; } @@ -527,7 +527,7 @@ ib_alloc_cq_tinfo( &cq_tinfo->cq ); if( status ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_create_cq failed (%d)\n", status) ); + IBSP_ERROR( ("ib_create_cq failed (%d)\n", status) ); error = TRUE; goto done; } @@ -537,7 +537,7 @@ ib_alloc_cq_tinfo( status = ib_rearm_cq( cq_tinfo->cq, FALSE ); if( status ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_rearm_cq failed (%d)\n", status) ); + IBSP_ERROR( ("ib_rearm_cq failed (%d)\n", status) ); error = TRUE; goto done; } @@ -558,7 +558,7 @@ done: cq_tinfo = NULL; } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return (cq_tinfo); } @@ -574,7 +574,7 @@ ib_destroy_cq_tinfo( ib_api_status_t status; HANDLE h_cq_thread; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); if( cq_tinfo == NULL ) { @@ -588,14 +588,14 @@ ib_destroy_cq_tinfo( while( ib_poll_cq( cq_tinfo->cq, &free_wclist, &done_wclist ) == IB_SUCCESS ) { - CL_TRACE( IBSP_DBG_WQ, gdbg_lvl, ("%s():%d:0x%x:0x%x: free=%p, done=%p\n", + IBSP_TRACE( IBSP_DBG_WQ, ("%s():%d:0x%x:0x%x: free=%p, done=%p\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), free_wclist, done_wclist) ); } - CL_TRACE( IBSP_DBG_WQ, gdbg_lvl, ("%s():%d:0x%x:0x%x: ib_destroy_cq() start..\n", + IBSP_TRACE( IBSP_DBG_WQ, ("%s():%d:0x%x:0x%x: ib_destroy_cq() start..\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId()) ); @@ -606,11 +606,11 @@ ib_destroy_cq_tinfo( status = ib_destroy_cq( cq_tinfo->cq, ib_sync_destroy ); if( status ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_destroy_cq failed (%d)\n", status) ); + IBSP_ERROR( ("ib_destroy_cq failed (%d)\n", status) ); } else { - CL_TRACE( IBSP_DBG_WQ, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_WQ, ("%s():%d:0x%x:0x%x: ib_destroy_cq() finished.\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId()) ); @@ -641,7 +641,7 @@ ib_destroy_cq_tinfo( cq_tinfo->ib_cq_thread_id )); if( WaitForSingleObject( h_cq_thread, INFINITE ) != WAIT_OBJECT_0 ) { - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("WaitForSingleObject failed\n") ); + IBSP_ERROR( ("WaitForSingleObject failed\n") ); } else { @@ -668,7 +668,7 @@ ib_destroy_cq_tinfo( HeapFree( g_ibsp.heap, 0, cq_tinfo ); } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } @@ -679,7 +679,7 @@ ib_acquire_cq_tinfo( struct cq_thread_info *cq_tinfo = NULL; uint32_t current_cqe_size; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); /* * TODO: If future implementations require more than 1 cq_tinfo per HCA, then @@ -690,7 +690,7 @@ ib_acquire_cq_tinfo( cq_tinfo = ib_alloc_cq_tinfo( hca ); if( cq_tinfo == NULL ) { - CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("ib_alloc_cq_tinfo() failed\n") ); + IBSP_ERROR( ("ib_alloc_cq_tinfo() failed\n") ); return (NULL); } } @@ -716,7 +716,7 @@ ib_acquire_cq_tinfo( * more than one cq per HCA in the future. */ cl_atomic_dec( &cq_tinfo->qp_count ); - CL_EXIT_ERROR( IBSP_DBG_EP, gdbg_lvl, + IBSP_ERROR_EXIT( ("ib_modify_cq() failed. (%d)\n", status) ); return (NULL); } @@ -731,7 +731,7 @@ ib_acquire_cq_tinfo( } } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return (cq_tinfo); } @@ -740,13 +740,13 @@ void ib_release_cq_tinfo( struct cq_thread_info *cq_tinfo ) { - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); cl_atomic_dec( &cq_tinfo->qp_count ); /* TODO: downsize the cq */ - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } @@ -756,7 +756,7 @@ ib_release(void) { cl_fmap_item_t *p_item; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); if( g_ibsp.al_handle ) { @@ -788,11 +788,11 @@ ib_release(void) status)); if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_close_al failed (%d)\n", status) ); + IBSP_ERROR( ("ib_close_al failed (%d)\n", status) ); } else { - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("ib_close_al success\n") ); + IBSP_TRACE( IBSP_DBG_HW, ("ib_close_al success\n") ); STAT_DEC( al_num ); } g_ibsp.al_handle = NULL; @@ -808,7 +808,7 @@ ib_release(void) PARENT_STRUCT(p_item, struct ibsp_ip_addr, item) ); } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } @@ -819,7 +819,7 @@ ibsp_initialize(void) ib_api_status_t status; int ret; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); CL_ASSERT( g_ibsp.al_handle == NULL ); CL_ASSERT( cl_qlist_count( &g_ibsp.hca_list ) == 0 ); @@ -827,11 +827,11 @@ ibsp_initialize(void) /* Open the IB library */ status = ib_open_al( &g_ibsp.al_handle ); - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("open is %d %p\n", status, g_ibsp.al_handle) ); + IBSP_TRACE( IBSP_DBG_HW, ("open is %d %p\n", status, g_ibsp.al_handle) ); if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_open_al failed (%d)\n", status) ); + IBSP_ERROR( ("ib_open_al failed (%d)\n", status) ); ret = WSAEPROVIDERFAILEDINIT; goto done; } @@ -842,7 +842,7 @@ ibsp_initialize(void) status = register_pnp(); if( status ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("register_pnp failed (%d)\n", status) ); + IBSP_ERROR( ("register_pnp failed (%d)\n", status) ); ret = WSAEPROVIDERFAILEDINIT; goto done; } @@ -860,7 +860,7 @@ done: ib_release(); } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return ret; } @@ -873,18 +873,18 @@ ib_destroy_socket( { ib_api_status_t status; - CL_ENTER( IBSP_DBG_EP, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_EP ); if( socket_info->qp ) { status = ib_destroy_qp( socket_info->qp, ib_sync_destroy ); if( status ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_destroy_qp failed (%d)\n", status) ); + IBSP_ERROR( ("ib_destroy_qp failed (%d)\n", status) ); } else { - CL_TRACE( IBSP_DBG_WQ, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_WQ, ("%s():%d:0x%x:0x%x: ib_destroy_qp() finished\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId()) ); @@ -896,7 +896,7 @@ ib_destroy_socket( } } - CL_EXIT( IBSP_DBG_EP, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_EP ); } @@ -914,7 +914,7 @@ ib_create_socket( struct ibsp_hca *hca; ib_qp_attr_t qp_attr; - CL_ENTER( IBSP_DBG_EP, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_EP ); CL_ASSERT( socket_info != NULL ); CL_ASSERT( socket_info->port != NULL ); @@ -927,7 +927,7 @@ ib_create_socket( cq_tinfo = ib_acquire_cq_tinfo( hca ); if( cq_tinfo == NULL ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_acquire_cq_tinfo failed\n") ); + IBSP_ERROR( ("ib_acquire_cq_tinfo failed\n") ); ret = WSAEPROVIDERFAILEDINIT; goto done; } @@ -948,7 +948,7 @@ ib_create_socket( &socket_info->qp ); if( status ) { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_create_qp failed (%d)\n", status)); + IBSP_ERROR( ("ib_create_qp failed (%d)\n", status)); ret = WSAEPROVIDERFAILEDINIT; goto done; } @@ -960,7 +960,7 @@ ib_create_socket( } else { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, + IBSP_ERROR( ("ib_query_qp returned %s\n", ib_get_err_str( status )) ); socket_info->max_inline = 0; } @@ -975,7 +975,7 @@ ib_create_socket( ib_destroy_socket( socket_info ); } - CL_EXIT( IBSP_DBG_EP, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_EP ); return ret; } @@ -985,11 +985,11 @@ void wait_cq_drain( IN OUT struct ibsp_socket_info *socket_info ) { - CL_ENTER( IBSP_DBG_EP, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_EP ); if( socket_info->cq_tinfo == NULL ) { - CL_EXIT( IBSP_DBG_EP, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_EP ); return; } @@ -1003,7 +1003,7 @@ wait_cq_drain( Sleep(100); } - CL_EXIT( IBSP_DBG_EP, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_EP ); } @@ -1016,7 +1016,7 @@ ibsp_dup_overlap_abort( int ret; uint8_t idx; - CL_ENTER( IBSP_DBG_EP, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_EP ); CL_ASSERT( !socket_info->send_cnt && !socket_info->recv_cnt ); /* Browse the list of all posted overlapped structures @@ -1088,7 +1088,7 @@ ibsp_dup_overlap_abort( cl_atomic_dec( &socket_info->dup_cnt ); } - CL_EXIT( IBSP_DBG_EP, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_EP ); } @@ -1099,7 +1099,7 @@ shutdown_and_destroy_socket_info( { enum ibsp_socket_state old_state; - CL_ENTER( IBSP_DBG_EP, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_EP ); cl_spinlock_acquire( &socket_info->mutex ); old_state = socket_info->socket_state; @@ -1167,7 +1167,7 @@ shutdown_and_destroy_socket_info( /* Release the initial reference and clean up. */ deref_socket_info( socket_info ); - CL_EXIT( IBSP_DBG_EP, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_EP ); } diff --git a/trunk/ulp/wsd/user/ibsp_ip.c b/trunk/ulp/wsd/user/ibsp_ip.c index 27f547f7..0ad69600 100644 --- a/trunk/ulp/wsd/user/ibsp_ip.c +++ b/trunk/ulp/wsd/user/ibsp_ip.c @@ -80,15 +80,15 @@ query_ip_address_callback( (struct ip_query_context * __ptr64)p_query_rec->query_context; cl_fmap_item_t *p_item; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, + IBSP_ENTER( IBSP_DBG_HW ); + IBSP_TRACE( IBSP_DBG_HW, ("status is %s\n", ib_get_err_str( p_query_rec->status )) ); if( p_query_rec->status == IB_SUCCESS ) { unsigned int i; - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("got %d records\n", p_query_rec->result_cnt) ); + IBSP_TRACE( IBSP_DBG_HW, ("got %d records\n", p_query_rec->result_cnt) ); for( i = 0; i < p_query_rec->result_cnt; i++ ) { @@ -100,7 +100,7 @@ query_ip_address_callback( HeapAlloc( g_ibsp.heap, HEAP_ZERO_MEMORY, sizeof(struct ibsp_ip_addr) ); if( !ip_addr ) { - CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, ("no memory\n") ); + IBSP_ERROR_EXIT( ("no memory\n") ); break; } @@ -114,26 +114,26 @@ query_ip_address_callback( if( p_item != &ip_addr->item ) { /* Duplicate! Should never happen. */ - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("Got duplicate addr %s\n", inet_ntoa( ip_addr->ip_addr )) ); HeapFree( g_ibsp.heap, 0, ip_addr ); continue; } - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_HW, (" Got addr %s\n", inet_ntoa( ip_addr->ip_addr )) ); } } else if( p_query_rec->p_result_mad ) { - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("SA status is %x\n", + IBSP_TRACE( IBSP_DBG_HW, ("SA status is %x\n", p_query_rec->p_result_mad->p_mad_buf->status) ); } if( p_query_rec->p_result_mad ) ib_put_mad( p_query_rec->p_result_mad ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } @@ -150,7 +150,7 @@ query_ip_address( ib_query_req_t query_req; ib_api_status_t status; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); /* The list must be initialized and empty */ CL_ASSERT( !cl_fmap_count( p_ip_map ) ); @@ -189,14 +189,14 @@ query_ip_address( if( status != IB_SUCCESS && status != IB_INVALID_GUID ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_query failed (%d)\n", status) ); + IBSP_ERROR( ("ib_query failed (%d)\n", status) ); CL_ASSERT( !cl_fmap_count( p_ip_map ) ); - CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR_EXIT( ("Failed to build list of IP addr for port %016I64x\n", CL_HTON64( p_port->guid )) ); - CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, ("query_ip_address failed\n") ); + IBSP_ERROR_EXIT( ("query_ip_address failed\n") ); return 1; } @@ -204,7 +204,7 @@ query_ip_address( __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), status)); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return 0; } @@ -227,7 +227,7 @@ update_ip_addresses( ret = query_ip_address( port, &dup_ip ); if( ret ) { - CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR_EXIT( ("query_ip_address failed (%d)\n", ret) ); return 1; } @@ -289,7 +289,7 @@ update_all_ip_addrs(void) struct ibsp_hca *p_hca; struct ibsp_port *p_port; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); cl_spinlock_acquire( &g_ibsp.hca_mutex ); for( p_hca_item = cl_qlist_head( &g_ibsp.hca_list ); @@ -310,7 +310,7 @@ update_all_ip_addrs(void) } cl_spinlock_release( &g_ibsp.hca_mutex ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } /*--------------------------------------------------------------------------*/ @@ -333,8 +333,8 @@ query_guid_callback( (struct query_guid_context * __ptr64)p_query_rec->query_context; ib_service_record_t *service_record; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, + IBSP_ENTER( IBSP_DBG_HW ); + IBSP_TRACE( IBSP_DBG_HW, ("status is %d, count is %d\n", p_query_rec->status, p_query_rec->result_cnt) ); @@ -356,7 +356,7 @@ query_guid_callback( if( p_query_rec->p_result_mad ) ib_put_mad( p_query_rec->p_result_mad ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } @@ -374,7 +374,7 @@ query_guid_address( ib_query_req_t query_req; ib_api_status_t status; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); query_req.query_type = IB_QUERY_USER_DEFINED; query_req.p_query_input = &user_query; @@ -412,13 +412,13 @@ query_guid_address( if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_query failed (%d)\n", status) ); + IBSP_ERROR( ("ib_query failed (%d)\n", status) ); goto error; } if( query_context.status != IB_SUCCESS ) { - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_HW, ("query success, but no GUID for IP address %x (query status %d)\n", ip_addr, query_context.status) ); goto error; @@ -426,11 +426,11 @@ query_guid_address( *port_guid = query_context.guid; - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return 0; error: - CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, ("query_ip_address failed\n") ); + IBSP_ERROR_EXIT( ("query_ip_address failed\n") ); return 1; } @@ -454,8 +454,8 @@ query_pr_callback( (struct query_pr_context * __ptr64)p_query_rec->query_context; ib_api_status_t status; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("status is %d\n", p_query_rec->status) ); + IBSP_ENTER( IBSP_DBG_HW ); + IBSP_TRACE( IBSP_DBG_HW, ("status is %d\n", p_query_rec->status) ); if( p_query_rec->status == IB_SUCCESS && p_query_rec->result_cnt ) { @@ -478,7 +478,7 @@ query_pr_callback( if( p_query_rec->p_result_mad ) status = ib_put_mad( p_query_rec->p_result_mad ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } @@ -495,7 +495,7 @@ query_pr( ib_query_req_t query_req; ib_api_status_t status; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); query_req.query_type = IB_QUERY_PATH_REC_BY_GIDS; query_req.p_query_input = &user_query; @@ -514,7 +514,7 @@ query_pr( fzprint(("%s():%d:0x%x:0x%x: Calling ib_query()..\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId())); - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_HW, ("Query for path from %I64x to %I64x\n", port->guid, dest_port_guid) ); @@ -522,7 +522,7 @@ query_pr( if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_query failed (%d)\n", status) ); + IBSP_ERROR( ("ib_query failed (%d)\n", status) ); goto error; } @@ -531,7 +531,7 @@ query_pr( if( query_context.status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("query failed (%d)\n", query_context.status) ); + IBSP_ERROR( ("query failed (%d)\n", query_context.status) ); goto error; } @@ -543,11 +543,11 @@ query_pr( path_rec->mtu |= IB_MTU_1024; } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return 0; error: - CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, ("query_ip_address failed\n") ); + IBSP_ERROR_EXIT( ("query_ip_address failed\n") ); return 1; } @@ -569,7 +569,7 @@ build_ip_list( struct sockaddr_in *addr; int i; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); cl_spinlock_acquire( &g_ibsp.hca_mutex ); for( p_hca_item = cl_qlist_head( &g_ibsp.hca_list ); @@ -594,7 +594,7 @@ build_ip_list( num_ip = cl_fmap_count( &g_ibsp.ip_map ); - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, (" num ip = %d\n", num_ip) ); + IBSP_TRACE( IBSP_DBG_HW, (" num ip = %d\n", num_ip) ); /* Note: the required size computed is a few bytes larger than necessary, * but that keeps the code clean. */ @@ -621,7 +621,7 @@ build_ip_list( cl_spinlock_release( &g_ibsp.ip_mutex ); *ip_list_size = (DWORD) size_req; *lpErrno = WSAEFAULT; - CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR_EXIT( ("returning efault, size %d (usually not an error)", size_req) ); return SOCKET_ERROR; } @@ -653,7 +653,7 @@ build_ip_list( cl_spinlock_release( &g_ibsp.ip_mutex ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); lpErrno = 0; return 0; @@ -669,7 +669,7 @@ get_port_from_ip_address( struct ibsp_ip_addr ip; struct ibsp_port *p_port = NULL; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); ip.ip_addr = sin_addr; ip.p_port = NULL; @@ -680,10 +680,10 @@ get_port_from_ip_address( if( p_item != cl_fmap_end( &g_ibsp.ip_map ) ) p_port = PARENT_STRUCT(p_item, struct ibsp_ip_addr, item)->p_port; else - CL_TRACE(IBSP_DBG_HW, gdbg_lvl, ("not found\n") ); + IBSP_TRACE( IBSP_DBG_HW, ("not found\n") ); cl_spinlock_release( &g_ibsp.ip_mutex ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return p_port; } diff --git a/trunk/ulp/wsd/user/ibsp_mem.c b/trunk/ulp/wsd/user/ibsp_mem.c index 86388624..6ed51229 100644 --- a/trunk/ulp/wsd/user/ibsp_mem.c +++ b/trunk/ulp/wsd/user/ibsp_mem.c @@ -78,7 +78,7 @@ lookup_partial_mr( { struct memory_node *node; - CL_ENTER( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_MEM ); cl_spinlock_acquire( &mem_list->mutex ); @@ -87,9 +87,9 @@ lookup_partial_mr( cl_spinlock_release( &mem_list->mutex ); if( node ) - CL_EXIT( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_MEM ); else - CL_TRACE_EXIT( IBSP_DBG_MEM, gdbg_lvl, ("mr not found\n") ); + IBSP_TRACE_EXIT( IBSP_DBG_MEM, ("mr not found\n") ); return node; } @@ -110,7 +110,7 @@ ib_register_memory( struct memory_node *node; ib_api_status_t status; - CL_ENTER( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_MEM ); CL_ASSERT( start != NULL ); CL_ASSERT( len != 0 ); @@ -126,7 +126,7 @@ ib_register_memory( { node->refcount++; cl_spinlock_release( &mem_list->mutex ); - CL_EXIT( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_MEM ); return node; } @@ -137,8 +137,9 @@ ib_register_memory( if( node == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, - ("AllocateOverlappedBuf:HeapAlloc() failed: %d\n", GetLastError()) ); + IBSP_ERROR_EXIT( + ("AllocateOverlappedBuf:HeapAlloc() failed: %d\n", + GetLastError()) ); *lpErrno = WSAENOBUFS; return NULL; } @@ -150,7 +151,7 @@ ib_register_memory( node->type.length = len; node->type.access_ctrl = access_ctrl; - CL_TRACE( IBSP_DBG_MEM, gdbg_lvl, ("pinning memory node %p\n", node) ); + IBSP_TRACE( IBSP_DBG_MEM, ("pinning memory node %p\n", node) ); status = ib_reg_mem( pd, &node->type, &node->lkey, &node->rkey, &node->mr_handle ); if( status ) @@ -160,11 +161,11 @@ ib_register_memory( #endif if( HeapFree( g_ibsp.heap, 0, node ) == FALSE ) { - CL_ERROR( IBSP_DBG_MEM, gdbg_lvl, + IBSP_ERROR( ("BAD: HeapFree failed (%d)\n", GetLastError()) ); } - CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("ib_reg_mem failed (%d)\n", status) ); + IBSP_ERROR_EXIT( ("ib_reg_mem failed (%d)\n", status) ); *lpErrno = WSAEFAULT; return NULL; @@ -177,7 +178,7 @@ ib_register_memory( cl_qlist_insert_head( &mem_list->list, &node->item ); cl_spinlock_release( &mem_list->mutex ); - CL_EXIT( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_MEM ); *lpErrno = 0; return node; @@ -195,14 +196,14 @@ ib_deregister_memory( ib_api_status_t status; #endif - CL_ENTER( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_MEM ); cl_spinlock_acquire( &mem_list->mutex ); if( node->refcount <= 0 ) { cl_spinlock_release( &mem_list->mutex ); - CL_ERROR( IBSP_DBG_MEM, gdbg_lvl, + IBSP_ERROR( ("ib_deregister_memory: bad refcount %d)\n", node->refcount) ); *lpErrno = WSAEINVAL; return SOCKET_ERROR; @@ -215,7 +216,7 @@ ib_deregister_memory( status = ib_dereg_mr( node->mr_handle ); if( status ) { - CL_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("ib_dereg_mr failed (%d)\n", status) ); + IBSP_ERROR( ("ib_dereg_mr failed (%d)\n", status) ); } else { @@ -227,7 +228,7 @@ ib_deregister_memory( #endif if( HeapFree( g_ibsp.heap, 0, node ) == FALSE ) { - CL_ERROR( IBSP_DBG_MEM, gdbg_lvl, + IBSP_ERROR( ("BAD: HeapFree failed (%d)\n", GetLastError()) ); } } @@ -238,7 +239,7 @@ ib_deregister_memory( cl_spinlock_release( &mem_list->mutex ); - CL_EXIT( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_MEM ); *lpErrno = 0; return 0; @@ -254,7 +255,7 @@ ib_deregister_all_mr( { cl_list_item_t *item; - CL_ENTER( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_MEM ); cl_spinlock_acquire( &mem_list->mutex ); @@ -263,11 +264,11 @@ ib_deregister_all_mr( struct memory_node *node = PARENT_STRUCT(item, struct memory_node, item); ib_api_status_t status; - CL_TRACE( IBSP_DBG_MEM, gdbg_lvl, ("unpinning ,memory node node %p\n", node) ); + IBSP_TRACE( IBSP_DBG_MEM, ("unpinning ,memory node node %p\n", node) ); status = ib_dereg_mr( node->mr_handle ); if( status ) { - CL_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("ib_dereg_mem failed (%d)\n", status) ); + IBSP_ERROR( ("ib_dereg_mem failed (%d)\n", status) ); } else { @@ -280,12 +281,12 @@ ib_deregister_all_mr( if( HeapFree( g_ibsp.heap, 0, node ) == FALSE ) { - CL_ERROR( IBSP_DBG_MEM, gdbg_lvl, + IBSP_ERROR( ("BAD: HeapFree failed (%d)\n", GetLastError()) ); } } cl_spinlock_release( &mem_list->mutex ); - CL_EXIT( IBSP_DBG_MEM, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_MEM ); } diff --git a/trunk/ulp/wsd/user/ibsp_pnp.c b/trunk/ulp/wsd/user/ibsp_pnp.c index f880b017..77f4074b 100644 --- a/trunk/ulp/wsd/user/ibsp_pnp.c +++ b/trunk/ulp/wsd/user/ibsp_pnp.c @@ -74,12 +74,12 @@ pnp_ca_add( struct ibsp_hca *hca; ib_api_status_t status; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); hca = HeapAlloc( g_ibsp.heap, HEAP_ZERO_MEMORY, sizeof(struct ibsp_hca) ); if( hca == NULL ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("can't get enough memory (%d)\n", sizeof(struct ibsp_hca)) ); status = IB_INSUFFICIENT_MEMORY; goto pnp_ca_add_err1; @@ -93,14 +93,14 @@ pnp_ca_add( cl_spinlock_init( &hca->rdma_mem_list.mutex ); /* HCA handle */ - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_HW, ("handle is %p %016I64x\n", g_ibsp.al_handle, hca->guid) ); status = ib_open_ca( g_ibsp.al_handle, hca->guid, NULL, hca, &hca->hca_handle ); if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_open_ca failed (%d)\n", status) ); + IBSP_ERROR( ("ib_open_ca failed (%d)\n", status) ); goto pnp_ca_add_err2; } @@ -112,7 +112,7 @@ pnp_ca_add( { STAT_INC( pd_num ); - CL_TRACE( IBSP_DBG_EP, gdbg_lvl, ("allocated PD %p for HCA\n", hca->pd) ); + IBSP_TRACE( IBSP_DBG_EP, ("allocated PD %p for HCA\n", hca->pd) ); /* Success */ cl_spinlock_acquire( &g_ibsp.hca_mutex ); @@ -123,7 +123,7 @@ pnp_ca_add( } else { - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_alloc_pd failed (%d)\n", status) ); + IBSP_ERROR( ("ib_alloc_pd failed (%d)\n", status) ); if( ib_close_ca( hca->hca_handle, NULL ) == IB_SUCCESS ) STAT_DEC( ca_num ); @@ -133,7 +133,7 @@ pnp_ca_add_err2: } pnp_ca_add_err1: - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return status; } @@ -146,7 +146,7 @@ pnp_ca_remove( ib_api_status_t status; cl_list_item_t *p_item; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); /* * Remove all the ports @@ -171,7 +171,7 @@ pnp_ca_remove( */ status = ib_dealloc_pd( hca->pd, NULL ); if( status ) - CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_dealloc_pd failed (%d)\n", status) ); + IBSP_ERROR( ("ib_dealloc_pd failed (%d)\n", status) ); else STAT_DEC( pd_num ); @@ -182,7 +182,7 @@ pnp_ca_remove( { status = ib_close_ca( hca->hca_handle, ib_sync_destroy ); if( status != IB_SUCCESS ) - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_close_ca failed (%d)\n", status) ); + IBSP_ERROR( ("ib_close_ca failed (%d)\n", status) ); hca->hca_handle = NULL; } @@ -197,7 +197,7 @@ pnp_ca_remove( HeapFree( g_ibsp.heap, 0, hca ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } @@ -209,24 +209,24 @@ pnp_port_add( struct ibsp_hca *hca; struct ibsp_port *port; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); hca = lookup_hca( p_port_rec->p_ca_attr->ca_guid ); if( !hca ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("Failed to lookup HCA (%016I64x) for new port (%016I64x)\n", p_port_rec->p_ca_attr->ca_guid, p_port_rec->p_port_attr->port_guid) ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return IB_INVALID_GUID; } port = HeapAlloc( g_ibsp.heap, HEAP_ZERO_MEMORY, sizeof(struct ibsp_port) ); if( port == NULL ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("HeapAlloc failed (%d)\n", sizeof(struct ibsp_port)) ); - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return IB_INSUFFICIENT_MEMORY; } @@ -239,7 +239,7 @@ pnp_port_add( cl_spinlock_release( &hca->port_lock ); p_port_rec->pnp_rec.context = port; - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return IB_SUCCESS; } @@ -249,7 +249,7 @@ static void pnp_port_remove( IN struct ibsp_port* const port ) { - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); if( !port ) goto done; @@ -264,7 +264,7 @@ pnp_port_remove( HeapFree( g_ibsp.heap, 0, port ); done: - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } @@ -275,8 +275,8 @@ pnp_callback( ib_api_status_t status = IB_SUCCESS; ib_pnp_port_rec_t* p_port_rec = (ib_pnp_port_rec_t*)pnp_rec; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); - CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("event is %x\n", pnp_rec->pnp_event) ); + IBSP_ENTER( IBSP_DBG_HW ); + IBSP_TRACE( IBSP_DBG_HW, ("event is %x\n", pnp_rec->pnp_event) ); switch( pnp_rec->pnp_event ) { @@ -310,7 +310,7 @@ pnp_callback( case IB_PNP_GID_CHANGE: case IB_PNP_LID_CHANGE: case IB_PNP_SUBNET_TIMEOUT_CHANGE: - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("pnp_callback: unsupported event %x\n", pnp_rec->pnp_event) ); break; @@ -319,12 +319,12 @@ pnp_callback( break; default: - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("pnp_callback: unsupported event %x\n", pnp_rec->pnp_event) ); break; } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return IB_SUCCESS; } @@ -339,7 +339,7 @@ register_pnp(void) ib_api_status_t status; ib_pnp_req_t pnp_req; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); pnp_req.pnp_class = IB_PNP_CA; pnp_req.pnp_context = NULL; @@ -347,7 +347,7 @@ register_pnp(void) status = ib_reg_pnp( g_ibsp.al_handle, &pnp_req, &g_ibsp.pnp_handle_port ); if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("register_pnp: ib_reg_pnp for PORT failed (%d)\n", status) ); goto done; } @@ -358,7 +358,7 @@ register_pnp(void) status = ib_reg_pnp( g_ibsp.al_handle, &pnp_req, &g_ibsp.pnp_handle_port ); if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("register_pnp: ib_reg_pnp for PORT failed (%d)\n", status) ); goto done; } @@ -371,7 +371,7 @@ done: unregister_pnp(); } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); return status; } @@ -383,14 +383,14 @@ unregister_pnp(void) { ib_api_status_t status; - CL_ENTER( IBSP_DBG_HW, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_HW ); if( g_ibsp.pnp_handle_port ) { status = ib_dereg_pnp( g_ibsp.pnp_handle_port, ib_sync_destroy ); if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("unregister_pnp: ib_dereg_pnp for PORT failed (%d)\n", status) ); } @@ -402,12 +402,12 @@ unregister_pnp(void) status = ib_dereg_pnp( g_ibsp.pnp_handle_ca, ib_sync_destroy ); if( status != IB_SUCCESS ) { - CL_ERROR( IBSP_DBG_HW, gdbg_lvl, + IBSP_ERROR( ("unregister_pnp: ib_dereg_pnp for PORT failed (%d)\n", status) ); } g_ibsp.pnp_handle_ca = NULL; } - CL_EXIT( IBSP_DBG_HW, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_HW ); } diff --git a/trunk/ulp/wsd/user/ibspdll.c b/trunk/ulp/wsd/user/ibspdll.c index 8d655284..57efd2fd 100644 --- a/trunk/ulp/wsd/user/ibspdll.c +++ b/trunk/ulp/wsd/user/ibspdll.c @@ -64,7 +64,7 @@ _DllMain( TCHAR env_var[16]; DWORD i; - CL_ENTER( IBSP_DBG_DLL, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_DLL ); UNUSED_PARAM( hinstDll ); UNUSED_PARAM( lpvReserved ); @@ -80,7 +80,7 @@ _DllMain( char buf[64]; if( GetEnvironmentVariable( "IBSPLOAD", buf, sizeof(buf) ) == 0 ) { - CL_EXIT_ERROR( IBSP_DBG_DLL, gdbg_lvl, ("IBSPLOAD not defined:\n") ); + IBSP_ERROR_EXIT( ("IBSPLOAD not defined:\n") ); return FALSE; } @@ -90,7 +90,7 @@ _DllMain( switch( dwReason ) { case DLL_PROCESS_ATTACH: - CL_TRACE( IBSP_DBG_DLL, gdbg_lvl, ("DllMain: DLL_PROCESS_ATTACH\n") ); + IBSP_TRACE( IBSP_DBG_DLL, ("DllMain: DLL_PROCESS_ATTACH\n") ); #ifdef _DEBUG_ i = GetEnvironmentVariable( "IBWSD_DBG", env_var, 16 ); @@ -115,15 +115,15 @@ _DllMain( break; case DLL_THREAD_ATTACH: - CL_TRACE( IBSP_DBG_DLL, gdbg_lvl, ("DllMain: DLL_THREAD_ATTACH\n") ); + IBSP_TRACE( IBSP_DBG_DLL, ("DllMain: DLL_THREAD_ATTACH\n") ); break; case DLL_THREAD_DETACH: - CL_TRACE( IBSP_DBG_DLL, gdbg_lvl, ("DllMain: DLL_THREAD_DETACH\n") ); + IBSP_TRACE( IBSP_DBG_DLL, ("DllMain: DLL_THREAD_DETACH\n") ); break; case DLL_PROCESS_DETACH: - CL_TRACE( IBSP_DBG_DLL, gdbg_lvl, ("DllMain: DLL_PROCESS_DETACH\n") ); + IBSP_TRACE( IBSP_DBG_DLL, ("DllMain: DLL_PROCESS_DETACH\n") ); #ifdef _DEBUG_ { @@ -141,36 +141,36 @@ _DllMain( cl_spinlock_release( &g_ibsp.socket_info_mutex ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, ("Statistics:\n") ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( ("Statistics:\n") ); + IBSP_ERROR( (" overlap_h0_count = %d\n", g_ibsp.overlap_h0_count) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" max_comp_count = %d\n", g_ibsp.max_comp_count) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" overlap_h1_count = %d\n", g_ibsp.overlap_h1_count) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, (" send_count = %d\n", g_ibsp.send_count) ); + IBSP_ERROR( (" send_count = %d\n", g_ibsp.send_count) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of QPs left = %d\n", g_ibsp.qp_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of CQs left = %d\n", g_ibsp.cq_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of PDs left = %d\n", g_ibsp.pd_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of ALs left = %d\n", g_ibsp.al_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of MRs left = %d\n", g_ibsp.mr_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of listens left = %d\n", g_ibsp.listen_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of PNPs left = %d\n", g_ibsp.pnp_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of threads left = %d\n", g_ibsp.thread_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" number of WPU sockets left = %d\n", g_ibsp.wpusocket_num) ); - CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, + IBSP_ERROR( (" CloseSocket_count = %d\n", g_ibsp.CloseSocket_count) ); } @@ -179,7 +179,7 @@ _DllMain( break; } - CL_EXIT( IBSP_DBG_DLL, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_DLL ); return TRUE; } @@ -286,7 +286,7 @@ IBSPAccept( return INVALID_SOCKET; } - CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_CONN, ("IBSPAccept: Found pending connection on this socket\n") ); incoming = PARENT_STRUCT(cl_qlist_head( &socket_info->listen.list ), @@ -324,7 +324,7 @@ reject: ib_reject( incoming->cm_req_received.h_cm_req, IB_REJ_INSUF_QP ); HeapFree( g_ibsp.heap, 0, incoming ); - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("bad incoming parameter\n") ); + IBSP_ERROR_EXIT( ("bad incoming parameter\n") ); *lpErrno = WSAECONNREFUSED; return INVALID_SOCKET; } @@ -400,7 +400,7 @@ reject: { cl_spinlock_release( &socket_info->mutex ); - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("create_socket_info return NULL\n") ); + IBSP_ERROR_EXIT( ("create_socket_info return NULL\n") ); *lpErrno = WSAENOBUFS; return INVALID_SOCKET; } @@ -412,7 +412,7 @@ reject: { cl_spinlock_release( &socket_info->mutex ); - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR_EXIT( ("WPUCreateSocketHandle() failed: %d", *lpErrno) ); free_socket_info( new_socket_info ); return INVALID_SOCKET; @@ -431,7 +431,7 @@ reject: { cl_spinlock_release( &socket_info->mutex ); - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, + IBSP_ERROR_EXIT( ("ib_create socket failed with %d\n", ret) ); *lpErrno = WSAENOBUFS; return INVALID_SOCKET; @@ -454,7 +454,7 @@ reject: memcpy( addr, &incoming->params.source, sizeof(struct sockaddr_in) ); *addrlen = sizeof(struct sockaddr_in); - CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, ("The socket address of connecting entity is\n") ); + IBSP_TRACE( IBSP_DBG_CONN, ("The socket address of connecting entity is\n") ); DebugPrintSockAddr( IBSP_DBG_CONN, gdbg_lvl, &incoming->params.source ); new_socket_info->peer_addr = incoming->params.source; @@ -498,7 +498,7 @@ reject: HeapFree( g_ibsp.heap, 0, incoming ); *lpErrno = ret; - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("ib_accept failed (%d)\n", ret) ); + IBSP_ERROR_EXIT( ("ib_accept failed (%d)\n", ret) ); return INVALID_SOCKET; } @@ -564,7 +564,7 @@ reject: CloseHandle( new_socket_info->h_event ); new_socket_info->h_event = NULL; - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("wait for ib_accept failed\n") ); + IBSP_ERROR_EXIT( ("wait for ib_accept failed\n") ); *lpErrno = WSAEACCES; return INVALID_SOCKET; @@ -593,12 +593,12 @@ IBSPBind( struct ibsp_port *port; int ret; - CL_ENTER( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CONN ); fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s)); - CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, ("Address to bind to:\n") ); + IBSP_TRACE( IBSP_DBG_CONN, ("Address to bind to:\n") ); DebugPrintSockAddr( IBSP_DBG_CONN, gdbg_lvl, addr ); fzprint(("binding to IP %s\n", inet_ntoa( addr->sin_addr ))); @@ -675,12 +675,12 @@ IBSPBind( cl_spinlock_release( &socket_info->mutex ); - CL_EXIT( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CONN ); return 0; error: CL_ASSERT( *lpErrno != 0 ); - CL_TRACE_EXIT( IBSP_DBG_CONN, gdbg_lvl, ("failed with error %d\n", *lpErrno) ); + IBSP_TRACE_EXIT( IBSP_DBG_CONN, ("failed with error %d\n", *lpErrno) ); return SOCKET_ERROR; } @@ -700,14 +700,14 @@ IBSPCloseSocket( { struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s; - CL_ENTER( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CONN ); fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s)); if( s == INVALID_SOCKET ) { - CL_EXIT_ERROR( IBSP_DBG_WQ, gdbg_lvl, ("invalid socket handle %x\n", s) ); + IBSP_ERROR_EXIT( ("invalid socket handle %x\n", s) ); *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } @@ -722,7 +722,7 @@ IBSPCloseSocket( shutdown_and_destroy_socket_info( socket_info ); - CL_EXIT( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CONN ); *lpErrno = 0; return 0; @@ -762,7 +762,7 @@ IBSPConnect( __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s, IBSP_SOCKET_STATE_STR( socket_info->socket_state ))); - CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, + IBSP_TRACE( IBSP_DBG_CONN, ("lpCallerData=%p, lpCalleeData=%p\n", lpCallerData, lpCalleeData) ); /* Sanity checks */ @@ -806,12 +806,13 @@ IBSPConnect( if( ret ) { IBSP_ERROR_EXIT( - ("query_guid_address failed for IP %08x\n", addr->sin_addr.s_addr) ); + ("query_guid_address failed for IP %08x\n", + addr->sin_addr.s_addr) ); *lpErrno = WSAEADDRNOTAVAIL; return SOCKET_ERROR; } - CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, ("got GUID %I64x for IP %s\n", + IBSP_TRACE( IBSP_DBG_CONN, ("got GUID %I64x for IP %s\n", CL_NTOH64( dest_port_guid ), inet_ntoa( addr->sin_addr )) ); if( dest_port_guid == socket_info->port->guid ) @@ -900,7 +901,7 @@ IBSPDuplicateSocket( struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s; int ret; - CL_ENTER( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CONN ); fzprint(("%s():%d:0x%x:0x%x: socket=0x%p state=%s\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), @@ -910,7 +911,7 @@ IBSPDuplicateSocket( if( socket_info->socket_state != IBSP_CONNECTED ) { cl_spinlock_release( &socket_info->mutex ); - CL_TRACE_EXIT( IBSP_DBG_CONN, gdbg_lvl, + IBSP_TRACE_EXIT( IBSP_DBG_CONN, ("Socket state not IBSP_CONNECTED, state=%s.\n", IBSP_SOCKET_STATE_STR( socket_info->socket_state )) ); *lpErrno = WSAENOTCONN; @@ -921,14 +922,14 @@ IBSPDuplicateSocket( cl_spinlock_release( &socket_info->mutex ); if( ret ) { - CL_TRACE_EXIT( IBSP_DBG_CONN, gdbg_lvl, + IBSP_TRACE_EXIT( IBSP_DBG_CONN, ("prepare_duplicate_socket failed with %d\n", ret) ); *lpErrno = ret; return SOCKET_ERROR; } else { - CL_EXIT( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CONN ); lpProtocolInfo->dwProviderReserved = socket_info->duplicate.identifier; *lpErrno = 0; return 0; @@ -1141,21 +1142,21 @@ IBSPGetSockOpt( { struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s; - CL_ENTER( IBSP_DBG_OPT, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_OPT ); fzprint(("%s():%d:0x%x:0x%x: socket=0x%p\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s)); if( level != SOL_SOCKET ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("invalid level %d", level) ); + IBSP_ERROR_EXIT( ("invalid level %d", level) ); *lpErrno = WSAENOPROTOOPT; return SOCKET_ERROR; } if( optval == NULL || optlen == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("invalid optval=%p or optlen=%p", optval, optlen) ); *lpErrno = WSAEFAULT; return SOCKET_ERROR; @@ -1164,10 +1165,10 @@ IBSPGetSockOpt( switch( optname ) { case SO_DEBUG: - CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_DEBUG\n") ); + IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_DEBUG\n") ); if( *optlen < sizeof(BOOL) ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("option len is invalid (0x%x)\n", *optlen) ); *optlen = sizeof(BOOL); *lpErrno = WSAEFAULT; @@ -1179,10 +1180,10 @@ IBSPGetSockOpt( break; case SO_GROUP_ID: - CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_GROUP_ID\n") ); + IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_GROUP_ID\n") ); if( *optlen < sizeof(GROUP) ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("option len is invalid (0x%x)\n", *optlen) ); *optlen = sizeof(GROUP); *lpErrno = WSAEFAULT; @@ -1194,11 +1195,11 @@ IBSPGetSockOpt( break; case SO_GROUP_PRIORITY: - CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_GROUP_PRIORITY\n") ); + IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_GROUP_PRIORITY\n") ); if( *optlen < sizeof(int) ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("option len is invalid (0x%x)\n", *optlen) ); *optlen = sizeof(int); *lpErrno = WSAEFAULT; @@ -1210,11 +1211,11 @@ IBSPGetSockOpt( break; case SO_MAX_MSG_SIZE: - CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_MAX_MSG_SIZE\n") ); + IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_MAX_MSG_SIZE\n") ); if( *optlen < sizeof(unsigned int) ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("option len is invalid (0x%x)\n", *optlen) ); *optlen = sizeof(unsigned int); *lpErrno = WSAEFAULT; @@ -1226,11 +1227,11 @@ IBSPGetSockOpt( break; case SO_MAX_RDMA_SIZE: - CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_MAX_RDMA_SIZE\n") ); + IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_MAX_RDMA_SIZE\n") ); if( *optlen < sizeof(unsigned int) ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("option len is invalid (0x%x)\n", *optlen) ); *optlen = sizeof(unsigned int); *lpErrno = WSAEFAULT; @@ -1242,11 +1243,11 @@ IBSPGetSockOpt( break; case SO_RDMA_THRESHOLD_SIZE: - CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_RDMA_THRESHOLD_SIZE\n") ); + IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_RDMA_THRESHOLD_SIZE\n") ); if( *optlen < sizeof(unsigned int) ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("option len is invalid (0x%x)\n", *optlen) ); *optlen = sizeof(unsigned int); *lpErrno = WSAEFAULT; @@ -1261,13 +1262,13 @@ IBSPGetSockOpt( default: *lpErrno = WSAENOPROTOOPT; - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("unknown option 0x%x\n", optname) ); + IBSP_ERROR_EXIT( ("unknown option 0x%x\n", optname) ); return SOCKET_ERROR; break; } - CL_EXIT( IBSP_DBG_OPT, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_OPT ); return 0; } @@ -1285,7 +1286,7 @@ IBSPGetQOSByName( LPQOS lpQOS, LPINT lpErrno ) { - CL_ENTER( IBSP_DBG_OPT, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_OPT ); UNUSED_PARAM( s ); UNUSED_PARAM( lpQOSName ); @@ -1296,7 +1297,7 @@ IBSPGetQOSByName( *lpErrno = WSAEOPNOTSUPP; - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("not supported\n") ); + IBSP_ERROR_EXIT( ("not supported\n") ); return FALSE; } @@ -1420,7 +1421,7 @@ IBSPIoctl( case SIO_SET_GROUP_QOS: /* We don't support that. dwServiceFlags1 in installSP * wasn't set. */ - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("unsupported dwIoControlCode %d\n", dwIoControlCode) ); *lpErrno = WSAENOPROTOOPT; return SOCKET_ERROR; @@ -1434,13 +1435,13 @@ IBSPIoctl( ret = build_ip_list( (LPSOCKET_ADDRESS_LIST)lpvOutBuffer, lpcbBytesReturned, lpErrno ); - CL_EXIT( IBSP_DBG_OPT, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_OPT ); return ret; } break; default: - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("invalid dwIoControlCode %d\n", dwIoControlCode) ); *lpErrno = WSAENOPROTOOPT; @@ -1467,14 +1468,14 @@ IBSPListen( struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s; int ret; - CL_ENTER( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_CONN ); fzprint(("%s():%d:0x%x:0x%x: socket=0x%p\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s)); cl_spinlock_acquire( &socket_info->mutex ); - CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, ("socket_state is %s\n", + IBSP_TRACE( IBSP_DBG_CONN, ("socket_state is %s\n", IBSP_SOCKET_STATE_STR( socket_info->socket_state )) ); /* Verify the state of the socket */ @@ -1493,7 +1494,7 @@ IBSPListen( if( ret ) { IBSP_CHANGE_SOCKET_STATE( socket_info, IBSP_BIND ); - CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("ib_listen failed with %d\n", ret) ); + IBSP_ERROR_EXIT( ("ib_listen failed with %d\n", ret) ); } else { @@ -1518,7 +1519,7 @@ IBSPListen( cl_spinlock_release( &socket_info->mutex ); - CL_EXIT( IBSP_DBG_CONN, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_CONN ); if( *lpErrno ) return SOCKET_ERROR; @@ -1999,21 +2000,21 @@ IBSPSetSockOpt( { struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s; - CL_ENTER( IBSP_DBG_OPT, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_OPT ); fzprint(("%s():%d:0x%x:0x%x: socket=0x%p\n", __FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s)); if( level != SOL_SOCKET ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("invalid level %d", level) ); + IBSP_ERROR_EXIT( ("invalid level %d", level) ); *lpErrno = WSAENOPROTOOPT; return SOCKET_ERROR; } if( optval == NULL ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("invalid optval=%p", optval) ); + IBSP_ERROR_EXIT( ("invalid optval=%p", optval) ); *lpErrno = WSAEFAULT; return SOCKET_ERROR; } @@ -2021,10 +2022,10 @@ IBSPSetSockOpt( switch( optname ) { case SO_DEBUG: - CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_DEBUG\n") ); + IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_DEBUG\n") ); if( optlen != sizeof(BOOL) ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("option len is invalid (0x%x)\n", optlen) ); *lpErrno = WSAEFAULT; return SOCKET_ERROR; @@ -2033,10 +2034,10 @@ IBSPSetSockOpt( break; case SO_GROUP_PRIORITY: - CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_GROUP_PRIORITY\n") ); + IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_GROUP_PRIORITY\n") ); if( optlen != sizeof(int) ) { - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, + IBSP_ERROR_EXIT( ("option len is invalid (0x%x)\n", optlen) ); *lpErrno = WSAEFAULT; return SOCKET_ERROR; @@ -2045,13 +2046,13 @@ IBSPSetSockOpt( break; default: - CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("invalid option %x\n", optname) ); + IBSP_ERROR_EXIT( ("invalid option %x\n", optname) ); *lpErrno = WSAENOPROTOOPT; return SOCKET_ERROR; break; } - CL_EXIT( IBSP_DBG_OPT, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_OPT ); return 0; } @@ -2215,7 +2216,7 @@ IBSPCleanup( { int ret = 0; - CL_ENTER( IBSP_DBG_INIT, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_INIT ); cl_spinlock_acquire( &g_ibsp.mutex ); @@ -2225,7 +2226,7 @@ IBSPCleanup( *lpErrno = WSANOTINITIALISED; - CL_EXIT_ERROR( IBSP_DBG_INIT, gdbg_lvl, ("returning WSAENOTINITIALISED\n") ); + IBSP_ERROR_EXIT( ("returning WSAENOTINITIALISED\n") ); return SOCKET_ERROR; } @@ -2233,17 +2234,17 @@ IBSPCleanup( /* Decrement the entry count */ g_ibsp.entry_count--; - CL_TRACE( IBSP_DBG_INIT, gdbg_lvl, ("WSPCleanup: %d\n", g_ibsp.entry_count) ); + IBSP_TRACE( IBSP_DBG_INIT, ("WSPCleanup: %d\n", g_ibsp.entry_count) ); if( g_ibsp.entry_count == 0 ) { - CL_TRACE( IBSP_DBG_INIT, gdbg_lvl, ("entry_count is 0 => cleaning up\n") ); + IBSP_TRACE( IBSP_DBG_INIT, ("entry_count is 0 => cleaning up\n") ); ib_release(); } cl_spinlock_release( &g_ibsp.mutex ); - CL_EXIT( IBSP_DBG_INIT, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_INIT ); return ret; } @@ -2267,19 +2268,19 @@ WSPStartupEx( static WSPPROC_TABLE gProcTable; static WSPDATA gWSPData; - CL_ENTER( IBSP_DBG_INIT, gdbg_lvl ); + IBSP_ENTER( IBSP_DBG_INIT ); /* Make sure that the version requested is >= 2.2. The low byte is the major version and the high byte is the minor version. */ if( (LOBYTE(wVersion) < 2) || ((LOBYTE(wVersion) == 2) && (HIBYTE(wVersion) < 2)) ) { - CL_EXIT_ERROR( IBSP_DBG_INIT, gdbg_lvl, + IBSP_ERROR_EXIT( ("Invalid winsock version requested %x\n", wVersion) ); return WSAVERNOTSUPPORTED; } - CL_TRACE( IBSP_DBG_INIT, gdbg_lvl, ("entry_count=%d)\n", g_ibsp.entry_count) ); + IBSP_TRACE( IBSP_DBG_INIT, ("entry_count=%d)\n", g_ibsp.entry_count) ); cl_spinlock_acquire( &g_ibsp.mutex ); @@ -2329,7 +2330,7 @@ WSPStartupEx( ret = ibsp_initialize(); if( ret ) { - CL_EXIT_ERROR( IBSP_DBG_INIT, gdbg_lvl, + IBSP_ERROR_EXIT( ("ibsp_initialize failed (%d)\n", ret) ); return ret; } @@ -2345,7 +2346,7 @@ WSPStartupEx( /* store the upcall function table */ g_ibsp.up_call_table = *UpCallTable; - CL_EXIT( IBSP_DBG_INIT, gdbg_lvl ); + IBSP_EXIT( IBSP_DBG_INIT ); return 0; } diff --git a/trunk/ulp/wsd/user/ibspdll.rc b/trunk/ulp/wsd/user/ibspdll.rc index 417606f2..a752aae0 100644 --- a/trunk/ulp/wsd/user/ibspdll.rc +++ b/trunk/ulp/wsd/user/ibspdll.rc @@ -26,15 +26,21 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. * - * $Id: ibspdll.rc 1.3 05/05/23 16:03:31-07:00 ftillier@orbuild.infiniconsys.com $ + * $Id$ */ #include #define VER_FILETYPE VFT_DLL #define VER_FILESUBTYPE VFT2_UNKNOWN -#define VER_FILEDESCRIPTION_STR "SilverStorm Winsock Direct for InfiniBand" -#define VER_INTERNALNAME_STR "ibwsd.dll" -#define VER_ORIGINALFILENAME_STR "ibwsd.dll" + +#ifdef _DEBUG_ +#define VER_FILEDESCRIPTION_STR "Winsock Direct for InfiniBand (Debug)" +#else +#define VER_FILEDESCRIPTION_STR "Winsock Direct for InfiniBand" +#endif + +#define VER_INTERNALNAME_STR "ibwsd.dll" +#define VER_ORIGINALFILENAME_STR "ibwsd.dll" #include diff --git a/trunk/ulp/wsd/user/misc.c b/trunk/ulp/wsd/user/misc.c index 0430a9ff..5c7da135 100644 --- a/trunk/ulp/wsd/user/misc.c +++ b/trunk/ulp/wsd/user/misc.c @@ -88,7 +88,7 @@ init_globals( void ) g_ibsp.heap = HeapCreate( 0, 128000, 0 ); if( g_ibsp.heap == NULL) { - CL_EXIT_ERROR( IBSP_DBG_INIT, gdbg_lvl, + IBSP_ERROR_EXIT( ("HeapCreate() failed: %d\n", GetLastError()) ); return 1; } -- 2.41.0