diff --git a/src/mca/ptl/ib/src/ptl_ib.h b/src/mca/ptl/ib/src/ptl_ib.h index 94445586ab..f0a85f850e 100644 --- a/src/mca/ptl/ib/src/ptl_ib.h +++ b/src/mca/ptl/ib/src/ptl_ib.h @@ -24,7 +24,6 @@ #include "ptl_ib_proc.h" #include "ptl_ib_peer.h" #include "ptl_ib_priv.h" -#include "ptl_ib_ud.h" /* Other IB ptl includes */ #include "ptl_ib_sendreq.h" diff --git a/src/mca/ptl/ib/src/ptl_ib_addr.h b/src/mca/ptl/ib/src/ptl_ib_addr.h index a4f08bf5fd..c2741eeefc 100644 --- a/src/mca/ptl/ib/src/ptl_ib_addr.h +++ b/src/mca/ptl/ib/src/ptl_ib_addr.h @@ -3,19 +3,4 @@ #include "ptl_ib.h" -/* Structure for publishing the InfiniBand - * Unreliable Datagram address to peers */ - -struct mca_ptl_ib_ud_addr_t { - VAPI_qp_num_t qp_num; /* UD qp hndl to be published */ - IB_lid_t lid; /* Local identifier */ -}; -typedef struct mca_ptl_ib_ud_addr_t mca_ptl_ib_ud_addr_t; - -struct mca_ptl_ib_addr_t { - VAPI_qp_num_t rc_qp; /* RC qp hndl */ - IB_lid_t lid; /* LID of the peer */ -}; -typedef struct mca_ptl_ib_addr_t mca_ptl_ib_addr_t; - #endif diff --git a/src/mca/ptl/ib/src/ptl_ib_component.c b/src/mca/ptl/ib/src/ptl_ib_component.c index a95f8e01bc..265d4944b8 100644 --- a/src/mca/ptl/ib/src/ptl_ib_component.c +++ b/src/mca/ptl/ib/src/ptl_ib_component.c @@ -135,44 +135,6 @@ int mca_ptl_ib_component_close(void) static int mca_ptl_ib_component_send(void) { -#if 0 - int i, rc, size; - mca_ptl_ib_ud_addr_t* ud_qp_addr = NULL; - - size = sizeof(mca_ptl_ib_ud_addr_t) * mca_ptl_ib_component.ib_num_ptl_modules; - - ud_qp_addr = (mca_ptl_ib_ud_addr_t*) malloc(size); - - if(NULL == ud_qp_addr) { - return OMPI_ERR_OUT_OF_RESOURCE; - } - - for(i = 0; i < mca_ptl_ib_component.ib_num_ptl_modules; i++) { - mca_ptl_ib_module_t* ptl = mca_ptl_ib_component.ib_ptl_modules[i]; - /* This is for the UD dynamic connection interface - ud_qp_addr[i].qp_num = ptl->ud_qp_prop.qp_num; - ud_qp_addr[i].lid = ptl->port.lid; - */ - - /* Just a quick hack for 1-to-1 communications */ - ud_qp_addr[i].qp_num = ptl->my_qp_prop.qp_num; - ud_qp_addr[i].lid = ptl->port.lid; - } - - D_PRINT("QP num sent = %d, LID sent = %d\n", - ud_qp_addr[0].qp_num, ud_qp_addr[0].lid); - - rc = mca_base_modex_send(&mca_ptl_ib_component.super.ptlm_version, - ud_qp_addr, size); - - if(OMPI_SUCCESS != rc) { - D_PRINT("mca_base_modex_send didn't succeed : %d\n", rc); - } - - free(ud_qp_addr); - - return rc; -#endif return OMPI_SUCCESS; } diff --git a/src/mca/ptl/ib/src/ptl_ib_peer.c b/src/mca/ptl/ib/src/ptl_ib_peer.c index eaf1ec92e2..ebfad9c1e7 100644 --- a/src/mca/ptl/ib/src/ptl_ib_peer.c +++ b/src/mca/ptl/ib/src/ptl_ib_peer.c @@ -396,9 +396,6 @@ int mca_ptl_ib_peer_send(mca_ptl_base_peer_t* peer, switch(peer->peer_state) { case MCA_PTL_IB_CONNECTING: - /* Well, connecting means that I've already sent my UD - * QP across, but I haven't got any reply, so, I have - * to check for timeout */ ompi_list_append(&peer->peer_frags, (ompi_list_item_t*)frag); break; @@ -419,21 +416,6 @@ int mca_ptl_ib_peer_send(mca_ptl_base_peer_t* peer, break; case MCA_PTL_IB_CONNECTED: - /* Fill in this later for the send to work - * - if (NULL != ptl_peer->peer_send_frag) { - ompi_list_append(&ptl_peer->peer_frags, (ompi_list_item_t*)frag); - } else { - if(mca_ptl_ib_send_frag_handler(frag, ptl_peer->peer_sd)) { - OMPI_THREAD_UNLOCK(&ptl_peer->peer_send_lock); - mca_ptl_ib_send_frag_progress(frag); - return rc; - } else { - ptl_peer->peer_send_frag = frag; - ompi_event_add(&ptl_peer->peer_send_event, 0); - } - } - */ break; default: rc = OMPI_ERR_UNREACH; diff --git a/src/mca/ptl/ib/src/ptl_ib_proc.c b/src/mca/ptl/ib/src/ptl_ib_proc.c index 0fb42b3caf..837af7e8cf 100644 --- a/src/mca/ptl/ib/src/ptl_ib_proc.c +++ b/src/mca/ptl/ib/src/ptl_ib_proc.c @@ -145,21 +145,5 @@ int mca_ptl_ib_proc_insert(mca_ptl_ib_proc_t* module_proc, module_peer->peer_proc = module_proc; module_proc->proc_peers[module_proc->proc_peer_count++] = module_peer; -#if 0 /* TODO: don't quite understand what this means for IB ptl. - will come back to it later */ - /* - * Look through the proc instance for an address that is on the - * directly attached network. If we don't find one, pick the first - * unused address. - */ - - for(i = 0; i < module_proc->proc_addr_count; i++) { - - mca_ptl_ib_ud_addr_t* peer_addr = module_proc->proc_addrs + i; - - module_peer->peer_addr = peer_addr; - } -#endif - return OMPI_SUCCESS; } diff --git a/src/mca/ptl/ib/src/ptl_ib_ud.h b/src/mca/ptl/ib/src/ptl_ib_ud.h deleted file mode 100644 index d5dc00fb14..0000000000 --- a/src/mca/ptl/ib/src/ptl_ib_ud.h +++ /dev/null @@ -1,29 +0,0 @@ -#include "ptl_ib_priv.h" - - -struct mca_ptl_ib_ud_buf_data_t { - VAPI_qp_num_t qp_num; /* Remote QP num */ -}; - -typedef struct mca_ptl_ib_ud_buf_data_t mca_ptl_ib_ud_buf_data_t; - -struct mca_ptl_ib_ud_buf_t { - uint32_t in_use; /* Set to 1 when using; after comp. set to 0 */ - vapi_descriptor_t desc; - vapi_memhandle_t memhandle; - void* buf_data; -}; - -typedef struct mca_ptl_ib_ud_buf_t mca_ptl_ib_ud_buf_t; - -struct mca_ptl_ib_ud_buf_ctrl_t { - uint32_t index; /* The buffer to use, (circular fashion) */ - mca_ptl_ib_ud_buf_t* bufs; /* Array of structures of ud buffers */ -}; - -typedef struct mca_ptl_ib_ud_buf_ctrl_t mca_ptl_ib_ud_buf_ctrl_t; - -int mca_ptl_ib_post_ud_recv(VAPI_hca_hndl_t, VAPI_qp_hndl_t, - mca_ptl_ib_ud_buf_t*, int); -int mca_ptl_ib_prep_ud_bufs(VAPI_hca_hndl_t, VAPI_pd_hndl_t, - mca_ptl_ib_ud_buf_t*, IB_wr_t, int);