ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

-- Various cleanup for experiments

Просмотр исходного кода 
This commit was SVN r2822.
Этот коммит содержится в:
Weikuan Yu 2004-09-23 14:17:25 +00:00
родитель 15a0cc1288
Коммит bbfb946b0e
7 изменённых файлов: 1 добавлений и 120 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
src/mca/ptl/elan/src/ptl_elan.c
Просмотреть файл

@ -147,8 +147,6 @@ mca_ptl_elan_finalize (struct mca_ptl_base_module_t *ptl)
int rail_index;
struct mca_ptl_elan_module_t *elan_ptl;
START_FUNC(PTL_ELAN_DEBUG_FIN);
/* TODO: move from mca_ptl_elan_component_close()
all the ptl_elan_finalize related code here */
#if 0
@ -164,7 +162,6 @@ mca_ptl_elan_finalize (struct mca_ptl_base_module_t *ptl)
mca_ptl_elan_component.num_modules--;
#endif
END_FUNC(PTL_ELAN_DEBUG_FIN);
return OMPI_SUCCESS;
}
@ -174,8 +171,6 @@ mca_ptl_elan_req_init (struct mca_ptl_base_module_t *ptl,
{
mca_ptl_elan_send_frag_t *desc;
START_FUNC(PTL_ELAN_DEBUG_SEND);
desc = mca_ptl_elan_alloc_desc(ptl,
(struct mca_pml_base_request_t *) request,
MCA_PTL_ELAN_DESC_QDMA);
@ -190,7 +185,6 @@ mca_ptl_elan_req_init (struct mca_ptl_base_module_t *ptl,
}
desc->desc->desc_status = MCA_PTL_ELAN_DESC_CACHED;
END_FUNC(PTL_ELAN_DEBUG_SEND);
return OMPI_SUCCESS;
}
@ -201,14 +195,12 @@ mca_ptl_elan_req_fini (struct mca_ptl_base_module_t *ptl,
/* XXX: Lock to be added */
ompi_ptl_elan_queue_ctrl_t *queue;
mca_ptl_elan_send_frag_t *desc;
START_FUNC(PTL_ELAN_DEBUG_SEND);
/* return the fragment and update the status */
queue = ((struct mca_ptl_elan_module_t * )ptl)->queue;
desc = ((mca_ptl_elan_send_request_t *) request)->req_frag;
OMPI_FREE_LIST_RETURN (&queue->tx_desc_free, (ompi_list_item_t *) desc);
desc->desc->desc_status = MCA_PTL_ELAN_DESC_LOCAL;
END_FUNC(PTL_ELAN_DEBUG_SEND);
return;
}
@ -252,8 +244,6 @@ mca_ptl_elan_isend (struct mca_ptl_base_module_t *ptl,
* correspondingly multiple LOCKS to go through
*/
START_FUNC(PTL_ELAN_DEBUG_SEND);
if (offset == 0 && sendreq->req_cached) {
/* The first fragment uses a cached desc */
desc = ((mca_ptl_elan_send_request_t*)sendreq)->req_frag;
@ -280,7 +270,6 @@ mca_ptl_elan_isend (struct mca_ptl_base_module_t *ptl,
/* Update offset */
sendreq->req_offset += size;
END_FUNC(PTL_ELAN_DEBUG_SEND);
return rc;
}
@ -308,8 +297,6 @@ mca_ptl_elan_put (struct mca_ptl_base_module_t *ptl,
* elan information, so there needs to be a change
*/
START_FUNC(PTL_ELAN_DEBUG_PUT);
desc = mca_ptl_elan_alloc_desc(ptl,
(struct mca_pml_base_request_t *) sendreq,
MCA_PTL_ELAN_DESC_PUT);
@ -328,7 +315,6 @@ mca_ptl_elan_put (struct mca_ptl_base_module_t *ptl,
sendreq->req_offset += size;
/* Update all the sends until the put is done */
END_FUNC(PTL_ELAN_DEBUG_PUT);
return rc;
}
@ -364,7 +350,6 @@ mca_ptl_elan_get (struct mca_ptl_base_module_t *ptl,
* elan information, so there needs to be a change
*/
START_FUNC(PTL_ELAN_DEBUG_GET);
desc = mca_ptl_elan_alloc_desc(ptl,
(struct mca_pml_base_request_t *) req,
MCA_PTL_ELAN_DESC_GET);
@ -382,7 +367,6 @@ mca_ptl_elan_get (struct mca_ptl_base_module_t *ptl,
/*req->req_offset += size;*/
/* Update all the sends until the put is done */
END_FUNC(PTL_ELAN_DEBUG_GET);
#endif
return rc;
}
@ -402,7 +386,6 @@ mca_ptl_elan_matched (mca_ptl_base_module_t * ptl,
int set = 0;
START_FUNC(PTL_ELAN_DEBUG_RECV);
header = &frag->frag_base.frag_header;
request = frag->frag_request;
recv_frag = (mca_ptl_elan_recv_frag_t * ) frag;
@ -478,5 +461,4 @@ mca_ptl_elan_matched (mca_ptl_base_module_t * ptl,
* Then Done with this fragment, i.e., data */
mca_ptl_elan_recv_frag_done (header, frag, request);
}
END_FUNC(PTL_ELAN_DEBUG_RECV);
}

14
src/mca/ptl/elan/src/ptl_elan_comm_init.c
Просмотреть файл

@ -39,8 +39,6 @@ ompi_init_elan_queue_events (mca_ptl_elan_module_t * ptl,
ompi_ptl_elan_qdma_desc_t *desc;
E4_Event32 *elan_ptr;
START_FUNC(PTL_ELAN_DEBUG_INIT);
rail = (RAIL *) ptl->ptl_elan_rail;
ctx = (ELAN4_CTX *) ptl->ptl_elan_ctx;
@ -156,7 +154,6 @@ ompi_init_elan_queue_events (mca_ptl_elan_module_t * ptl,
flist->fl_num_allocated += flist->fl_num_per_alloc;
END_FUNC(PTL_ELAN_DEBUG_INIT);
return OMPI_SUCCESS;
}
@ -171,8 +168,6 @@ mca_ptl_elan_putget_desc_construct (
{
ELAN4_CTX *ctx;
START_FUNC(PTL_ELAN_DEBUG_DESC);
ctx = (ELAN4_CTX *)ptl->ptl_elan_ctx;
memset(desc, 0, sizeof(desc));
desc->ptl = ptl;
@ -242,7 +237,6 @@ mca_ptl_elan_putget_desc_construct (
/* Make PCI write visable */
mb();
END_FUNC(PTL_ELAN_DEBUG_DESC);
}
#define OMPI_ELAN_PUTGET_GROW(ptl, flist, frag, dp, eptr, msize, esize, local)\
@ -286,8 +280,6 @@ ompi_ptl_elan_init_putget_ctrl (mca_ptl_elan_module_t * ptl,
ompi_free_list_t *put_list, *get_list;
ompi_ptl_elan_putget_desc_t *put_desc, *get_desc;
START_FUNC(PTL_ELAN_DEBUG_INIT);
main_align = OMPI_PTL_ELAN_GET_MAX (sizeof (void *), ELAN_ALIGN);
elan_align = OMPI_PTL_ELAN_GET_MAX (sizeof (int *), ELAN_BLOCK_ALIGN);
main_size = OMPI_PTL_ELAN_ALIGNUP(sizeof(ompi_ptl_elan_putget_desc_t),
@ -344,7 +336,6 @@ ompi_ptl_elan_init_putget_ctrl (mca_ptl_elan_module_t * ptl,
OMPI_PTL_ELAN_CHECK_UNEX (get_desc, NULL, OMPI_ERROR, 0);
OMPI_ELAN_PUTGET_GROW(ptl, get_list, frag, get_desc, elan_ptr,
main_size, elan_size, 0);
END_FUNC (PTL_ELAN_DEBUG_INIT);
return OMPI_SUCCESS;
}
@ -368,7 +359,6 @@ ompi_init_elan_qdma (mca_ptl_elan_component_t * emp,
ELAN4_CTX *ctx;
struct mca_ptl_elan_module_t *ptl;
START_FUNC(PTL_ELAN_DEBUG_INIT);
nslots = OMPI_PTL_ELAN_MAX_QSLOTS;
#if OMPI_PTL_ELAN_COMP_QUEUE
@ -553,7 +543,6 @@ ompi_init_elan_qdma (mca_ptl_elan_component_t * emp,
OBJ_CONSTRUCT (&queue->rx_lock, ompi_mutex_t);
}
END_FUNC(PTL_ELAN_DEBUG_INIT);
return (OMPI_SUCCESS);
}
@ -567,8 +556,6 @@ ompi_init_elan_putget (mca_ptl_elan_component_t * emp,
ELAN4_CTX *ctx;
struct mca_ptl_elan_module_t *ptl;
START_FUNC(PTL_ELAN_DEBUG_INIT);
/* Init the Transmit Queue structure */
for (i = 0; i < num_rails; i++) {
@ -626,7 +613,6 @@ ompi_init_elan_putget (mca_ptl_elan_component_t * emp,
0, OMPI_PTL_ELAN_NUM_PUTGET, OMPI_PTL_ELAN_MAX_PUTGET);
}
END_FUNC(PTL_ELAN_DEBUG_INIT);
return (OMPI_SUCCESS);
}

10
src/mca/ptl/elan/src/ptl_elan_component.c
Просмотреть файл

@ -134,8 +134,6 @@ mca_ptl_elan_component_open (void)
int
mca_ptl_elan_component_close (void)
{
START_FUNC (PTL_ELAN_DEBUG_FIN);
if (mca_ptl_elan_component_initialized) {
#if OMPI_PTL_ELAN_THREADING
@ -176,8 +174,6 @@ mca_ptl_elan_component_close (void)
/* Destruct other structures */
OBJ_DESTRUCT (&elan_mp->elan_lock);
END_FUNC (PTL_ELAN_DEBUG_FIN);
return OMPI_SUCCESS;
}
@ -194,8 +190,6 @@ mca_ptl_elan_component_init (int *num_ptls,
{
mca_ptl_base_module_t **ptls;
START_FUNC(PTL_ELAN_DEBUG_INIT);
*num_ptls = 0;
*allow_multi_user_threads = true;
*have_hidden_threads = OMPI_HAVE_THREADS;
@ -263,7 +257,6 @@ mca_ptl_elan_component_init (int *num_ptls,
#endif
mca_ptl_elan_component_initialized = true;
END_FUNC(PTL_ELAN_DEBUG_INIT);
return ptls;
}
@ -287,8 +280,6 @@ mca_ptl_elan_component_progress (mca_ptl_tstamp_t tstamp)
{
int i, no_ptls;
START_FUNC (PTL_ELAN_DEBUG_NONE);
no_ptls = elan_mp->num_modules;
/* Iterate over all the PTL input Queues */
@ -297,7 +288,6 @@ mca_ptl_elan_component_progress (mca_ptl_tstamp_t tstamp)
mca_ptl_elan_drain_recv(elan_mp->modules[i]);
}
END_FUNC (PTL_ELAN_DEBUG_NONE);
return OMPI_SUCCESS;
}

7
src/mca/ptl/elan/src/ptl_elan_frag.c
Просмотреть файл

@ -95,8 +95,6 @@ mca_ptl_elan_alloc_desc (struct mca_ptl_base_module_t *ptl_ptr,
ompi_list_item_t *item = NULL;
mca_ptl_elan_send_frag_t *desc;
START_FUNC(PTL_ELAN_DEBUG_SEND);
/* TODO: Dynamically bind a base request to PUT/GET/QDMA/STEN */
if (MCA_PTL_ELAN_DESC_QDMA == desc_type) {
flist = &(((mca_ptl_elan_module_t *) ptl_ptr)->queue)->tx_desc_free;
@ -139,7 +137,6 @@ mca_ptl_elan_alloc_desc (struct mca_ptl_base_module_t *ptl_ptr,
desc->desc->desc_type = desc_type;
LOG_PRINT(PTL_ELAN_DEBUG_SEND, "Got frag %p desc %d type %d\n",
desc, desc->desc, desc_type);
END_FUNC(PTL_ELAN_DEBUG_SEND);
return desc;
}
@ -158,8 +155,6 @@ mca_ptl_elan_send_desc_done (
mca_ptl_elan_module_t *ptl;
mca_ptl_base_header_t *header;
START_FUNC(PTL_ELAN_DEBUG_SEND);
ptl = ((ompi_ptl_elan_qdma_desc_t *)frag->desc)->ptl;
header = &frag->frag_base.frag_header;
@ -176,7 +171,6 @@ mca_ptl_elan_send_desc_done (
->chain_event->ev_Params[1], 8);
OMPI_FREE_LIST_RETURN (&ptl->putget->get_desc_free,
(ompi_list_item_t *) frag);
END_FUNC(PTL_ELAN_DEBUG_SEND);
return;
}
#endif
@ -253,7 +247,6 @@ mca_ptl_elan_send_desc_done (
(ompi_list_item_t *) frag);
}
#endif
END_FUNC(PTL_ELAN_DEBUG_SEND);
}
void

14
src/mca/ptl/elan/src/ptl_elan_init.c
Просмотреть файл

@ -19,8 +19,6 @@ ompi_mca_ptl_elan_setup (mca_ptl_elan_state_t * ems)
mca_ptl_elan_component_t *emp;
int rail_count;
START_FUNC(PTL_ELAN_DEBUG_INIT);
rail_count = ems->elan_nrails;
emp = ems->elan_component;
emp->num_modules = 0;
@ -87,7 +85,6 @@ ompi_mca_ptl_elan_setup (mca_ptl_elan_state_t * ems)
return OMPI_ERROR;
}
END_FUNC(PTL_ELAN_DEBUG_INIT);
return (OMPI_SUCCESS);
}
@ -274,7 +271,6 @@ ompi_elan_device_init (mca_ptl_elan_component_t * emp,
mca_ptl_elan_state_t *ems;
START_FUNC(PTL_ELAN_DEBUG_INIT);
ems = &mca_ptl_elan_global_state;
@ -471,7 +467,6 @@ ompi_elan_device_init (mca_ptl_elan_component_t * emp,
/* Free the local variable */
free (rails);
END_FUNC(PTL_ELAN_DEBUG_INIT);
return OMPI_SUCCESS;
}
@ -541,8 +536,6 @@ mca_ptl_elan_state_init (mca_ptl_elan_component_t * emp)
elan_state = elan_init(0);
#endif
START_FUNC (PTL_ELAN_DEBUG_INIT);
ems->elan_ctx = ems->elan_rail[0]->rail_ctx;
ems->elan_estate = (void *) ems->all_estates[0];
@ -569,7 +562,6 @@ mca_ptl_elan_state_init (mca_ptl_elan_component_t * emp)
return OMPI_ERROR;
}
END_FUNC(PTL_ELAN_DEBUG_INIT);
return (OMPI_SUCCESS);
}
@ -580,7 +572,6 @@ mca_ptl_elan_state_finalize (mca_ptl_elan_component_t * emp)
int num_rails;
mca_ptl_elan_state_t *ems;
START_FUNC(PTL_ELAN_DEBUG_FIN);
ems = &mca_ptl_elan_global_state;
num_rails = ems->elan_nrails;
@ -624,7 +615,6 @@ mca_ptl_elan_state_finalize (mca_ptl_elan_component_t * emp)
free (ems->all_rails);
free (ems->elan_cap);
END_FUNC(PTL_ELAN_DEBUG_FIN);
return (OMPI_SUCCESS);
}
@ -638,7 +628,6 @@ mca_ptl_elan_thread_init (mca_ptl_elan_component_t * emp)
{
int i, num_rails;
START_FUNC(PTL_ELAN_DEBUG_INIT);
num_rails = emp->num_modules;
/*struct ompi_ptl_elan_thread_t **threads; */
@ -672,7 +661,6 @@ mca_ptl_elan_thread_init (mca_ptl_elan_component_t * emp)
emp->recv_threads[i] = t;
}
END_FUNC(PTL_ELAN_DEBUG_INIT);
return (OMPI_SUCCESS);
}
@ -683,7 +671,6 @@ mca_ptl_elan_thread_close (mca_ptl_elan_component_t * emp)
{
int i, num_rails;
START_FUNC(PTL_ELAN_DEBUG_FIN);
num_rails = emp->num_modules;
for (i = 0; i < num_rails; i ++) {
@ -748,7 +735,6 @@ mca_ptl_elan_thread_close (mca_ptl_elan_component_t * emp)
ompi_thread_join(&trecv->thread, &ptr);
}
END_FUNC(PTL_ELAN_DEBUG_FIN);
return (OMPI_SUCCESS);
}
#endif /* End of OMPI_PTL_ELAN_THREADING */

39
src/mca/ptl/elan/src/ptl_elan_priv.c
Просмотреть файл

@ -27,8 +27,6 @@ mca_ptl_elan_data_frag (struct mca_ptl_elan_module_t *ptl,
bool matched;
int rc = OMPI_SUCCESS;
START_FUNC(PTL_ELAN_DEBUG_RECV);
OMPI_FREE_LIST_GET (&mca_ptl_elan_component.elan_recv_frags_free,
item, rc);
@ -97,7 +95,6 @@ mca_ptl_elan_data_frag (struct mca_ptl_elan_module_t *ptl,
recv_frag->frag_recv.frag_is_buffered = true;
recv_frag->frag_recv.frag_base.frag_addr = recv_frag->unex_buff;
}
END_FUNC(PTL_ELAN_DEBUG_RECV);
}
static void
@ -106,7 +103,6 @@ mca_ptl_elan_last_frag (struct mca_ptl_elan_module_t *ptl,
{
mca_pml_base_recv_request_t *request;
START_FUNC(PTL_ELAN_DEBUG_RECV);
request = (mca_pml_base_recv_request_t*) hdr->hdr_frag.hdr_dst_ptr.pval;
/*pml_req->req_peer_match;*/
@ -121,7 +117,6 @@ mca_ptl_elan_last_frag (struct mca_ptl_elan_module_t *ptl,
hdr->hdr_frag.hdr_frag_length,
hdr->hdr_frag.hdr_frag_length);
END_FUNC(PTL_ELAN_DEBUG_RECV);
}
static void
@ -131,7 +126,6 @@ mca_ptl_elan_last_frag_ack (struct mca_ptl_elan_module_t *ptl,
mca_ptl_elan_send_frag_t* desc;
mca_pml_base_send_request_t* req;
START_FUNC(PTL_ELAN_DEBUG_ACK);
LOG_PRINT(PTL_ELAN_DEBUG_ACK, "desc %p \n",
header->hdr_ack.hdr_src_ptr.pval);
@ -171,7 +165,6 @@ mca_ptl_elan_last_frag_ack (struct mca_ptl_elan_module_t *ptl,
ptl->queue->tx_desc_free.super.ompi_list_length);
}
END_FUNC(PTL_ELAN_DEBUG_RECV);
}
static void
@ -188,8 +181,6 @@ mca_ptl_elan_ctrl_frag (struct mca_ptl_elan_module_t *ptl,
mca_ptl_elan_send_frag_t* desc;
mca_pml_base_send_request_t* req;
START_FUNC(PTL_ELAN_DEBUG_ACK);
desc = (mca_ptl_elan_send_frag_t*) header->hdr_ack.hdr_src_ptr.pval;
req = (mca_pml_base_send_request_t *) desc->desc->req;
@ -206,7 +197,6 @@ mca_ptl_elan_ctrl_frag (struct mca_ptl_elan_module_t *ptl,
/* XXX: This sort of synchronized fragment release will lead
* to race conditions, also see the note insize the follwoing routine */
mca_ptl_elan_send_desc_done (desc, req);
END_FUNC(PTL_ELAN_DEBUG_ACK);
}
static void
@ -227,7 +217,6 @@ mca_ptl_elan_init_qdma_desc (struct mca_ptl_elan_send_frag_t *frag,
mca_ptl_base_header_t *hdr;
struct ompi_ptl_elan_qdma_desc_t * desc;
ELAN4_CTX *ctx;
START_FUNC(PTL_ELAN_DEBUG_SEND);
desc = (ompi_ptl_elan_qdma_desc_t *)frag->desc;
destvp = ptl_peer->peer_vp;
@ -377,7 +366,6 @@ mca_ptl_elan_init_qdma_desc (struct mca_ptl_elan_send_frag_t *frag,
/* Make main memory coherent with IO domain (IA64) */
MEMBAR_VISIBLE ();
END_FUNC(PTL_ELAN_DEBUG_SEND);
}
static void
@ -398,8 +386,6 @@ mca_ptl_elan_init_put_desc (struct mca_ptl_elan_send_frag_t *frag,
struct ompi_ptl_elan_putget_desc_t * desc;
mca_ptl_base_header_t *hdr;
START_FUNC((PTL_ELAN_DEBUG_PUT | PTL_ELAN_DEBUG_GET));
hdr = &frag->frag_base.frag_header;
desc = (ompi_ptl_elan_putget_desc_t *)frag->desc;
destvp = ptl_peer->peer_vp;
@ -558,7 +544,6 @@ mca_ptl_elan_init_put_desc (struct mca_ptl_elan_send_frag_t *frag,
/* Make main memory coherent with IO domain (IA64) */
MEMBAR_VISIBLE ();
END_FUNC(PTL_ELAN_DEBUG_SEND);
}
#if OMPI_PTL_ELAN_ENABLE_GET
@ -580,8 +565,6 @@ mca_ptl_elan_init_get_desc (mca_ptl_elan_module_t *ptl,
mca_ptl_base_header_t *recv_header;
struct mca_ptl_elan_peer_t *ptl_peer;
START_FUNC(PTL_ELAN_DEBUG_GET);
ctx = ptl->ptl_elan_ctx;
recv_header= &recv_frag->frag_recv.frag_base.frag_header;
ptl_peer = (struct mca_ptl_elan_peer_t *)
@ -692,7 +675,6 @@ mca_ptl_elan_init_get_desc (mca_ptl_elan_module_t *ptl,
destvp, hdr->hdr_common.hdr_type,
hdr->hdr_common.hdr_flags,
hdr->hdr_common.hdr_size);
END_FUNC(PTL_ELAN_DEBUG_GET);
}
#endif /* End of OMPI_PTL_ELAN_ENABLE_GET */
@ -708,8 +690,6 @@ mca_ptl_elan_wait_queue(mca_ptl_elan_module_t * ptl,
ADDR_SDRAM ready;
EVENT_WORD *readyWord;
START_FUNC(PTL_ELAN_DEBUG_THREAD);
rail = (RAIL *)ptl->ptl_elan_rail;
ctx = ptl->ptl_elan_ctx;
ready = rxq->qr_qEvent;
@ -751,7 +731,6 @@ mca_ptl_elan_wait_queue(mca_ptl_elan_module_t * ptl,
rail->r_sleepDescs = es;
OMPI_UNLOCK(&mca_ptl_elan_component.elan_lock);
}
END_FUNC(PTL_ELAN_DEBUG_THREAD);
return 0xdeadbeef;
}
@ -767,7 +746,6 @@ mca_ptl_elan_start_get (mca_ptl_elan_send_frag_t * frag,
mca_ptl_elan_module_t *ptl;
struct ompi_ptl_elan_putget_desc_t *gdesc;
START_FUNC(PTL_ELAN_DEBUG_GET);
ptl = ptl_peer->peer_ptl;
gdesc = (ompi_ptl_elan_putget_desc_t *)frag->desc;
mca_ptl_elan_init_get_desc (ptl, frag, ptl_peer,
@ -794,7 +772,6 @@ mca_ptl_elan_start_get (mca_ptl_elan_send_frag_t * frag,
frag->frag_base.frag_size = *size;
frag->frag_progressed = 0;
END_FUNC(PTL_ELAN_DEBUG_GET);
return OMPI_SUCCESS;
}
#endif /* End of OMPI_PTL_ELAN_ENABLE_GET && HAVE_GET_INTERFACE */
@ -811,8 +788,6 @@ mca_ptl_elan_start_desc (mca_ptl_elan_send_frag_t * frag,
ptl = ptl_peer->peer_ptl;
START_FUNC(PTL_ELAN_DEBUG_SEND);
if (frag->desc->desc_type == MCA_PTL_ELAN_DESC_QDMA) {
struct ompi_ptl_elan_qdma_desc_t *qdma;
@ -850,7 +825,6 @@ mca_ptl_elan_start_desc (mca_ptl_elan_send_frag_t * frag,
frag->frag_progressed = 0;
frag->frag_ack_pending = 0; /* this is ack for internal elan */
END_FUNC(PTL_ELAN_DEBUG_SEND);
return OMPI_SUCCESS;
}
@ -869,8 +843,6 @@ mca_ptl_elan_get_with_ack ( mca_ptl_base_module_t * ptl,
int flags;
size_t remain_len, recv_len;
START_FUNC(PTL_ELAN_DEBUG_ACK);
flags = 0; /* XXX: No special flags for get */
elan_ptl = (mca_ptl_elan_module_t *) ptl;
request = recv_frag->frag_recv.frag_request;
@ -929,7 +901,6 @@ mca_ptl_elan_get_with_ack ( mca_ptl_base_module_t * ptl,
hdr->hdr_ack.hdr_dst_size,
remain_len);
END_FUNC(PTL_ELAN_DEBUG_ACK);
return OMPI_SUCCESS;
}
#endif /* End of OMPI_PTL_ELAN_ENABLE_GET */
@ -949,8 +920,6 @@ mca_ptl_elan_start_ack ( mca_ptl_base_module_t * ptl,
int recv_len;
int destvp;
START_FUNC(PTL_ELAN_DEBUG_ACK);
destvp = ((mca_ptl_elan_peer_t *)
recv_frag->frag_recv.frag_base.frag_peer)->peer_vp;
recv_len =
@ -1038,7 +1007,6 @@ mca_ptl_elan_start_ack ( mca_ptl_base_module_t * ptl,
desc->frag_progressed = 0;
desc->desc->desc_status = MCA_PTL_ELAN_DESC_LOCAL;
END_FUNC(PTL_ELAN_DEBUG_ACK);
return OMPI_SUCCESS;
}
@ -1050,7 +1018,6 @@ mca_ptl_elan_drain_recv (struct mca_ptl_elan_module_t *ptl)
ELAN_CTX *ctx;
int rc;
START_FUNC(PTL_ELAN_DEBUG_NONE);
queue = ptl->queue;
rxq = queue->rxq;
ctx = ptl->ptl_elan_ctx;
@ -1071,7 +1038,6 @@ ptl_elan_recv_comp:
if (header->hdr_common.hdr_type == MCA_PTL_HDR_TYPE_STOP) {
/* XXX: release the lock and quit the thread */
OMPI_UNLOCK (&queue->rx_lock);
END_FUNC(PTL_ELAN_DEBUG_THREAD);
return OMPI_SUCCESS;
}
#endif
@ -1131,7 +1097,6 @@ ptl_elan_recv_comp:
goto ptl_elan_recv_comp;
#endif
END_FUNC(PTL_ELAN_DEBUG_NONE);
return OMPI_SUCCESS;
}
@ -1146,7 +1111,6 @@ mca_ptl_elan_update_desc (struct mca_ptl_elan_module_t *ptl)
ompi_ptl_elan_recv_queue_t *rxq;
START_FUNC(PTL_ELAN_DEBUG_THREAD);
comp = ptl->comp;
ctx = ptl->ptl_elan_ctx;
rxq = comp->rxq;
@ -1171,7 +1135,6 @@ ptl_elan_send_comp:
if (header->hdr_common.hdr_type == MCA_PTL_HDR_TYPE_STOP) {
/* XXX: release the lock and quit the thread */
OMPI_UNLOCK (&comp->rx_lock);
END_FUNC(PTL_ELAN_DEBUG_THREAD);
return OMPI_SUCCESS;
}
#endif
@ -1225,7 +1188,7 @@ ptl_elan_send_comp:
#if OMPI_PTL_ELAN_THREADING
goto ptl_elan_send_comp;
#endif
END_FUNC(PTL_ELAN_DEBUG_THREAD);
#else
ctx = ptl->ptl_elan_ctx;
while (ompi_list_get_size (&ptl->send_frags) > 0) {

19
src/mca/ptl/elan/src/ptl_elan_priv.h
Просмотреть файл

@ -53,25 +53,6 @@
#define PTL_ELAN_DEBUG_CHAIN (0x800)
#define PTL_ELAN_DEBUG_FLAG (PTL_ELAN_DEBUG_NONE)
//(PTL_ELAN_DEBUG_GET|PTL_ELAN_DEBUG_PUT|PTL_ELAN_DEBUG_RECV)
#define START_FUNC(flag) \
do { \
if (PTL_ELAN_DEBUG_FLAG & flag) { \
char *rms_rank = getenv("RMS_RANK"); \
fprintf(stderr, "[proc%s:%s:%d] Entering...\n", \
rms_rank, __FUNCTION__, __LINE__); \
} \
} while (0)
#define END_FUNC(flag) \
do { \
if (PTL_ELAN_DEBUG_FLAG & flag) { \
char *rms_rank = getenv("RMS_RANK"); \
fprintf(stderr, "[proc%s:%s:%d] Completes \n", \
rms_rank, __FUNCTION__, __LINE__); \
} \
} while (0)
#define LOG_PRINT(flag, args...) \
do { \