From 2bee7d24dd8be6227b6566b3d5bcae0929049c8b Mon Sep 17 00:00:00 2001 From: Dennis Potter Date: Tue, 17 Jul 2018 11:10:05 +0200 Subject: [PATCH] Added rdma_event_str() This replaces the manual translation of enumerations in the switch statements. --- lib/nodes/infiniband.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/nodes/infiniband.c b/lib/nodes/infiniband.c index 4a063a017..049e9f030 100644 --- a/lib/nodes/infiniband.c +++ b/lib/nodes/infiniband.c @@ -493,16 +493,14 @@ void * ib_rdma_cm_event_thread(void *n) // Monitor event channel while (rdma_get_cm_event(ib->ctx.ec, &event) == 0) { + debug(LOG_IB | 2, "Received communication event: %s", rdma_event_str(event->event)); switch(event->event) { case RDMA_CM_EVENT_ADDR_RESOLVED: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_ADDR_RESOLVED"); - ret = ib_addr_resolved(n); break; case RDMA_CM_EVENT_ADDR_ERROR: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_ADDR_ERROR"); warn("Address resolution (rdma_resolve_addr) failed!"); ib_continue_as_listen(n, event); @@ -510,13 +508,10 @@ void * ib_rdma_cm_event_thread(void *n) break; case RDMA_CM_EVENT_ROUTE_RESOLVED: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_ROUTE_RESOLVED"); - ret = ib_route_resolved(n); break; case RDMA_CM_EVENT_ROUTE_ERROR: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_ROUTE_ERROR"); warn("Route resolution (rdma_resovle_route) failed!"); ib_continue_as_listen(n, event); @@ -524,13 +519,10 @@ void * ib_rdma_cm_event_thread(void *n) break; case RDMA_CM_EVENT_CONNECT_REQUEST: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_CONNECT_REQUEST"); - ret = ib_connect_request(n, event->id); break; case RDMA_CM_EVENT_CONNECT_ERROR: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_CONNECT_ERROR"); warn("An error has occurred trying to establish a connection!"); ib_continue_as_listen(n, event); @@ -538,7 +530,6 @@ void * ib_rdma_cm_event_thread(void *n) break; case RDMA_CM_EVENT_REJECTED: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_REJECTED"); warn("Connection request or response was rejected by the remote end point!"); ib_continue_as_listen(n, event); @@ -546,15 +537,12 @@ void * ib_rdma_cm_event_thread(void *n) break; case RDMA_CM_EVENT_ESTABLISHED: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_ESTABLISHED"); - node->state = STATE_CONNECTED; info("Connection established in node %s", node_name(n)); break; case RDMA_CM_EVENT_DISCONNECTED: - debug(LOG_IB | 2, "Received RDMA_CM_EVENT_DISCONNECTED"); node->state = STATE_STARTED; ret = ib_disconnect(n);