update use of internal tag values to accommodate the active message change found in r17140
This commit was SVN r17148. The following SVN revision numbers were found above: r17140 --> open-mpi/ompi@6310ce955c
Этот коммит содержится в:
родитель
cc3805d861
Коммит
908b514ac5
@ -12,7 +12,7 @@
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2006 Sandia National Laboratories. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright (c) 2007-2008 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
|
||||
*
|
||||
* $COPYRIGHT$
|
||||
@ -909,7 +909,7 @@ int mca_btl_udapl_component_progress()
|
||||
BTL_UDAPL_EAGER_CONNECTION);
|
||||
}
|
||||
|
||||
if (MCA_BTL_TAG_BTL == cntrl_msg) {
|
||||
if (MCA_BTL_TAG_UDAPL == cntrl_msg) {
|
||||
mca_btl_udapl_frag_progress_pending(btl,
|
||||
frag->endpoint,
|
||||
BTL_UDAPL_EAGER_CONNECTION);
|
||||
@ -931,7 +931,7 @@ int mca_btl_udapl_component_progress()
|
||||
BTL_UDAPL_MAX_CONNECTION);
|
||||
}
|
||||
|
||||
if (MCA_BTL_TAG_BTL == cntrl_msg) {
|
||||
if (MCA_BTL_TAG_UDAPL == cntrl_msg) {
|
||||
mca_btl_udapl_frag_progress_pending(btl,
|
||||
frag->endpoint,
|
||||
BTL_UDAPL_MAX_CONNECTION);
|
||||
@ -1107,8 +1107,8 @@ int mca_btl_udapl_component_progress()
|
||||
local_rdma_frag->segment.seg_addr.pval = (unsigned char *)
|
||||
((char *)local_rdma_frag->ftr -
|
||||
local_rdma_frag->segment.seg_len);
|
||||
|
||||
/* retrieve callback and callback */
|
||||
|
||||
/* trigger callback */
|
||||
reg = mca_btl_base_active_message_trigger + local_rdma_frag->ftr->tag;
|
||||
reg->cbfunc(&btl->super,
|
||||
local_rdma_frag->ftr->tag, &local_rdma_frag->base, reg->cbdata);
|
||||
|
@ -12,7 +12,7 @@
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2006 Sandia National Laboratories. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright (c) 2007-2008 Sun Microsystems, Inc. All rights reserved.
|
||||
*
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
@ -1066,7 +1066,7 @@ static int mca_btl_udapl_endpoint_send_eager_rdma(
|
||||
|
||||
/* send fragment */
|
||||
rc = mca_btl_udapl_send((mca_btl_base_module_t *)udapl_btl, endpoint,
|
||||
des, MCA_BTL_TAG_BTL);
|
||||
des, MCA_BTL_TAG_UDAPL);
|
||||
|
||||
return rc;
|
||||
}
|
||||
@ -1238,7 +1238,7 @@ int mca_btl_udapl_endpoint_send_eager_rdma_credits(
|
||||
frag->endpoint = endpoint;
|
||||
frag->ftr = (mca_btl_udapl_footer_t *)
|
||||
((char *)frag->segment.seg_addr.pval + frag->segment.seg_len);
|
||||
frag->ftr->tag = MCA_BTL_TAG_BTL;
|
||||
frag->ftr->tag = MCA_BTL_TAG_UDAPL;
|
||||
frag->type = MCA_BTL_UDAPL_SEND;
|
||||
cookie.as_ptr = frag;
|
||||
|
||||
@ -1307,7 +1307,7 @@ int mca_btl_udapl_endpoint_send_sr_credits(
|
||||
frag->endpoint = endpoint;
|
||||
frag->ftr = (mca_btl_udapl_footer_t *)
|
||||
((char *)frag->segment.seg_addr.pval + frag->segment.seg_len);
|
||||
frag->ftr->tag = MCA_BTL_TAG_BTL;
|
||||
frag->ftr->tag = MCA_BTL_TAG_UDAPL;
|
||||
frag->type = MCA_BTL_UDAPL_SEND;
|
||||
cookie.as_ptr = frag;
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user