Less warnings.
This commit was SVN r13419.
Этот коммит содержится в:
родитель
6ef3917741
Коммит
b611e6d7dc
@ -135,21 +135,21 @@ int mca_btl_mx_proc_insert( mca_btl_mx_proc_t* module_proc,
|
|||||||
mca_btl_mx_endpoint_t* module_endpoint )
|
mca_btl_mx_endpoint_t* module_endpoint )
|
||||||
{
|
{
|
||||||
mca_btl_mx_addr_t *mx_peers;
|
mca_btl_mx_addr_t *mx_peers;
|
||||||
int rc;
|
int rc, i;
|
||||||
size_t size, i;
|
size_t size;
|
||||||
|
|
||||||
/* query for the peer address info */
|
/* query for the peer address info */
|
||||||
rc = mca_pml_base_modex_recv( &mca_btl_mx_component.super.btl_version,
|
rc = mca_pml_base_modex_recv( &mca_btl_mx_component.super.btl_version,
|
||||||
module_proc->proc_ompi, (void*)&mx_peers, &size );
|
module_proc->proc_ompi, (void*)&mx_peers, &size );
|
||||||
if( OMPI_SUCCESS != rc ) {
|
if( OMPI_SUCCESS != rc ) {
|
||||||
opal_output( 0, "mca_pml_base_modex_recv failed for peer [%d,%d,%d]",
|
opal_output( 0, "mca_pml_base_modex_recv failed for peer [%ld,%ld,%ld]",
|
||||||
ORTE_NAME_ARGS(&module_proc->proc_ompi->proc_name) );
|
ORTE_NAME_ARGS(&module_proc->proc_ompi->proc_name) );
|
||||||
OBJ_RELEASE(module_proc);
|
OBJ_RELEASE(module_proc);
|
||||||
return OMPI_ERR_OUT_OF_RESOURCE;
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( (size % sizeof(mca_btl_mx_addr_t)) != 0 ) {
|
if( (size % sizeof(mca_btl_mx_addr_t)) != 0 ) {
|
||||||
opal_output( 0, "invalid mx address for peer [%d,%d,%d]",
|
opal_output( 0, "invalid mx address for peer [%ld,%ld,%ld]",
|
||||||
ORTE_NAME_ARGS(&module_proc->proc_ompi->proc_name) );
|
ORTE_NAME_ARGS(&module_proc->proc_ompi->proc_name) );
|
||||||
OBJ_RELEASE(module_proc);
|
OBJ_RELEASE(module_proc);
|
||||||
return OMPI_ERROR;
|
return OMPI_ERROR;
|
||||||
|
@ -375,6 +375,9 @@ int btl_openib_register_mca_params(void)
|
|||||||
"of network (must be >= 1)",
|
"of network (must be >= 1)",
|
||||||
800, &ival, REGINT_GE_ONE));
|
800, &ival, REGINT_GE_ONE));
|
||||||
mca_btl_openib_module.super.btl_bandwidth = (uint32_t) ival;
|
mca_btl_openib_module.super.btl_bandwidth = (uint32_t) ival;
|
||||||
|
CHECK(reg_int("latency", "Approximate latency of the device (must be >= 1)",
|
||||||
|
10, &ival, REGINT_GE_ONE));
|
||||||
|
mca_btl_openib_module.super.btl_latency = (uint32_t) ival;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -338,8 +338,8 @@ int mca_btl_sm_add_procs_same_base_addr(
|
|||||||
mca_btl_sm_component.sm_resouce_ctl_file,
|
mca_btl_sm_component.sm_resouce_ctl_file,
|
||||||
sizeof(mca_btl_sm_module_resource_t), 0)))
|
sizeof(mca_btl_sm_module_resource_t), 0)))
|
||||||
{
|
{
|
||||||
opal_output(0, "mca_btl_sm_add_procs: unable to create shared memory BTL coordinating strucure :: size %ld \n",
|
opal_output(0, "mca_btl_sm_add_procs: unable to create shared memory BTL coordinating strucure :: size %lu \n",
|
||||||
size);
|
(unsigned long)size);
|
||||||
return_code=OMPI_ERROR;
|
return_code=OMPI_ERROR;
|
||||||
goto CLEANUP;
|
goto CLEANUP;
|
||||||
}
|
}
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user