Revert r17857. The context should be set in one case ... when we call prepare_{src|dst}
without calling a get or put. So, just keep it here until a better solution is found. This commit was SVN r17872. The following SVN revision numbers were found above: r17857 --> open-mpi/ompi@d460ccfbf9
Этот коммит содержится в:
родитель
f39ce707b5
Коммит
efa89bfa3f
@ -74,9 +74,8 @@ struct mca_bml_base_btl_t {
|
|||||||
mca_btl_base_module_put_fn_t btl_put;
|
mca_btl_base_module_put_fn_t btl_put;
|
||||||
mca_btl_base_module_get_fn_t btl_get;
|
mca_btl_base_module_get_fn_t btl_get;
|
||||||
mca_btl_base_component_progress_fn_t btl_progress;
|
mca_btl_base_component_progress_fn_t btl_progress;
|
||||||
|
|
||||||
mca_mpool_base_module_t* btl_mpool;
|
mca_mpool_base_module_t* btl_mpool;
|
||||||
|
|
||||||
};
|
};
|
||||||
typedef struct mca_bml_base_btl_t mca_bml_base_btl_t;
|
typedef struct mca_bml_base_btl_t mca_bml_base_btl_t;
|
||||||
|
|
||||||
@ -330,16 +329,17 @@ static inline void mca_bml_base_prepare_src(mca_bml_base_btl_t* bml_btl,
|
|||||||
size_t *size,
|
size_t *size,
|
||||||
uint32_t flags,
|
uint32_t flags,
|
||||||
mca_btl_base_descriptor_t** des) {
|
mca_btl_base_descriptor_t** des) {
|
||||||
*des = bml_btl->btl_prepare_src(
|
*des = bml_btl->btl_prepare_src( bml_btl->btl,
|
||||||
bml_btl->btl,
|
bml_btl->btl_endpoint,
|
||||||
bml_btl->btl_endpoint,
|
reg,
|
||||||
reg,
|
conv,
|
||||||
conv,
|
order,
|
||||||
order,
|
reserve,
|
||||||
reserve,
|
size,
|
||||||
size,
|
flags );
|
||||||
flags
|
if( OPAL_LIKELY((*des) != NULL) ) {
|
||||||
);
|
(*des)->des_context = (void*) bml_btl;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void mca_bml_base_prepare_dst(mca_bml_base_btl_t* bml_btl,
|
static inline void mca_bml_base_prepare_dst(mca_bml_base_btl_t* bml_btl,
|
||||||
@ -350,16 +350,17 @@ static inline void mca_bml_base_prepare_dst(mca_bml_base_btl_t* bml_btl,
|
|||||||
size_t *size,
|
size_t *size,
|
||||||
uint32_t flags,
|
uint32_t flags,
|
||||||
mca_btl_base_descriptor_t** des) {
|
mca_btl_base_descriptor_t** des) {
|
||||||
*des = bml_btl->btl_prepare_dst(
|
*des = bml_btl->btl_prepare_dst( bml_btl->btl,
|
||||||
bml_btl->btl,
|
bml_btl->btl_endpoint,
|
||||||
bml_btl->btl_endpoint,
|
reg,
|
||||||
reg,
|
conv,
|
||||||
conv,
|
order,
|
||||||
order,
|
reserve,
|
||||||
reserve,
|
size,
|
||||||
size,
|
flags );
|
||||||
flags
|
if( OPAL_LIKELY((*des) != NULL) ) {
|
||||||
);
|
(*des)->des_context = (void*) bml_btl;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user