From f63dd902cb830b1009ba8bc6f906583d479de6e7 Mon Sep 17 00:00:00 2001 From: Sven Stork Date: Tue, 26 Jun 2007 09:34:44 +0000 Subject: [PATCH] - bring the order changes of r14768 also to the mvapi btl This commit was SVN r15198. The following SVN revision numbers were found above: r14768 --> open-mpi/ompi@3401bd2b07b5d205d27d3607657e50445e05402d --- ompi/mca/btl/mvapi/btl_mvapi.c | 9 +++++++-- ompi/mca/btl/mvapi/btl_mvapi.h | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ompi/mca/btl/mvapi/btl_mvapi.c b/ompi/mca/btl/mvapi/btl_mvapi.c index d7a4f4ad24..0d62400dbf 100644 --- a/ompi/mca/btl/mvapi/btl_mvapi.c +++ b/ompi/mca/btl/mvapi/btl_mvapi.c @@ -197,6 +197,7 @@ int mca_btl_mvapi_register( */ mca_btl_base_descriptor_t* mca_btl_mvapi_alloc( struct mca_btl_base_module_t* btl, + uint8_t order, size_t size) { mca_btl_mvapi_frag_t* frag; @@ -218,6 +219,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_alloc( frag->segment.seg_len = size <= mvapi_btl->super.btl_eager_limit ? size : mvapi_btl->super.btl_eager_limit; frag->base.des_flags = 0; + frag->base.order = MCA_BTL_NO_ORDER; return (mca_btl_base_descriptor_t*)frag; } @@ -271,6 +273,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src( struct mca_btl_base_endpoint_t* endpoint, mca_mpool_base_registration_t* registration, struct ompi_convertor_t* convertor, + uint8_t order, size_t reserve, size_t* size ) @@ -317,7 +320,8 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src( frag->base.des_dst = NULL; frag->base.des_dst_cnt = 0; frag->base.des_flags = 0; - + frag->base.order = MCA_BTL_NO_ORDER; + frag->sg_entry.len = max_data; frag->sg_entry.lkey = mvapi_reg->l_key; frag->sg_entry.addr = (VAPI_virt_addr_t) (MT_virt_addr_t)iov.iov_base; @@ -367,7 +371,8 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src( frag->base.des_dst = NULL; frag->base.des_dst_cnt = 0; frag->base.des_flags = 0; - + frag->base.order = MCA_BTL_NO_ORDER; + return &frag->base; } diff --git a/ompi/mca/btl/mvapi/btl_mvapi.h b/ompi/mca/btl/mvapi/btl_mvapi.h index 1efe3fd027..c97d01f908 100644 --- a/ompi/mca/btl/mvapi/btl_mvapi.h +++ b/ompi/mca/btl/mvapi/btl_mvapi.h @@ -445,7 +445,8 @@ extern int mca_btl_mvapi_get( * @param size (IN) Requested descriptor size. */ extern mca_btl_base_descriptor_t* mca_btl_mvapi_alloc( - struct mca_btl_base_module_t* btl, + struct mca_btl_base_module_t* btl, + uint8_t order, size_t size); @@ -472,6 +473,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src( struct mca_btl_base_endpoint_t* peer, mca_mpool_base_registration_t* registration, struct ompi_convertor_t* convertor, + uint8_t order, size_t reserve, size_t* size );