ib_access_t access_ctrl;\r
struct memory_node *node;\r
\r
- CL_ENTER( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_MEM );\r
\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s));\r
\r
if( lpBuffer == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("invalid buffer %p\n", lpBuffer) );\r
+ IBSP_ERROR_EXIT( ("invalid buffer %p\n", lpBuffer) );\r
*lpErrno = WSAEFAULT;\r
return NULL;\r
}\r
\r
if( dwBufferLength > socket_info->socket_options.max_msg_size )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
- ("invalid buffer length %d\n", dwBufferLength) );\r
+ IBSP_ERROR_EXIT( ("invalid buffer length %d\n", dwBufferLength) );\r
*lpErrno = WSAEFAULT;\r
return NULL;\r
}\r
break;\r
\r
default:\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("invalid flags %x\n", dwFlags) );\r
+ IBSP_ERROR_EXIT( ("invalid flags %x\n", dwFlags) );\r
*lpErrno = WSAEINVAL;\r
return NULL;\r
}\r
\r
if( node == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("ib_register_memory failed (pd=%p)\n", socket_info->hca_pd) );\r
*lpErrno = WSAENOBUFS;\r
}\r
else\r
{\r
- CL_TRACE_EXIT( IBSP_DBG_MEM, gdbg_lvl, ("returning node %p\n", node) );\r
+ IBSP_TRACE_EXIT( IBSP_DBG_MEM, ("returning node %p\n", node) );\r
*lpErrno = 0;\r
}\r
\r
- CL_EXIT( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_MEM );\r
\r
return (HANDLE) node;\r
}\r
ib_access_t access_ctrl;\r
struct ibsp_hca *hca;\r
\r
- CL_ENTER( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_MEM );\r
\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s));\r
if( *lpdwDescriptorLength < sizeof(struct rdma_memory_desc) )\r
{\r
/* This is the probe from the switch to learn the length of the descriptor. */\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("invalid descriptor length %d (usually not an error)\n",\r
*lpdwDescriptorLength) );\r
*lpdwDescriptorLength = sizeof(struct rdma_memory_desc);\r
\r
if( lpBuffer == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("invalid buffer %p\n", lpBuffer) );\r
+ IBSP_ERROR_EXIT( ("invalid buffer %p\n", lpBuffer) );\r
*lpErrno = WSAEFAULT;\r
return SOCKET_ERROR;\r
}\r
\r
if( dwBufferLength > socket_info->socket_options.max_msg_size )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
- ("invalid buffer length %d\n", dwBufferLength) );\r
+ IBSP_ERROR_EXIT( ("invalid buffer length %d\n", dwBufferLength) );\r
*lpErrno = WSAEFAULT;\r
return SOCKET_ERROR;\r
}\r
break;\r
\r
default:\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("invalid flags %x\n", dwFlags) );\r
+ IBSP_ERROR_EXIT( ("invalid flags %x\n", dwFlags) );\r
*lpErrno = WSAEINVAL;\r
return SOCKET_ERROR;\r
}\r
\r
if( node == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
- ("ib_register_memory failed %d\n", *lpErrno) );\r
+ IBSP_ERROR_EXIT( ("ib_register_memory failed %d\n", *lpErrno) );\r
*lpErrno = WSAENOBUFS;\r
return SOCKET_ERROR;\r
}\r
__FUNCTION__, lpBuffer, (unsigned char *)lpBuffer + dwBufferLength,\r
dwBufferLength, node));\r
\r
- CL_EXIT( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_MEM );\r
\r
return 0;\r
}\r
if( socket_info->socket_state != IBSP_CONNECTED )\r
{\r
IBSP_ERROR_EXIT(\r
- ("Socket is not in connected socket_state \n") );\r
+ ("Socket is not in connected socket_state state=%s\n",\r
+ IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );\r
*lpErrno = WSAENOTCONN;\r
return SOCKET_ERROR;\r
}\r
\r
#if 0\r
cl_spinlock_release( &socket_info->mutex );\r
- CL_EXIT_ERROR( IBSP_DBG_CM, gdbg_lvl, ("rejecting\n") );\r
+ IBSP_ERROR_EXIT( ("rejecting\n") );\r
ib_reject( p_cm_req_rec->h_cm_req, IB_REJ_USER_DEFINED );\r
ibsp_dup_overlap_abort( socket_info );\r
return;\r
ib_cm_rtu_t cm_rtu;\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CM );\r
\r
memset( &cm_rtu, 0, sizeof(cm_rtu) );\r
\r
if( status != IB_SUCCESS )\r
{\r
/* Note: a REJ has been automatically sent. */\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("ib_cm_rtu failed (0x%d)\n", status) );\r
+ IBSP_ERROR( ("ib_cm_rtu failed (0x%d)\n", status) );\r
IBSP_CHANGE_SOCKET_STATE( socket_info, IBSP_BIND );\r
ibsp_post_select_event( socket_info, FD_CONNECT, WSAETIMEDOUT );\r
}\r
if( status != IB_SUCCESS )\r
{\r
/* Note: a REJ has been automatically sent. */\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("ib_cm_rtu failed (0x%d)\n", status) );\r
+ IBSP_ERROR( ("ib_cm_rtu failed (0x%d)\n", status) );\r
}\r
else\r
{\r
\r
default:\r
/* The socket might be closing */\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("socket %x not in connecting state (%s)\n",\r
+ IBSP_ERROR( ("socket %x not in connecting state (%s)\n",\r
socket_info, IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );\r
\r
ib_reject( p_cm_rep_rec->h_cm_rep, IB_REJ_USER_DEFINED );\r
\r
cl_spinlock_release( &socket_info->mutex );\r
\r
- CL_EXIT( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CM );\r
}\r
\r
\r
struct ibsp_socket_info *socket_info =\r
(struct ibsp_socket_info * __ptr64)p_cm_rtu_rec->qp_context;\r
\r
- CL_ENTER( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CM );\r
\r
cl_spinlock_acquire( &socket_info->mutex );\r
\r
}\r
else\r
{\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl,\r
+ IBSP_ERROR(\r
("ib_post_recv returned %s for reposted buffer\n",\r
ib_get_err_str( status )) );\r
\r
else\r
{\r
/* The Socket might be closing */\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl,\r
+ IBSP_ERROR(\r
("Got RTU while in socket_state %s - ignoring\n",\r
IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );\r
}\r
IN ib_cm_mra_rec_t *p_cm_mra_rec )\r
{\r
/* TODO */\r
- CL_ENTER( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CM );\r
\r
UNUSED_PARAM( p_cm_mra_rec );\r
\r
- CL_EXIT( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CM );\r
}\r
\r
\r
cm_drep_callback(\r
IN ib_cm_drep_rec_t *p_cm_drep_rec )\r
{\r
- CL_ENTER( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CM );\r
UNUSED_PARAM( p_cm_drep_rec );\r
- CL_EXIT( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CM );\r
}\r
\r
\r
IN ib_listen_err_rec_t *p_listen_err_rec )\r
{\r
/* TODO */\r
- CL_ENTER( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CM );\r
\r
UNUSED_PARAM( p_listen_err_rec );\r
\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("not implemented") );\r
+ IBSP_ERROR( ("not implemented") );\r
\r
CL_ASSERT( 0 );\r
\r
- CL_EXIT( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CM );\r
}\r
\r
\r
IN ib_cm_apr_rec_t *p_cm_apr_rec )\r
{\r
/* TODO */\r
- CL_ENTER( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CM );\r
\r
UNUSED_PARAM( p_cm_apr_rec );\r
\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("not implemented"));\r
+ IBSP_ERROR( ("not implemented"));\r
\r
CL_ASSERT( 0 );\r
\r
- CL_EXIT( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CM );\r
}\r
\r
\r
IN ib_cm_lap_rec_t *p_cm_lap_rec )\r
{\r
/* TODO */\r
- CL_ENTER( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CM );\r
\r
UNUSED_PARAM( p_cm_lap_rec );\r
\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("not implemented"));\r
+ IBSP_ERROR( ("not implemented"));\r
\r
CL_ASSERT( 0 );\r
\r
- CL_EXIT( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CM );\r
}\r
\r
\r
ib_cm_listen_t param;\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_CM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CM );\r
\r
memset( ¶m, 0, sizeof(param) );\r
\r
\r
if( status != IB_SUCCESS )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_CM, gdbg_lvl, ("ib_cm_listen failed (0x%d)\n", status) );\r
+ IBSP_ERROR_EXIT( ("ib_cm_listen failed (0x%d)\n", status) );\r
*lpErrno = ibal_to_wsa_error( status );\r
return SOCKET_ERROR;\r
}\r
\r
STAT_INC( listen_num );\r
\r
- CL_TRACE_EXIT( IBSP_DBG_CM, gdbg_lvl,\r
+ IBSP_TRACE_EXIT( IBSP_DBG_CM,\r
("started listening for port %d\n",\r
CL_HTON16( socket_info->local_addr.sin_port )) );\r
\r
status = ib_cm_cancel( socket_info->listen.handle, ib_sync_destroy );\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl,\r
+ IBSP_ERROR(\r
("ib_cm_cancel returned %s\n", ib_get_err_str( status )) );\r
}\r
else\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), socket_info));\r
\r
- CL_TRACE( IBSP_DBG_CM, gdbg_lvl, ("From:\n") );\r
+ IBSP_TRACE( IBSP_DBG_CM, ("From:\n") );\r
DebugPrintSockAddr( IBSP_DBG_CM, gdbg_lvl, &socket_info->local_addr );\r
- CL_TRACE( IBSP_DBG_CM, gdbg_lvl, ("To:\n") );\r
+ IBSP_TRACE( IBSP_DBG_CM, ("To:\n") );\r
DebugPrintSockAddr( IBSP_DBG_CM, gdbg_lvl, &socket_info->peer_addr );\r
\r
/* Insert into the connection map. */\r
params.listen_req_param.dwProcessId = socket_info->duplicate.dwProcessId;\r
params.listen_req_param.identifier = socket_info->duplicate.identifier;\r
\r
- CL_TRACE( IBSP_DBG_CM, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_CM,\r
("ib_connect listen params: %x %x\n", params.listen_req_param.dwProcessId,\r
params.listen_req_param.identifier) );\r
- CL_TRACE( IBSP_DBG_CM, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_CM,\r
("connecting to port %d, SID=%016I64x\n", socket_info->peer_addr.sin_port,\r
cm_req.svc_id) );\r
\r
fname ); // name of map object\r
if( h == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR(\r
("CreateFileMapping failed with %d\n", GetLastError()) );\r
ret = WSAENETDOWN;\r
goto done;\r
if( GetLastError() != ERROR_ALREADY_EXISTS )\r
{\r
CloseHandle( h );\r
- CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("not mapping for socket duplicate info\n") );\r
+ IBSP_ERROR( ("not mapping for socket duplicate info\n") );\r
ret = WSAENETDOWN;\r
goto done;\r
}\r
0 ); // default: map entire file\r
if( dup_info == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR(\r
("MapViewOfFile failed with %d\n", GetLastError()) );\r
ret = WSAENETDOWN;\r
goto done;\r
\r
if( socket_info->switch_socket == INVALID_SOCKET )\r
{\r
- CL_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR(\r
("WPUCreateSocketHandle() failed: %d", ret) );\r
goto done;\r
}\r
socket_info->port = get_port_from_ip_address( dup_info->local_addr.sin_addr );\r
if( socket_info->port == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR(\r
("incoming destination IP address not local (%s)\n",\r
inet_ntoa( dup_info->local_addr.sin_addr )) );\r
ret = WSAENETDOWN;\r
ret = ib_create_socket( socket_info );\r
if( ret )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("ib_create socket failed with %d\n", ret) );\r
ret = WSAENOBUFS;\r
goto done;\r
&dest_port_guid );\r
if( ret )\r
{\r
- CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("query_guid_address failed for IP %08x\n",\r
+ IBSP_ERROR( ("query_guid_address failed for IP %08x\n",\r
socket_info->peer_addr.sin_addr.s_addr) );\r
ret = WSAEHOSTUNREACH;\r
goto done;\r
ret = query_pr( socket_info->port, dest_port_guid, &path_rec );\r
if( ret )\r
{\r
- CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("query_pr failed for IP %08x\n",\r
+ IBSP_ERROR( ("query_pr failed for IP %08x\n",\r
socket_info->peer_addr.sin_addr.s_addr) );\r
ret = WSAEHOSTUNREACH;\r
goto done;\r
ret = ib_connect( socket_info, &path_rec );\r
if( ret != WSAEWOULDBLOCK )\r
{\r
- CL_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("ib_connect failed (%d)\n", ret) );\r
+ IBSP_ERROR( ("ib_connect failed (%d)\n", ret) );\r
goto done;\r
}\r
\r
if( WaitForSingleObject( socket_info->h_event, INFINITE ) != WAIT_OBJECT_0 )\r
{\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("WaitForSingleObject failed\n") );\r
+ IBSP_ERROR( ("WaitForSingleObject failed\n") );\r
}\r
\r
cl_spinlock_acquire( &socket_info->mutex );\r
if( socket_info->socket_state != IBSP_CONNECTED )\r
{\r
cl_spinlock_release( &socket_info->mutex );\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("Failed to connect\n") );\r
+ IBSP_ERROR( ("Failed to connect\n") );\r
ret = WSAEHOSTUNREACH;\r
goto done;\r
}\r
socket_info->h_event = NULL;\r
}\r
\r
- CL_EXIT( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CONN );\r
\r
return ret;\r
}\r
\r
if( socket_info->duplicate.mmap_handle == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("CreateFileMapping failed with %d\n", GetLastError()) );\r
return WSAENETDOWN;\r
}\r
0 ); // default: map entire file\r
if( dup_info == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("MapViewOfFile failed with %d\n", GetLastError()) );\r
CloseHandle( socket_info->duplicate.mmap_handle );\r
socket_info->duplicate.mmap_handle = NULL;\r
\r
if( dup_info == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("failed to get a unique identifier\n") );\r
+ IBSP_ERROR_EXIT( ("failed to get a unique identifier\n") );\r
CloseHandle( socket_info->duplicate.mmap_handle );\r
socket_info->duplicate.mmap_handle = NULL;\r
return WSAENETDOWN;\r
dup_info->dwProcessId = dwProcessId;\r
\r
/* And that's it */\r
- CL_EXIT( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CONN );\r
return 0;\r
}\r
int comp_count;\r
#endif\r
\r
- CL_ENTER( IBSP_DBG_WQ, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_WQ );\r
\r
CL_ASSERT( WC_LIST_SIZE >= 1 );\r
\r
\r
status = ib_poll_cq( cq_tinfo->cq, &free_wclist, &done_wclist );\r
\r
- CL_TRACE( IBSP_DBG_WQ, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_WQ,\r
("%s():%d:0x%x:0x%x: poll CQ got status %d, free=%p, done=%p\n",\r
__FUNCTION__, __LINE__, GetCurrentProcessId(), GetCurrentThreadId(),\r
status, free_wclist, done_wclist) );\r
case IB_INVALID_CQ_HANDLE:\r
/* This happens when the switch closes the socket while the \r
* execution thread was calling lpWPUCompleteOverlappedRequest. */\r
- CL_ERROR( IBSP_DBG_WQ, gdbg_lvl,\r
+ IBSP_ERROR(\r
("ib_poll_cq returned IB_INVLALID_CQ_HANDLE\n") );\r
goto done;\r
\r
default:\r
- CL_ERROR( IBSP_DBG_WQ, gdbg_lvl,\r
+ IBSP_ERROR(\r
("ib_poll_cq failed returned %s\n", ib_get_err_str( status )) );\r
break;\r
}\r
status = ib_rearm_cq( cq_tinfo->cq, FALSE );\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_WQ, gdbg_lvl,\r
+ IBSP_ERROR(\r
("ib_rearm_cq returned %s)\n", ib_get_err_str( status )) );\r
}\r
\r
GetCurrentThreadId(), g_ibsp.overlap_h0_count, g_ibsp.overlap_h1_count));\r
#endif\r
\r
- CL_EXIT( IBSP_DBG_WQ, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_WQ );\r
}\r
\r
\r
struct cq_thread_info *cq_tinfo = (struct cq_thread_info *)lpParameter;\r
cl_status_t cl_status;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
\r
fzprint(("%s():%d:0x%x:0x%x: cq_tinfo=0x%p\n", __FUNCTION__,\r
cl_status = cl_waitobj_wait_on( cq_tinfo->cq_waitobj, EVENT_NO_TIMEOUT, TRUE );\r
if( cl_status != CL_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl,\r
+ IBSP_ERROR(\r
("cl_waitobj_wait_on() (%d)\n", cl_status) );\r
}\r
\r
cl_status = cl_waitobj_destroy( cq_tinfo->cq_waitobj );\r
if( cl_status != CL_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("cl_waitobj_destroy() (%d)\n", cl_status) );\r
+ IBSP_ERROR( ("cl_waitobj_destroy() (%d)\n", cl_status) );\r
}\r
HeapFree( g_ibsp.heap, 0, cq_tinfo );\r
\r
/* No special exit code, even on errors. */\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
ExitThread( 0 );\r
}\r
\r
cl_status_t cl_status;\r
int error;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
cq_tinfo = HeapAlloc( g_ibsp.heap, HEAP_ZERO_MEMORY, sizeof(struct cq_thread_info) );\r
\r
if( cq_tinfo == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("HeapAlloc() Failed.\n") );\r
+ IBSP_ERROR( ("HeapAlloc() Failed.\n") );\r
error = TRUE;\r
goto done;\r
}\r
if( cl_status != CL_SUCCESS )\r
{\r
cq_tinfo->cq_waitobj = NULL;\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("cl_waitobj_create() (%d)\n", cl_status) );\r
+ IBSP_ERROR( ("cl_waitobj_create() (%d)\n", cl_status) );\r
error = TRUE;\r
goto done;\r
}\r
\r
if( cq_tinfo->ib_cq_thread == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("CreateThread failed.") );\r
+ IBSP_ERROR( ("CreateThread failed.") );\r
error = TRUE;\r
goto done;\r
}\r
&cq_tinfo->cq );\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_create_cq failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_create_cq failed (%d)\n", status) );\r
error = TRUE;\r
goto done;\r
}\r
status = ib_rearm_cq( cq_tinfo->cq, FALSE );\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_rearm_cq failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_rearm_cq failed (%d)\n", status) );\r
error = TRUE;\r
goto done;\r
}\r
cq_tinfo = NULL;\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
\r
return (cq_tinfo);\r
}\r
ib_api_status_t status;\r
HANDLE h_cq_thread;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
if( cq_tinfo == NULL )\r
{\r
\r
while( ib_poll_cq( cq_tinfo->cq, &free_wclist, &done_wclist ) == IB_SUCCESS )\r
{\r
- CL_TRACE( IBSP_DBG_WQ, gdbg_lvl, ("%s():%d:0x%x:0x%x: free=%p, done=%p\n",\r
+ IBSP_TRACE( IBSP_DBG_WQ, ("%s():%d:0x%x:0x%x: free=%p, done=%p\n",\r
__FUNCTION__,\r
__LINE__, GetCurrentProcessId(),\r
GetCurrentThreadId(),\r
free_wclist, done_wclist) );\r
}\r
\r
- CL_TRACE( IBSP_DBG_WQ, gdbg_lvl, ("%s():%d:0x%x:0x%x: ib_destroy_cq() start..\n",\r
+ IBSP_TRACE( IBSP_DBG_WQ, ("%s():%d:0x%x:0x%x: ib_destroy_cq() start..\n",\r
__FUNCTION__,\r
__LINE__, GetCurrentProcessId(),\r
GetCurrentThreadId()) );\r
status = ib_destroy_cq( cq_tinfo->cq, ib_sync_destroy );\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_destroy_cq failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_destroy_cq failed (%d)\n", status) );\r
}\r
else\r
{\r
- CL_TRACE( IBSP_DBG_WQ, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_WQ,\r
("%s():%d:0x%x:0x%x: ib_destroy_cq() finished.\n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId()) );\r
\r
cq_tinfo->ib_cq_thread_id ));\r
if( WaitForSingleObject( h_cq_thread, INFINITE ) != WAIT_OBJECT_0 )\r
{\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("WaitForSingleObject failed\n") );\r
+ IBSP_ERROR( ("WaitForSingleObject failed\n") );\r
}\r
else\r
{\r
HeapFree( g_ibsp.heap, 0, cq_tinfo );\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
\r
struct cq_thread_info *cq_tinfo = NULL;\r
uint32_t current_cqe_size;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
/* \r
* TODO: If future implementations require more than 1 cq_tinfo per HCA, then\r
cq_tinfo = ib_alloc_cq_tinfo( hca );\r
if( cq_tinfo == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_CM, gdbg_lvl, ("ib_alloc_cq_tinfo() failed\n") );\r
+ IBSP_ERROR( ("ib_alloc_cq_tinfo() failed\n") );\r
return (NULL);\r
}\r
}\r
* more than one cq per HCA in the future.\r
*/\r
cl_atomic_dec( &cq_tinfo->qp_count );\r
- CL_EXIT_ERROR( IBSP_DBG_EP, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("ib_modify_cq() failed. (%d)\n", status) );\r
return (NULL);\r
}\r
}\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
\r
return (cq_tinfo);\r
}\r
ib_release_cq_tinfo(\r
struct cq_thread_info *cq_tinfo )\r
{\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
cl_atomic_dec( &cq_tinfo->qp_count );\r
\r
/* TODO: downsize the cq */\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
\r
{\r
cl_fmap_item_t *p_item;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
if( g_ibsp.al_handle )\r
{\r
status));\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_close_al failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_close_al failed (%d)\n", status) );\r
}\r
else\r
{\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("ib_close_al success\n") );\r
+ IBSP_TRACE( IBSP_DBG_HW, ("ib_close_al success\n") );\r
STAT_DEC( al_num );\r
}\r
g_ibsp.al_handle = NULL;\r
PARENT_STRUCT(p_item, struct ibsp_ip_addr, item) );\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
\r
ib_api_status_t status;\r
int ret;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
CL_ASSERT( g_ibsp.al_handle == NULL );\r
CL_ASSERT( cl_qlist_count( &g_ibsp.hca_list ) == 0 );\r
/* Open the IB library */\r
status = ib_open_al( &g_ibsp.al_handle );\r
\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("open is %d %p\n", status, g_ibsp.al_handle) );\r
+ IBSP_TRACE( IBSP_DBG_HW, ("open is %d %p\n", status, g_ibsp.al_handle) );\r
\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_open_al failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_open_al failed (%d)\n", status) );\r
ret = WSAEPROVIDERFAILEDINIT;\r
goto done;\r
}\r
status = register_pnp();\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("register_pnp failed (%d)\n", status) );\r
+ IBSP_ERROR( ("register_pnp failed (%d)\n", status) );\r
ret = WSAEPROVIDERFAILEDINIT;\r
goto done;\r
}\r
ib_release();\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
\r
return ret;\r
}\r
{\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_EP );\r
\r
if( socket_info->qp )\r
{\r
status = ib_destroy_qp( socket_info->qp, ib_sync_destroy );\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_destroy_qp failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_destroy_qp failed (%d)\n", status) );\r
}\r
else\r
{\r
- CL_TRACE( IBSP_DBG_WQ, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_WQ,\r
("%s():%d:0x%x:0x%x: ib_destroy_qp() finished\n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId()) );\r
\r
}\r
}\r
\r
- CL_EXIT( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_EP );\r
}\r
\r
\r
struct ibsp_hca *hca;\r
ib_qp_attr_t qp_attr;\r
\r
- CL_ENTER( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_EP );\r
\r
CL_ASSERT( socket_info != NULL );\r
CL_ASSERT( socket_info->port != NULL );\r
cq_tinfo = ib_acquire_cq_tinfo( hca );\r
if( cq_tinfo == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_acquire_cq_tinfo failed\n") );\r
+ IBSP_ERROR( ("ib_acquire_cq_tinfo failed\n") );\r
ret = WSAEPROVIDERFAILEDINIT;\r
goto done;\r
}\r
&socket_info->qp );\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_create_qp failed (%d)\n", status));\r
+ IBSP_ERROR( ("ib_create_qp failed (%d)\n", status));\r
ret = WSAEPROVIDERFAILEDINIT;\r
goto done;\r
}\r
}\r
else\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl,\r
+ IBSP_ERROR(\r
("ib_query_qp returned %s\n", ib_get_err_str( status )) );\r
socket_info->max_inline = 0;\r
}\r
ib_destroy_socket( socket_info );\r
}\r
\r
- CL_EXIT( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_EP );\r
\r
return ret;\r
}\r
wait_cq_drain(\r
IN OUT struct ibsp_socket_info *socket_info )\r
{\r
- CL_ENTER( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_EP );\r
\r
if( socket_info->cq_tinfo == NULL )\r
{\r
- CL_EXIT( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_EP );\r
return;\r
}\r
\r
Sleep(100);\r
}\r
\r
- CL_EXIT( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_EP );\r
}\r
\r
\r
int ret;\r
uint8_t idx;\r
\r
- CL_ENTER( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_EP );\r
CL_ASSERT( !socket_info->send_cnt && !socket_info->recv_cnt );\r
\r
/* Browse the list of all posted overlapped structures\r
cl_atomic_dec( &socket_info->dup_cnt );\r
}\r
\r
- CL_EXIT( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_EP );\r
}\r
\r
\r
{\r
enum ibsp_socket_state old_state;\r
\r
- CL_ENTER( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_EP );\r
\r
cl_spinlock_acquire( &socket_info->mutex );\r
old_state = socket_info->socket_state;\r
/* Release the initial reference and clean up. */\r
deref_socket_info( socket_info );\r
\r
- CL_EXIT( IBSP_DBG_EP, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_EP );\r
}\r
\r
\r
(struct ip_query_context * __ptr64)p_query_rec->query_context;\r
cl_fmap_item_t *p_item;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
+ IBSP_TRACE( IBSP_DBG_HW,\r
("status is %s\n", ib_get_err_str( p_query_rec->status )) );\r
\r
if( p_query_rec->status == IB_SUCCESS )\r
{\r
unsigned int i;\r
\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("got %d records\n", p_query_rec->result_cnt) );\r
+ IBSP_TRACE( IBSP_DBG_HW, ("got %d records\n", p_query_rec->result_cnt) );\r
\r
for( i = 0; i < p_query_rec->result_cnt; i++ )\r
{\r
HeapAlloc( g_ibsp.heap, HEAP_ZERO_MEMORY, sizeof(struct ibsp_ip_addr) );\r
if( !ip_addr )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, ("no memory\n") );\r
+ IBSP_ERROR_EXIT( ("no memory\n") );\r
break;\r
}\r
\r
if( p_item != &ip_addr->item )\r
{\r
/* Duplicate! Should never happen. */\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("Got duplicate addr %s\n", inet_ntoa( ip_addr->ip_addr )) );\r
HeapFree( g_ibsp.heap, 0, ip_addr );\r
continue;\r
}\r
\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_HW,\r
(" Got addr %s\n", inet_ntoa( ip_addr->ip_addr )) );\r
}\r
}\r
else if( p_query_rec->p_result_mad )\r
{\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("SA status is %x\n",\r
+ IBSP_TRACE( IBSP_DBG_HW, ("SA status is %x\n",\r
p_query_rec->p_result_mad->p_mad_buf->status) );\r
}\r
\r
if( p_query_rec->p_result_mad )\r
ib_put_mad( p_query_rec->p_result_mad );\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
\r
ib_query_req_t query_req;\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
/* The list must be initialized and empty */\r
CL_ASSERT( !cl_fmap_count( p_ip_map ) );\r
\r
if( status != IB_SUCCESS && status != IB_INVALID_GUID )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_query failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_query failed (%d)\n", status) );\r
CL_ASSERT( !cl_fmap_count( p_ip_map ) );\r
\r
- CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("Failed to build list of IP addr for port %016I64x\n",\r
CL_HTON64( p_port->guid )) );\r
\r
- CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, ("query_ip_address failed\n") );\r
+ IBSP_ERROR_EXIT( ("query_ip_address failed\n") );\r
return 1;\r
}\r
\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), status));\r
\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
return 0;\r
}\r
\r
ret = query_ip_address( port, &dup_ip );\r
if( ret )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("query_ip_address failed (%d)\n", ret) );\r
return 1;\r
}\r
struct ibsp_hca *p_hca;\r
struct ibsp_port *p_port;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
cl_spinlock_acquire( &g_ibsp.hca_mutex );\r
for( p_hca_item = cl_qlist_head( &g_ibsp.hca_list );\r
}\r
cl_spinlock_release( &g_ibsp.hca_mutex );\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
/*--------------------------------------------------------------------------*/\r
(struct query_guid_context * __ptr64)p_query_rec->query_context;\r
ib_service_record_t *service_record;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
+ IBSP_TRACE( IBSP_DBG_HW,\r
("status is %d, count is %d\n", p_query_rec->status,\r
p_query_rec->result_cnt) );\r
\r
if( p_query_rec->p_result_mad )\r
ib_put_mad( p_query_rec->p_result_mad );\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
\r
ib_query_req_t query_req;\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
query_req.query_type = IB_QUERY_USER_DEFINED;\r
query_req.p_query_input = &user_query;\r
\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_query failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_query failed (%d)\n", status) );\r
goto error;\r
}\r
\r
if( query_context.status != IB_SUCCESS )\r
{\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_HW,\r
("query success, but no GUID for IP address %x (query status %d)\n",\r
ip_addr, query_context.status) );\r
goto error;\r
\r
*port_guid = query_context.guid;\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
return 0;\r
\r
error:\r
- CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, ("query_ip_address failed\n") );\r
+ IBSP_ERROR_EXIT( ("query_ip_address failed\n") );\r
return 1;\r
}\r
\r
(struct query_pr_context * __ptr64)p_query_rec->query_context;\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("status is %d\n", p_query_rec->status) );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
+ IBSP_TRACE( IBSP_DBG_HW, ("status is %d\n", p_query_rec->status) );\r
\r
if( p_query_rec->status == IB_SUCCESS && p_query_rec->result_cnt )\r
{\r
if( p_query_rec->p_result_mad )\r
status = ib_put_mad( p_query_rec->p_result_mad );\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
\r
ib_query_req_t query_req;\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
query_req.query_type = IB_QUERY_PATH_REC_BY_GIDS;\r
query_req.p_query_input = &user_query;\r
fzprint(("%s():%d:0x%x:0x%x: Calling ib_query()..\n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId()));\r
\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_HW,\r
("Query for path from %I64x to %I64x\n",\r
port->guid, dest_port_guid) );\r
\r
\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_query failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_query failed (%d)\n", status) );\r
goto error;\r
}\r
\r
\r
if( query_context.status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("query failed (%d)\n", query_context.status) );\r
+ IBSP_ERROR( ("query failed (%d)\n", query_context.status) );\r
goto error;\r
}\r
\r
path_rec->mtu |= IB_MTU_1024;\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
return 0;\r
\r
error:\r
- CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl, ("query_ip_address failed\n") );\r
+ IBSP_ERROR_EXIT( ("query_ip_address failed\n") );\r
return 1;\r
}\r
\r
struct sockaddr_in *addr;\r
int i;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
cl_spinlock_acquire( &g_ibsp.hca_mutex );\r
for( p_hca_item = cl_qlist_head( &g_ibsp.hca_list );\r
\r
num_ip = cl_fmap_count( &g_ibsp.ip_map );\r
\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl, (" num ip = %d\n", num_ip) );\r
+ IBSP_TRACE( IBSP_DBG_HW, (" num ip = %d\n", num_ip) );\r
\r
/* Note: the required size computed is a few bytes larger than necessary, \r
* but that keeps the code clean. */\r
cl_spinlock_release( &g_ibsp.ip_mutex );\r
*ip_list_size = (DWORD) size_req;\r
*lpErrno = WSAEFAULT;\r
- CL_EXIT_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("returning efault, size %d (usually not an error)", size_req) );\r
return SOCKET_ERROR;\r
}\r
\r
cl_spinlock_release( &g_ibsp.ip_mutex );\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
\r
lpErrno = 0;\r
return 0;\r
struct ibsp_ip_addr ip;\r
struct ibsp_port *p_port = NULL;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
ip.ip_addr = sin_addr;\r
ip.p_port = NULL;\r
if( p_item != cl_fmap_end( &g_ibsp.ip_map ) )\r
p_port = PARENT_STRUCT(p_item, struct ibsp_ip_addr, item)->p_port;\r
else\r
- CL_TRACE(IBSP_DBG_HW, gdbg_lvl, ("not found\n") );\r
+ IBSP_TRACE( IBSP_DBG_HW, ("not found\n") );\r
\r
cl_spinlock_release( &g_ibsp.ip_mutex );\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
return p_port;\r
}\r
{\r
struct memory_node *node;\r
\r
- CL_ENTER( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_MEM );\r
\r
cl_spinlock_acquire( &mem_list->mutex );\r
\r
cl_spinlock_release( &mem_list->mutex );\r
\r
if( node )\r
- CL_EXIT( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_MEM );\r
else\r
- CL_TRACE_EXIT( IBSP_DBG_MEM, gdbg_lvl, ("mr not found\n") );\r
+ IBSP_TRACE_EXIT( IBSP_DBG_MEM, ("mr not found\n") );\r
\r
return node;\r
}\r
struct memory_node *node;\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_MEM );\r
\r
CL_ASSERT( start != NULL );\r
CL_ASSERT( len != 0 );\r
{\r
node->refcount++;\r
cl_spinlock_release( &mem_list->mutex );\r
- CL_EXIT( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_MEM );\r
return node;\r
}\r
\r
\r
if( node == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
- ("AllocateOverlappedBuf:HeapAlloc() failed: %d\n", GetLastError()) );\r
+ IBSP_ERROR_EXIT(\r
+ ("AllocateOverlappedBuf:HeapAlloc() failed: %d\n",\r
+ GetLastError()) );\r
*lpErrno = WSAENOBUFS;\r
return NULL;\r
}\r
node->type.length = len;\r
node->type.access_ctrl = access_ctrl;\r
\r
- CL_TRACE( IBSP_DBG_MEM, gdbg_lvl, ("pinning memory node %p\n", node) );\r
+ IBSP_TRACE( IBSP_DBG_MEM, ("pinning memory node %p\n", node) );\r
status = ib_reg_mem( pd, &node->type, &node->lkey, &node->rkey, &node->mr_handle );\r
\r
if( status )\r
#endif\r
if( HeapFree( g_ibsp.heap, 0, node ) == FALSE )\r
{\r
- CL_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
+ IBSP_ERROR(\r
("BAD: HeapFree failed (%d)\n", GetLastError()) );\r
}\r
\r
- CL_EXIT_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("ib_reg_mem failed (%d)\n", status) );\r
+ IBSP_ERROR_EXIT( ("ib_reg_mem failed (%d)\n", status) );\r
\r
*lpErrno = WSAEFAULT;\r
return NULL;\r
cl_qlist_insert_head( &mem_list->list, &node->item );\r
cl_spinlock_release( &mem_list->mutex );\r
\r
- CL_EXIT( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_MEM );\r
\r
*lpErrno = 0;\r
return node;\r
ib_api_status_t status;\r
#endif\r
\r
- CL_ENTER( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_MEM );\r
\r
cl_spinlock_acquire( &mem_list->mutex );\r
\r
if( node->refcount <= 0 )\r
{\r
cl_spinlock_release( &mem_list->mutex );\r
- CL_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
+ IBSP_ERROR(\r
("ib_deregister_memory: bad refcount %d)\n", node->refcount) );\r
*lpErrno = WSAEINVAL;\r
return SOCKET_ERROR;\r
status = ib_dereg_mr( node->mr_handle );\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("ib_dereg_mr failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_dereg_mr failed (%d)\n", status) );\r
}\r
else\r
{\r
#endif\r
if( HeapFree( g_ibsp.heap, 0, node ) == FALSE )\r
{\r
- CL_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
+ IBSP_ERROR(\r
("BAD: HeapFree failed (%d)\n", GetLastError()) );\r
}\r
}\r
\r
cl_spinlock_release( &mem_list->mutex );\r
\r
- CL_EXIT( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_MEM );\r
\r
*lpErrno = 0;\r
return 0;\r
{\r
cl_list_item_t *item;\r
\r
- CL_ENTER( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_MEM );\r
\r
cl_spinlock_acquire( &mem_list->mutex );\r
\r
struct memory_node *node = PARENT_STRUCT(item, struct memory_node, item);\r
ib_api_status_t status;\r
\r
- CL_TRACE( IBSP_DBG_MEM, gdbg_lvl, ("unpinning ,memory node node %p\n", node) );\r
+ IBSP_TRACE( IBSP_DBG_MEM, ("unpinning ,memory node node %p\n", node) );\r
status = ib_dereg_mr( node->mr_handle );\r
if( status )\r
{\r
- CL_ERROR( IBSP_DBG_MEM, gdbg_lvl, ("ib_dereg_mem failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_dereg_mem failed (%d)\n", status) );\r
}\r
else\r
{\r
\r
if( HeapFree( g_ibsp.heap, 0, node ) == FALSE )\r
{\r
- CL_ERROR( IBSP_DBG_MEM, gdbg_lvl,\r
+ IBSP_ERROR(\r
("BAD: HeapFree failed (%d)\n", GetLastError()) );\r
}\r
}\r
\r
cl_spinlock_release( &mem_list->mutex );\r
\r
- CL_EXIT( IBSP_DBG_MEM, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_MEM );\r
}\r
struct ibsp_hca *hca;\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
hca = HeapAlloc( g_ibsp.heap, HEAP_ZERO_MEMORY, sizeof(struct ibsp_hca) );\r
if( hca == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("can't get enough memory (%d)\n", sizeof(struct ibsp_hca)) );\r
status = IB_INSUFFICIENT_MEMORY;\r
goto pnp_ca_add_err1;\r
cl_spinlock_init( &hca->rdma_mem_list.mutex );\r
\r
/* HCA handle */\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_HW,\r
("handle is %p %016I64x\n", g_ibsp.al_handle, hca->guid) );\r
status =\r
ib_open_ca( g_ibsp.al_handle, hca->guid, NULL, hca, &hca->hca_handle );\r
\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_open_ca failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_open_ca failed (%d)\n", status) );\r
goto pnp_ca_add_err2;\r
}\r
\r
{\r
STAT_INC( pd_num );\r
\r
- CL_TRACE( IBSP_DBG_EP, gdbg_lvl, ("allocated PD %p for HCA\n", hca->pd) );\r
+ IBSP_TRACE( IBSP_DBG_EP, ("allocated PD %p for HCA\n", hca->pd) );\r
\r
/* Success */\r
cl_spinlock_acquire( &g_ibsp.hca_mutex );\r
}\r
else\r
{\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_alloc_pd failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_alloc_pd failed (%d)\n", status) );\r
if( ib_close_ca( hca->hca_handle, NULL ) == IB_SUCCESS )\r
STAT_DEC( ca_num );\r
\r
}\r
pnp_ca_add_err1:\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
return status;\r
}\r
\r
ib_api_status_t status;\r
cl_list_item_t *p_item;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
/*\r
* Remove all the ports\r
*/\r
status = ib_dealloc_pd( hca->pd, NULL );\r
if( status )\r
- CL_ERROR( IBSP_DBG_EP, gdbg_lvl, ("ib_dealloc_pd failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_dealloc_pd failed (%d)\n", status) );\r
else\r
STAT_DEC( pd_num );\r
\r
{\r
status = ib_close_ca( hca->hca_handle, ib_sync_destroy );\r
if( status != IB_SUCCESS )\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl, ("ib_close_ca failed (%d)\n", status) );\r
+ IBSP_ERROR( ("ib_close_ca failed (%d)\n", status) );\r
\r
hca->hca_handle = NULL;\r
}\r
\r
HeapFree( g_ibsp.heap, 0, hca );\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
\r
struct ibsp_hca *hca;\r
struct ibsp_port *port;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
hca = lookup_hca( p_port_rec->p_ca_attr->ca_guid );\r
if( !hca )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("Failed to lookup HCA (%016I64x) for new port (%016I64x)\n",\r
p_port_rec->p_ca_attr->ca_guid, p_port_rec->p_port_attr->port_guid) );\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
return IB_INVALID_GUID;\r
}\r
\r
port = HeapAlloc( g_ibsp.heap, HEAP_ZERO_MEMORY, sizeof(struct ibsp_port) );\r
if( port == NULL )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("HeapAlloc failed (%d)\n", sizeof(struct ibsp_port)) );\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
return IB_INSUFFICIENT_MEMORY;\r
}\r
\r
cl_spinlock_release( &hca->port_lock );\r
p_port_rec->pnp_rec.context = port;\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
return IB_SUCCESS;\r
}\r
\r
pnp_port_remove(\r
IN struct ibsp_port* const port )\r
{\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
if( !port )\r
goto done;\r
HeapFree( g_ibsp.heap, 0, port );\r
\r
done:\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
\r
\r
ib_api_status_t status = IB_SUCCESS;\r
ib_pnp_port_rec_t* p_port_rec = (ib_pnp_port_rec_t*)pnp_rec;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
- CL_TRACE( IBSP_DBG_HW, gdbg_lvl, ("event is %x\n", pnp_rec->pnp_event) );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
+ IBSP_TRACE( IBSP_DBG_HW, ("event is %x\n", pnp_rec->pnp_event) );\r
\r
switch( pnp_rec->pnp_event )\r
{\r
case IB_PNP_GID_CHANGE:\r
case IB_PNP_LID_CHANGE:\r
case IB_PNP_SUBNET_TIMEOUT_CHANGE:\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("pnp_callback: unsupported event %x\n", pnp_rec->pnp_event) );\r
break;\r
\r
break;\r
\r
default:\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("pnp_callback: unsupported event %x\n", pnp_rec->pnp_event) );\r
break;\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
\r
return IB_SUCCESS;\r
}\r
ib_api_status_t status;\r
ib_pnp_req_t pnp_req;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
pnp_req.pnp_class = IB_PNP_CA;\r
pnp_req.pnp_context = NULL;\r
status = ib_reg_pnp( g_ibsp.al_handle, &pnp_req, &g_ibsp.pnp_handle_port );\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("register_pnp: ib_reg_pnp for PORT failed (%d)\n", status) );\r
goto done;\r
}\r
status = ib_reg_pnp( g_ibsp.al_handle, &pnp_req, &g_ibsp.pnp_handle_port );\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("register_pnp: ib_reg_pnp for PORT failed (%d)\n", status) );\r
goto done;\r
}\r
unregister_pnp();\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
\r
return status;\r
}\r
{\r
ib_api_status_t status;\r
\r
- CL_ENTER( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_HW );\r
\r
if( g_ibsp.pnp_handle_port )\r
{\r
status = ib_dereg_pnp( g_ibsp.pnp_handle_port, ib_sync_destroy );\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("unregister_pnp: ib_dereg_pnp for PORT failed (%d)\n", status) );\r
}\r
\r
status = ib_dereg_pnp( g_ibsp.pnp_handle_ca, ib_sync_destroy );\r
if( status != IB_SUCCESS )\r
{\r
- CL_ERROR( IBSP_DBG_HW, gdbg_lvl,\r
+ IBSP_ERROR(\r
("unregister_pnp: ib_dereg_pnp for PORT failed (%d)\n", status) );\r
}\r
\r
g_ibsp.pnp_handle_ca = NULL;\r
}\r
\r
- CL_EXIT( IBSP_DBG_HW, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_HW );\r
}\r
TCHAR env_var[16];\r
DWORD i;\r
\r
- CL_ENTER( IBSP_DBG_DLL, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_DLL );\r
\r
UNUSED_PARAM( hinstDll );\r
UNUSED_PARAM( lpvReserved );\r
char buf[64];\r
if( GetEnvironmentVariable( "IBSPLOAD", buf, sizeof(buf) ) == 0 )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_DLL, gdbg_lvl, ("IBSPLOAD not defined:\n") );\r
+ IBSP_ERROR_EXIT( ("IBSPLOAD not defined:\n") );\r
\r
return FALSE;\r
}\r
switch( dwReason )\r
{\r
case DLL_PROCESS_ATTACH:\r
- CL_TRACE( IBSP_DBG_DLL, gdbg_lvl, ("DllMain: DLL_PROCESS_ATTACH\n") );\r
+ IBSP_TRACE( IBSP_DBG_DLL, ("DllMain: DLL_PROCESS_ATTACH\n") );\r
\r
#ifdef _DEBUG_\r
i = GetEnvironmentVariable( "IBWSD_DBG", env_var, 16 );\r
break;\r
\r
case DLL_THREAD_ATTACH:\r
- CL_TRACE( IBSP_DBG_DLL, gdbg_lvl, ("DllMain: DLL_THREAD_ATTACH\n") );\r
+ IBSP_TRACE( IBSP_DBG_DLL, ("DllMain: DLL_THREAD_ATTACH\n") );\r
break;\r
\r
case DLL_THREAD_DETACH:\r
- CL_TRACE( IBSP_DBG_DLL, gdbg_lvl, ("DllMain: DLL_THREAD_DETACH\n") );\r
+ IBSP_TRACE( IBSP_DBG_DLL, ("DllMain: DLL_THREAD_DETACH\n") );\r
break;\r
\r
case DLL_PROCESS_DETACH:\r
- CL_TRACE( IBSP_DBG_DLL, gdbg_lvl, ("DllMain: DLL_PROCESS_DETACH\n") );\r
+ IBSP_TRACE( IBSP_DBG_DLL, ("DllMain: DLL_PROCESS_DETACH\n") );\r
\r
#ifdef _DEBUG_\r
{\r
\r
cl_spinlock_release( &g_ibsp.socket_info_mutex );\r
\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, ("Statistics:\n") );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR( ("Statistics:\n") );\r
+ IBSP_ERROR(\r
(" overlap_h0_count = %d\n", g_ibsp.overlap_h0_count) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" max_comp_count = %d\n", g_ibsp.max_comp_count) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" overlap_h1_count = %d\n", g_ibsp.overlap_h1_count) );\r
\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl, (" send_count = %d\n", g_ibsp.send_count) );\r
+ IBSP_ERROR( (" send_count = %d\n", g_ibsp.send_count) );\r
\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of QPs left = %d\n", g_ibsp.qp_num) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of CQs left = %d\n", g_ibsp.cq_num) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of PDs left = %d\n", g_ibsp.pd_num) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of ALs left = %d\n", g_ibsp.al_num) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of MRs left = %d\n", g_ibsp.mr_num) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of listens left = %d\n", g_ibsp.listen_num) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of PNPs left = %d\n", g_ibsp.pnp_num) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of threads left = %d\n", g_ibsp.thread_num) );\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" number of WPU sockets left = %d\n", g_ibsp.wpusocket_num) );\r
\r
- CL_ERROR( IBSP_DBG_DLL, gdbg_lvl,\r
+ IBSP_ERROR(\r
(" CloseSocket_count = %d\n", g_ibsp.CloseSocket_count) );\r
\r
}\r
break;\r
}\r
\r
- CL_EXIT( IBSP_DBG_DLL, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_DLL );\r
\r
return TRUE;\r
}\r
return INVALID_SOCKET;\r
}\r
\r
- CL_TRACE( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_CONN,\r
("IBSPAccept: Found pending connection on this socket\n") );\r
\r
incoming = PARENT_STRUCT(cl_qlist_head( &socket_info->listen.list ),\r
ib_reject( incoming->cm_req_received.h_cm_req, IB_REJ_INSUF_QP );\r
\r
HeapFree( g_ibsp.heap, 0, incoming );\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("bad incoming parameter\n") );\r
+ IBSP_ERROR_EXIT( ("bad incoming parameter\n") );\r
*lpErrno = WSAECONNREFUSED;\r
return INVALID_SOCKET;\r
}\r
{\r
cl_spinlock_release( &socket_info->mutex );\r
\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("create_socket_info return NULL\n") );\r
+ IBSP_ERROR_EXIT( ("create_socket_info return NULL\n") );\r
*lpErrno = WSAENOBUFS;\r
return INVALID_SOCKET;\r
}\r
{\r
cl_spinlock_release( &socket_info->mutex );\r
\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("WPUCreateSocketHandle() failed: %d", *lpErrno) );\r
free_socket_info( new_socket_info );\r
return INVALID_SOCKET;\r
{\r
cl_spinlock_release( &socket_info->mutex );\r
\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("ib_create socket failed with %d\n", ret) );\r
*lpErrno = WSAENOBUFS;\r
return INVALID_SOCKET;\r
memcpy( addr, &incoming->params.source, sizeof(struct sockaddr_in) );\r
*addrlen = sizeof(struct sockaddr_in);\r
\r
- CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, ("The socket address of connecting entity is\n") );\r
+ IBSP_TRACE( IBSP_DBG_CONN, ("The socket address of connecting entity is\n") );\r
DebugPrintSockAddr( IBSP_DBG_CONN, gdbg_lvl, &incoming->params.source );\r
\r
new_socket_info->peer_addr = incoming->params.source;\r
HeapFree( g_ibsp.heap, 0, incoming );\r
*lpErrno = ret;\r
\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("ib_accept failed (%d)\n", ret) );\r
+ IBSP_ERROR_EXIT( ("ib_accept failed (%d)\n", ret) );\r
\r
return INVALID_SOCKET;\r
}\r
CloseHandle( new_socket_info->h_event );\r
new_socket_info->h_event = NULL;\r
\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("wait for ib_accept failed\n") );\r
+ IBSP_ERROR_EXIT( ("wait for ib_accept failed\n") );\r
\r
*lpErrno = WSAEACCES;\r
return INVALID_SOCKET;\r
struct ibsp_port *port;\r
int ret;\r
\r
- CL_ENTER( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CONN );\r
\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s));\r
\r
- CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, ("Address to bind to:\n") );\r
+ IBSP_TRACE( IBSP_DBG_CONN, ("Address to bind to:\n") );\r
DebugPrintSockAddr( IBSP_DBG_CONN, gdbg_lvl, addr );\r
\r
fzprint(("binding to IP %s\n", inet_ntoa( addr->sin_addr )));\r
\r
cl_spinlock_release( &socket_info->mutex );\r
\r
- CL_EXIT( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CONN );\r
return 0;\r
\r
error:\r
CL_ASSERT( *lpErrno != 0 );\r
- CL_TRACE_EXIT( IBSP_DBG_CONN, gdbg_lvl, ("failed with error %d\n", *lpErrno) );\r
+ IBSP_TRACE_EXIT( IBSP_DBG_CONN, ("failed with error %d\n", *lpErrno) );\r
return SOCKET_ERROR;\r
}\r
\r
{\r
struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s;\r
\r
- CL_ENTER( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CONN );\r
\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p \n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s));\r
\r
if( s == INVALID_SOCKET )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_WQ, gdbg_lvl, ("invalid socket handle %x\n", s) );\r
+ IBSP_ERROR_EXIT( ("invalid socket handle %x\n", s) );\r
*lpErrno = WSAENOTSOCK;\r
return SOCKET_ERROR;\r
}\r
shutdown_and_destroy_socket_info( socket_info );\r
\r
\r
- CL_EXIT( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CONN );\r
\r
*lpErrno = 0;\r
return 0;\r
__LINE__, GetCurrentProcessId(),\r
GetCurrentThreadId(), s, IBSP_SOCKET_STATE_STR( socket_info->socket_state )));\r
\r
- CL_TRACE( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_TRACE( IBSP_DBG_CONN,\r
("lpCallerData=%p, lpCalleeData=%p\n", lpCallerData, lpCalleeData) );\r
\r
/* Sanity checks */\r
if( ret )\r
{\r
IBSP_ERROR_EXIT(\r
- ("query_guid_address failed for IP %08x\n", addr->sin_addr.s_addr) );\r
+ ("query_guid_address failed for IP %08x\n",\r
+ addr->sin_addr.s_addr) );\r
*lpErrno = WSAEADDRNOTAVAIL;\r
return SOCKET_ERROR;\r
}\r
\r
- CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, ("got GUID %I64x for IP %s\n",\r
+ IBSP_TRACE( IBSP_DBG_CONN, ("got GUID %I64x for IP %s\n",\r
CL_NTOH64( dest_port_guid ), inet_ntoa( addr->sin_addr )) );\r
\r
if( dest_port_guid == socket_info->port->guid )\r
struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s;\r
int ret;\r
\r
- CL_ENTER( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CONN );\r
\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p state=%s\n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(),\r
if( socket_info->socket_state != IBSP_CONNECTED )\r
{\r
cl_spinlock_release( &socket_info->mutex );\r
- CL_TRACE_EXIT( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_TRACE_EXIT( IBSP_DBG_CONN,\r
("Socket state not IBSP_CONNECTED, state=%s.\n",\r
IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );\r
*lpErrno = WSAENOTCONN;\r
cl_spinlock_release( &socket_info->mutex );\r
if( ret )\r
{\r
- CL_TRACE_EXIT( IBSP_DBG_CONN, gdbg_lvl,\r
+ IBSP_TRACE_EXIT( IBSP_DBG_CONN,\r
("prepare_duplicate_socket failed with %d\n", ret) );\r
*lpErrno = ret;\r
return SOCKET_ERROR;\r
}\r
else\r
{\r
- CL_EXIT( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CONN );\r
lpProtocolInfo->dwProviderReserved = socket_info->duplicate.identifier;\r
*lpErrno = 0;\r
return 0;\r
{\r
struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s;\r
\r
- CL_ENTER( IBSP_DBG_OPT, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_OPT );\r
\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p\n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s));\r
\r
if( level != SOL_SOCKET )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("invalid level %d", level) );\r
+ IBSP_ERROR_EXIT( ("invalid level %d", level) );\r
*lpErrno = WSAENOPROTOOPT;\r
return SOCKET_ERROR;\r
}\r
\r
if( optval == NULL || optlen == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("invalid optval=%p or optlen=%p", optval, optlen) );\r
*lpErrno = WSAEFAULT;\r
return SOCKET_ERROR;\r
switch( optname )\r
{\r
case SO_DEBUG:\r
- CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_DEBUG\n") );\r
+ IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_DEBUG\n") );\r
if( *optlen < sizeof(BOOL) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("option len is invalid (0x%x)\n", *optlen) );\r
*optlen = sizeof(BOOL);\r
*lpErrno = WSAEFAULT;\r
break;\r
\r
case SO_GROUP_ID:\r
- CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_GROUP_ID\n") );\r
+ IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_GROUP_ID\n") );\r
if( *optlen < sizeof(GROUP) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("option len is invalid (0x%x)\n", *optlen) );\r
*optlen = sizeof(GROUP);\r
*lpErrno = WSAEFAULT;\r
break;\r
\r
case SO_GROUP_PRIORITY:\r
- CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_GROUP_PRIORITY\n") );\r
+ IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_GROUP_PRIORITY\n") );\r
\r
if( *optlen < sizeof(int) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("option len is invalid (0x%x)\n", *optlen) );\r
*optlen = sizeof(int);\r
*lpErrno = WSAEFAULT;\r
break;\r
\r
case SO_MAX_MSG_SIZE:\r
- CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_MAX_MSG_SIZE\n") );\r
+ IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_MAX_MSG_SIZE\n") );\r
\r
if( *optlen < sizeof(unsigned int) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("option len is invalid (0x%x)\n", *optlen) );\r
*optlen = sizeof(unsigned int);\r
*lpErrno = WSAEFAULT;\r
break;\r
\r
case SO_MAX_RDMA_SIZE:\r
- CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_MAX_RDMA_SIZE\n") );\r
+ IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_MAX_RDMA_SIZE\n") );\r
\r
if( *optlen < sizeof(unsigned int) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("option len is invalid (0x%x)\n", *optlen) );\r
*optlen = sizeof(unsigned int);\r
*lpErrno = WSAEFAULT;\r
break;\r
\r
case SO_RDMA_THRESHOLD_SIZE:\r
- CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_RDMA_THRESHOLD_SIZE\n") );\r
+ IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_RDMA_THRESHOLD_SIZE\n") );\r
\r
if( *optlen < sizeof(unsigned int) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("option len is invalid (0x%x)\n", *optlen) );\r
*optlen = sizeof(unsigned int);\r
*lpErrno = WSAEFAULT;\r
default:\r
*lpErrno = WSAENOPROTOOPT;\r
\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("unknown option 0x%x\n", optname) );\r
+ IBSP_ERROR_EXIT( ("unknown option 0x%x\n", optname) );\r
\r
return SOCKET_ERROR;\r
break;\r
}\r
\r
- CL_EXIT( IBSP_DBG_OPT, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_OPT );\r
return 0;\r
}\r
\r
LPQOS lpQOS,\r
LPINT lpErrno )\r
{\r
- CL_ENTER( IBSP_DBG_OPT, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_OPT );\r
\r
UNUSED_PARAM( s );\r
UNUSED_PARAM( lpQOSName );\r
\r
*lpErrno = WSAEOPNOTSUPP;\r
\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("not supported\n") );\r
+ IBSP_ERROR_EXIT( ("not supported\n") );\r
\r
return FALSE;\r
}\r
case SIO_SET_GROUP_QOS:\r
/* We don't support that. dwServiceFlags1 in installSP \r
* wasn't set. */\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("unsupported dwIoControlCode %d\n", dwIoControlCode) );\r
*lpErrno = WSAENOPROTOOPT;\r
return SOCKET_ERROR;\r
ret = build_ip_list( (LPSOCKET_ADDRESS_LIST)lpvOutBuffer,\r
lpcbBytesReturned, lpErrno );\r
\r
- CL_EXIT( IBSP_DBG_OPT, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_OPT );\r
return ret;\r
}\r
break;\r
\r
default:\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("invalid dwIoControlCode %d\n", dwIoControlCode) );\r
\r
*lpErrno = WSAENOPROTOOPT;\r
struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s;\r
int ret;\r
\r
- CL_ENTER( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_CONN );\r
\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p\n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s));\r
\r
cl_spinlock_acquire( &socket_info->mutex );\r
\r
- CL_TRACE( IBSP_DBG_CONN, gdbg_lvl, ("socket_state is %s\n",\r
+ IBSP_TRACE( IBSP_DBG_CONN, ("socket_state is %s\n",\r
IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );\r
\r
/* Verify the state of the socket */\r
if( ret )\r
{\r
IBSP_CHANGE_SOCKET_STATE( socket_info, IBSP_BIND );\r
- CL_EXIT_ERROR( IBSP_DBG_CONN, gdbg_lvl, ("ib_listen failed with %d\n", ret) );\r
+ IBSP_ERROR_EXIT( ("ib_listen failed with %d\n", ret) );\r
}\r
else\r
{\r
\r
cl_spinlock_release( &socket_info->mutex );\r
\r
- CL_EXIT( IBSP_DBG_CONN, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_CONN );\r
\r
if( *lpErrno )\r
return SOCKET_ERROR;\r
{\r
struct ibsp_socket_info *socket_info = (struct ibsp_socket_info *)s;\r
\r
- CL_ENTER( IBSP_DBG_OPT, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_OPT );\r
\r
fzprint(("%s():%d:0x%x:0x%x: socket=0x%p\n", __FUNCTION__,\r
__LINE__, GetCurrentProcessId(), GetCurrentThreadId(), s));\r
\r
if( level != SOL_SOCKET )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("invalid level %d", level) );\r
+ IBSP_ERROR_EXIT( ("invalid level %d", level) );\r
*lpErrno = WSAENOPROTOOPT;\r
return SOCKET_ERROR;\r
}\r
\r
if( optval == NULL )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("invalid optval=%p", optval) );\r
+ IBSP_ERROR_EXIT( ("invalid optval=%p", optval) );\r
*lpErrno = WSAEFAULT;\r
return SOCKET_ERROR;\r
}\r
switch( optname )\r
{\r
case SO_DEBUG:\r
- CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_DEBUG\n") );\r
+ IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_DEBUG\n") );\r
if( optlen != sizeof(BOOL) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("option len is invalid (0x%x)\n", optlen) );\r
*lpErrno = WSAEFAULT;\r
return SOCKET_ERROR;\r
break;\r
\r
case SO_GROUP_PRIORITY:\r
- CL_TRACE( IBSP_DBG_OPT, gdbg_lvl, ("Option name SO_GROUP_PRIORITY\n") );\r
+ IBSP_TRACE( IBSP_DBG_OPT, ("Option name SO_GROUP_PRIORITY\n") );\r
if( optlen != sizeof(int) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("option len is invalid (0x%x)\n", optlen) );\r
*lpErrno = WSAEFAULT;\r
return SOCKET_ERROR;\r
break;\r
\r
default:\r
- CL_EXIT_ERROR( IBSP_DBG_OPT, gdbg_lvl, ("invalid option %x\n", optname) );\r
+ IBSP_ERROR_EXIT( ("invalid option %x\n", optname) );\r
*lpErrno = WSAENOPROTOOPT;\r
return SOCKET_ERROR;\r
break;\r
}\r
\r
- CL_EXIT( IBSP_DBG_OPT, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_OPT );\r
\r
return 0;\r
}\r
{\r
int ret = 0;\r
\r
- CL_ENTER( IBSP_DBG_INIT, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_INIT );\r
\r
cl_spinlock_acquire( &g_ibsp.mutex );\r
\r
\r
*lpErrno = WSANOTINITIALISED;\r
\r
- CL_EXIT_ERROR( IBSP_DBG_INIT, gdbg_lvl, ("returning WSAENOTINITIALISED\n") );\r
+ IBSP_ERROR_EXIT( ("returning WSAENOTINITIALISED\n") );\r
\r
return SOCKET_ERROR;\r
}\r
/* Decrement the entry count */\r
g_ibsp.entry_count--;\r
\r
- CL_TRACE( IBSP_DBG_INIT, gdbg_lvl, ("WSPCleanup: %d\n", g_ibsp.entry_count) );\r
+ IBSP_TRACE( IBSP_DBG_INIT, ("WSPCleanup: %d\n", g_ibsp.entry_count) );\r
\r
if( g_ibsp.entry_count == 0 )\r
{\r
- CL_TRACE( IBSP_DBG_INIT, gdbg_lvl, ("entry_count is 0 => cleaning up\n") );\r
+ IBSP_TRACE( IBSP_DBG_INIT, ("entry_count is 0 => cleaning up\n") );\r
ib_release();\r
}\r
\r
cl_spinlock_release( &g_ibsp.mutex );\r
\r
- CL_EXIT( IBSP_DBG_INIT, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_INIT );\r
\r
return ret;\r
}\r
static WSPPROC_TABLE gProcTable;\r
static WSPDATA gWSPData;\r
\r
- CL_ENTER( IBSP_DBG_INIT, gdbg_lvl );\r
+ IBSP_ENTER( IBSP_DBG_INIT );\r
\r
/* Make sure that the version requested is >= 2.2. The low byte is the \r
major version and the high byte is the minor version. */\r
if( (LOBYTE(wVersion) < 2) || ((LOBYTE(wVersion) == 2) && (HIBYTE(wVersion) < 2)) )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_INIT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("Invalid winsock version requested %x\n", wVersion) );\r
\r
return WSAVERNOTSUPPORTED;\r
}\r
\r
- CL_TRACE( IBSP_DBG_INIT, gdbg_lvl, ("entry_count=%d)\n", g_ibsp.entry_count) );\r
+ IBSP_TRACE( IBSP_DBG_INIT, ("entry_count=%d)\n", g_ibsp.entry_count) );\r
\r
cl_spinlock_acquire( &g_ibsp.mutex );\r
\r
ret = ibsp_initialize();\r
if( ret )\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_INIT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("ibsp_initialize failed (%d)\n", ret) );\r
return ret;\r
}\r
/* store the upcall function table */\r
g_ibsp.up_call_table = *UpCallTable;\r
\r
- CL_EXIT( IBSP_DBG_INIT, gdbg_lvl );\r
+ IBSP_EXIT( IBSP_DBG_INIT );\r
\r
return 0;\r
}\r
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
* SOFTWARE.\r
*\r
- * $Id: ibspdll.rc 1.3 05/05/23 16:03:31-07:00 ftillier@orbuild.infiniconsys.com $\r
+ * $Id$\r
*/\r
\r
#include <ics_ver.h>\r
\r
#define VER_FILETYPE VFT_DLL\r
#define VER_FILESUBTYPE VFT2_UNKNOWN\r
-#define VER_FILEDESCRIPTION_STR "SilverStorm Winsock Direct for InfiniBand"\r
-#define VER_INTERNALNAME_STR "ibwsd.dll"\r
-#define VER_ORIGINALFILENAME_STR "ibwsd.dll"\r
+\r
+#ifdef _DEBUG_\r
+#define VER_FILEDESCRIPTION_STR "Winsock Direct for InfiniBand (Debug)"\r
+#else\r
+#define VER_FILEDESCRIPTION_STR "Winsock Direct for InfiniBand"\r
+#endif\r
+\r
+#define VER_INTERNALNAME_STR "ibwsd.dll"\r
+#define VER_ORIGINALFILENAME_STR "ibwsd.dll"\r
\r
#include <common.ver>\r
g_ibsp.heap = HeapCreate( 0, 128000, 0 );\r
if( g_ibsp.heap == NULL)\r
{\r
- CL_EXIT_ERROR( IBSP_DBG_INIT, gdbg_lvl,\r
+ IBSP_ERROR_EXIT(\r
("HeapCreate() failed: %d\n", GetLastError()) );\r
return 1;\r
}\r