Fixed build error related to direct call (bml_direct_call.h). Misc bug fixes
and compiler warning issues. Fixed threaded build issue. This commit was SVN r6819.
Этот коммит содержится в:
Galen Shipman
родитель
c8865bd5c1
Коммит
b01ebf45c9
@ -22,7 +22,6 @@ DIST_SUBDIRS = base $(MCA_bml_ALL_SUBDIRS)
|
||||
# Source code files
|
||||
|
||||
headers = bml.h
|
||||
nodist_headers = bml_direct_call.h
|
||||
|
||||
# Conditionally install the header files
|
||||
|
||||
|
||||
@ -291,7 +291,7 @@ static inline void mca_bml_base_prepare_dst(mca_bml_base_btl_t* bml_btl,
|
||||
#if OMPI_HAVE_THREAD_SUPPORT
|
||||
#define MCA_BML_BASE_BTL_DES_ALLOC(bml_btl, des, size) \
|
||||
do { \
|
||||
if(NULL != (des = bm_btl->btl_cache)) { \
|
||||
if(NULL != (des = bml_btl->btl_cache)) { \
|
||||
/* atomically acquire the cached descriptor */ \
|
||||
if(opal_atomic_cmpset_ptr(&bml_btl->btl_cache, des, NULL) == 0) { \
|
||||
bml_btl->btl_cache = NULL; \
|
||||
|
||||
@ -71,9 +71,7 @@ int mca_bml_r2_component_open(void)
|
||||
|
||||
int mca_bml_r2_component_close(void)
|
||||
{
|
||||
int rc;
|
||||
|
||||
|
||||
|
||||
/* OBJ_DESTRUCT(&mca_bml_r2.lock); */
|
||||
|
||||
return OMPI_SUCCESS;
|
||||
|
||||
@ -120,6 +120,7 @@ struct mca_btl_base_module_t;
|
||||
struct mca_btl_base_endpoint_t;
|
||||
struct mca_btl_base_descriptor_t;
|
||||
struct mca_mpool_base_resources_t;
|
||||
struct ompi_proc_t;
|
||||
|
||||
|
||||
/* send/recv operations require tag matching */
|
||||
|
||||
@ -86,17 +86,6 @@ OBJ_CLASS_INSTANCE(
|
||||
|
||||
|
||||
|
||||
static char* mca_mpool_mvapi_param_register_string(
|
||||
const char* param_name,
|
||||
const char* default_value)
|
||||
{
|
||||
char *param_value;
|
||||
int id = mca_base_param_register_string("mpool","vapi",param_name,NULL,default_value);
|
||||
mca_base_param_lookup_string(id, ¶m_value);
|
||||
return param_value;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* component open/close/init function
|
||||
*/
|
||||
|
||||
@ -147,7 +147,7 @@ void* mca_mpool_mvapi_realloc(
|
||||
mca_mpool_base_registration_t* old_reg = *registration;
|
||||
void* new_mem = mpool->mpool_alloc(mpool, size, 0, registration);
|
||||
memcpy(new_mem, addr, old_reg->bound - old_reg->base);
|
||||
mpool->mpool_free(mpool, addr, &old_reg);
|
||||
mpool->mpool_free(mpool, addr, old_reg);
|
||||
return new_mem;
|
||||
}
|
||||
|
||||
|
||||
@ -58,9 +58,8 @@ mca_pml_ob1_t mca_pml_ob1 = {
|
||||
|
||||
int mca_pml_ob1_enable(bool enable)
|
||||
{
|
||||
int rc;
|
||||
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
|
||||
uint32_t proc_arch;
|
||||
|
||||
#endif
|
||||
|
||||
if( false == enable ) return OMPI_SUCCESS;
|
||||
@ -168,7 +167,6 @@ int mca_pml_ob1_add_procs(ompi_proc_t** procs, size_t nprocs)
|
||||
ompi_bitmap_t reachable;
|
||||
struct mca_bml_base_endpoint_t ** bml_endpoints = NULL;
|
||||
int rc;
|
||||
size_t p_index;
|
||||
|
||||
if(nprocs == 0)
|
||||
return OMPI_SUCCESS;
|
||||
@ -217,8 +215,6 @@ int mca_pml_ob1_add_procs(ompi_proc_t** procs, size_t nprocs)
|
||||
|
||||
int mca_pml_ob1_del_procs(ompi_proc_t** procs, size_t nprocs)
|
||||
{
|
||||
size_t p;
|
||||
int rc;
|
||||
return mca_bml.bml_del_procs(nprocs, procs);
|
||||
}
|
||||
|
||||
|
||||
@ -96,7 +96,6 @@ void mca_pml_ob1_recv_frag_callback(
|
||||
{
|
||||
mca_pml_ob1_send_request_t* sendreq = (mca_pml_ob1_send_request_t*)
|
||||
hdr->hdr_rdma.hdr_src.pval;
|
||||
mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*) des->des_context;
|
||||
mca_pml_ob1_send_request_put(sendreq,btl,&hdr->hdr_rdma);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -209,12 +209,14 @@ int mca_pml_ob1_send_request_start(
|
||||
mca_btl_base_segment_t* segment;
|
||||
mca_pml_ob1_hdr_t* hdr;
|
||||
mca_bml_base_endpoint_t* bml_endpoint = sendreq->bml_endpoint;
|
||||
if(NULL == bml_endpoint) {
|
||||
opal_output("[%s:%d:%s] no endpoint found for given destination.\n", __FILE__, __LINE__, __func__);
|
||||
}
|
||||
mca_bml_base_btl_t* bml_btl = mca_bml_base_btl_array_get_next(&bml_endpoint->btl_eager);
|
||||
|
||||
mca_bml_base_btl_t* bml_btl = NULL;
|
||||
size_t size = sendreq->req_send.req_bytes_packed;
|
||||
if(NULL == bml_endpoint) {
|
||||
opal_output(0, "[%s:%d:%s] no endpoint found for given destination.\n", __FILE__, __LINE__, __func__);
|
||||
}
|
||||
bml_btl=mca_bml_base_btl_array_get_next(&bml_endpoint->btl_eager);
|
||||
|
||||
|
||||
|
||||
int rc;
|
||||
|
||||
@ -629,7 +631,6 @@ void mca_pml_ob1_send_request_put(
|
||||
mca_btl_base_module_t* btl,
|
||||
mca_pml_ob1_rdma_hdr_t* hdr)
|
||||
{
|
||||
ompi_proc_t* proc = sendreq->req_proc;
|
||||
mca_mpool_base_registration_t* reg = NULL;
|
||||
mca_bml_base_btl_t* bml_btl;
|
||||
mca_btl_base_descriptor_t* des;
|
||||
|
||||
@ -90,8 +90,9 @@ int mca_pml_uniq_send_request_schedule(mca_ptl_base_send_request_t* req)
|
||||
* the scheduling logic once for every call.
|
||||
*/
|
||||
if(OPAL_THREAD_ADD32(&req->req_lock,1) == 1) {
|
||||
mca_pml_uniq_proc_t* proc_pml = mca_pml_uniq_proc_lookup_remote( req->req_send.req_base.req_comm,
|
||||
req->req_send.req_base.req_peer );
|
||||
mca_pml_uniq_proc_t* proc_pml = (mca_pml_uniq_proc_t*)
|
||||
mca_pml_uniq_proc_lookup_remote( req->req_send.req_base.req_comm,
|
||||
req->req_send.req_base.req_peer );
|
||||
|
||||
#if PML_UNIQ_ACCEPT_NEXT_PTL
|
||||
mca_ptl_proc_t* ptl_proc = &(proc_pml->proc_ptl_next);
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user