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

Remove debug output from a hot path.

Просмотр исходного кода 
This commit was SVN r15478.
Этот коммит содержится в:
Gleb Natapov 2007-07-18 12:48:34 +00:00
родитель 2ab401dc3c
Коммит 30b2183314
4 изменённых файлов: 1 добавлений и 43 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
ompi/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -493,9 +493,6 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
if(ompi_convertor_need_buffers(convertor) == false && 0 == reserve) {
/* GMS bloody HACK! */
if(registration != NULL || max_data > btl->btl_max_send_size) {
opal_output(mca_btl_base_output, "prepare_src called on endpoint %p\n",
(void*) endpoint);
MCA_BTL_IB_FRAG_ALLOC_SEND_USER(btl, frag, rc);
if(NULL == frag) {
return NULL;
@ -604,8 +601,6 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
int rc;
openib_btl = (mca_btl_openib_module_t*)btl;
opal_output(mca_btl_base_output, "prepare_dst called on endpoint %p\n",
(void*) endpoint);
MCA_BTL_IB_FRAG_ALLOC_RECV_USER(btl, frag, rc);
if(NULL == frag) {
@ -869,8 +864,6 @@ int mca_btl_openib_put( mca_btl_base_module_t* btl,
/* check for a send wqe */
if (OPAL_THREAD_ADD32(&endpoint->qps[qp].sd_wqe,-1) < 0) {
opal_output(mca_btl_base_output, "can't get sd_wqe for put on qp %d endpoint %p\n",
qp, (void*) endpoint);
OPAL_THREAD_ADD32(&endpoint->qps[qp].sd_wqe,1);
OPAL_THREAD_LOCK(&endpoint->endpoint_lock);
opal_list_append(&endpoint->pending_put_frags, (opal_list_item_t *)frag);
@ -881,9 +874,6 @@ int mca_btl_openib_put( mca_btl_base_module_t* btl,
} else {
int ib_rc;
opal_output(mca_btl_base_output, "schedule put on qp %d endpoint %p\n",
qp, (void*) endpoint);
frag->wr_desc.sr_desc.send_flags = IBV_SEND_SIGNALED;
frag->wr_desc.sr_desc.wr.rdma.remote_addr = frag->base.des_dst->seg_addr.lval;
frag->wr_desc.sr_desc.wr.rdma.rkey = frag->base.des_dst->seg_key.key32[0];
@ -892,11 +882,8 @@ int mca_btl_openib_put( mca_btl_base_module_t* btl,
frag->base.order = qp;
ib_rc = ibv_post_send(endpoint->qps[qp].lcl_qp, &frag->wr_desc.sr_desc, &bad_wr);
if(ib_rc){
opal_output(0, "got error: %d : %s \n", ib_rc, strerror(ib_rc));
abort();
if(ib_rc)
rc = OMPI_ERROR;
}
/* mca_btl_openib_post_srr_all(openib_btl, 1); */
/* mca_btl_openib_endpoint_post_rr_all(endpoint, 1); */

5
ompi/mca/btl/openib/btl_openib_component.c
Просмотреть файл

@ -224,7 +224,6 @@ static void btl_openib_control(struct mca_btl_base_module_t* btl,
mca_btl_openib_rdma_credits_header_t *credits_hdr;
int qp = frag->qp_idx;
opal_output(mca_btl_base_output, "got a control message\n");
if(BTL_OPENIB_EAGER_RDMA_QP(qp)) {
/* if not sent via rdma */
if(!MCA_BTL_OPENIB_RDMA_FRAG(frag) &&
@ -241,7 +240,6 @@ static void btl_openib_control(struct mca_btl_base_module_t* btl,
switch (ctl_hdr->type) {
case MCA_BTL_OPENIB_CONTROL_CREDITS:
opal_output(mca_btl_base_output, "got me some credits \n");
credits_hdr = (mca_btl_openib_rdma_credits_header_t*)ctl_hdr;
if(endpoint->nbo) {
BTL_OPENIB_RDMA_CREDITS_HEADER_NTOH((*credits_hdr));
@ -1162,8 +1160,6 @@ static int btl_openib_handle_incoming(mca_btl_openib_module_t *openib_btl,
BTL_OPENIB_CREDITS(frag->hdr->credits));
else
if(MCA_BTL_OPENIB_PP_QP == endpoint->qps[qp].qp_type && frag->hdr->credits > 0) {
opal_output(mca_btl_base_output, "got %d sd_credits on qp:%d endpoint %p\n",
frag->hdr->credits, qp, (void*) endpoint);
OPAL_THREAD_ADD32(&endpoint->qps[qp].u.pp_qp.sd_credits,
frag->hdr->credits);
assert(endpoint->qps[qp].u.pp_qp.sd_credits <=
@ -1576,7 +1572,6 @@ static int btl_openib_module_progress(mca_btl_openib_module_t* openib_btl)
return 0;
}
count++;
opal_output(mca_btl_base_output, "completed a recv\n");
break;
default:

10
ompi/mca/btl/openib/btl_openib_endpoint.c
Просмотреть файл

@ -137,7 +137,6 @@ static int btl_openib_acquire_send_resources(
mca_btl_openib_endpoint_t *endpoint,
mca_btl_openib_frag_t *frag, int *qp, int *do_rdma)
{
opal_output(mca_btl_base_output, "trying to acquire send resources qp: %d\n", *qp);
if(*do_rdma) {
if(OPAL_THREAD_ADD32(&endpoint->eager_rdma_remote.tokens, -1) < 0) {
OPAL_THREAD_ADD32(&endpoint->eager_rdma_remote.tokens, 1);
@ -155,7 +154,6 @@ static int btl_openib_acquire_send_resources(
opal_list_append(&endpoint->qps[*qp].pending_frags,
(opal_list_item_t *)frag);
OPAL_THREAD_UNLOCK(&endpoint->endpoint_lock);
opal_output(mca_btl_base_output, "trying to acquire send resources no wqe qp: %d\n", *qp);
return OMPI_ERR_OUT_OF_RESOURCE;
}
@ -170,10 +168,8 @@ static int btl_openib_acquire_send_resources(
opal_list_append(&endpoint->qps[*qp].pending_frags,
(opal_list_item_t *)frag);
OPAL_THREAD_UNLOCK(&endpoint->endpoint_lock);
opal_output(mca_btl_base_output,"can't acquire resources on qp %d endpoint %p\n", *qp, (void*) endpoint);
return OMPI_ERR_OUT_OF_RESOURCE;
}
opal_output(mca_btl_base_output,"got me some resources on qp %d endpoint %p\n", *qp, (void*) endpoint);
} else {
if(OPAL_THREAD_ADD32(&openib_btl->qps[*qp].u.srq_qp.sd_credits, -1) < 0) {
OPAL_THREAD_ADD32(&openib_btl->qps[*qp].u.srq_qp.sd_credits, 1);
@ -1265,20 +1261,15 @@ static void mca_btl_openib_endpoint_credits(
qp = frag->qp_idx;
/* we don't acquire a wqe or token for credit message - so decrement */
opal_output(mca_btl_base_output, "CREDIT FRAG callback! rd_pending_credit_checks: %d qp: %d \n",
endpoint->qps[qp].rd_pending_credit_chks, qp);
OPAL_THREAD_ADD32(&endpoint->qps[qp].sd_wqe, -1);
/* check to see if there are additional credits to return */
if((checks = OPAL_THREAD_ADD32(&endpoint->qps[qp].rd_pending_credit_chks,-1)) > 0) {
OPAL_THREAD_ADD32(&endpoint->qps[qp].rd_pending_credit_chks, -checks);
opal_output(mca_btl_base_output, "CREDIT FRAG zero out credit checks qp: %d\n", qp);
if(btl_openib_check_send_credits(endpoint, qp)) {
mca_btl_openib_endpoint_send_credits(endpoint, qp);
}
}
opal_output(mca_btl_base_output, "CREDIT FRAG callback, leaving rd_pending_credit_checks: %d qp: %d\n",
endpoint->qps[qp].rd_pending_credit_chks, qp);
}
/**
@ -1293,7 +1284,6 @@ void mca_btl_openib_endpoint_send_credits(mca_btl_openib_endpoint_t* endpoint,
mca_btl_openib_rdma_credits_header_t *credits_hdr;
int do_rdma = 0, ib_rc;
opal_output(mca_btl_base_output, "time to send credits qp: %d \n", qp);
frag = endpoint->qps[qp].credit_frag;
if(NULL == frag) {

14
ompi/mca/btl/openib/btl_openib_endpoint.h
Просмотреть файл

@ -250,12 +250,7 @@ static inline int mca_btl_openib_endpoint_post_rr(mca_btl_base_endpoint_t *endpo
OPAL_THREAD_ADD32(&endpoint->qps[qp].u.pp_qp.rd_credits, num_post);
assert(endpoint->qps[qp].u.pp_qp.rd_credits < rd_num);
assert(endpoint->qps[qp].u.pp_qp.rd_credits >= 0);
opal_output(mca_btl_base_output, "posting %d on qp %d \n", num_post, qp);
}
opal_output(mca_btl_base_output, "not posting on qp %d: rd_posted %d, rd_low %d, additional %d, rd_num %d rd_credits %d\n"
, qp, endpoint->qps[qp].u.pp_qp.rd_posted, mca_btl_openib_component.qp_infos[qp].rd_low , additional, rd_num,
endpoint->qps[qp].u.pp_qp.rd_credits);
OPAL_THREAD_UNLOCK(&openib_btl->ib_lock);
return OMPI_SUCCESS;
}
@ -275,14 +270,8 @@ static inline int mca_btl_openib_endpoint_post_rr_all(mca_btl_base_endpoint_t *e
static inline int btl_openib_check_send_credits(
mca_btl_openib_endpoint_t *endpoint, const int qp)
{
opal_output(mca_btl_base_output, "check_send_credits says rd_credits is %d, rd_win is %d qp: %d endpoint %p\n",
endpoint->qps[qp].u.pp_qp.rd_credits,
mca_btl_openib_component.qp_infos[qp].u.pp_qp.rd_win, qp, (void*) endpoint);
/* GMS, this is busted for high prio check eager RDMA credits */
if(BTL_OPENIB_EAGER_RDMA_QP(qp)) {
if(endpoint->eager_rdma_local.credits >= endpoint->eager_rdma_local.rd_win) {
opal_output(mca_btl_base_output, "check_send_credits says sending RDMA credits qp: %d\n", qp);
return OPAL_THREAD_ADD32(&endpoint->qps[qp].rd_pending_credit_chks, 1) == 1;
}
}
@ -292,9 +281,6 @@ static inline int btl_openib_check_send_credits(
if(endpoint->qps[qp].u.pp_qp.rd_credits >=
mca_btl_openib_component.qp_infos[qp].u.pp_qp.rd_win) {
opal_output(mca_btl_base_output, "we need to try and send credits rd_pending_credit_chks says %d qp: %d\n",
endpoint->qps[qp].rd_pending_credit_chks, qp);
return OPAL_THREAD_ADD32(&endpoint->qps[qp].rd_pending_credit_chks, 1) == 1;
}