use %ld instead of %d as ORTE_NAME_ARGS does casting to long not unsigned long
This commit was SVN r13987.
Этот коммит содержится в:
родитель
6ebaee33f1
Коммит
8072dd344c
@ -430,8 +430,8 @@ static int mca_btl_gm_discover( void )
|
|||||||
#endif /* GM_API_VERSION > 0x200 */
|
#endif /* GM_API_VERSION > 0x200 */
|
||||||
|
|
||||||
if(mca_btl_gm_component.gm_debug > 0) {
|
if(mca_btl_gm_component.gm_debug > 0) {
|
||||||
opal_output(0, "[%d,%d,%d] gm_port %08X, board %lu, global %lu node %lu port %lu\n",
|
opal_output(0, "[%ld,%ld,%ld] gm_port %08X, board %lu, global %lu node %lu port %lu\n",
|
||||||
ORTE_NAME_ARGS(orte_process_info.my_name), port, board_no, global_id, node_id, port_no);
|
ORTE_NAME_ARGS(orte_process_info.my_name), port, board_no, global_id, node_id, port_no);
|
||||||
}
|
}
|
||||||
|
|
||||||
if((rc = mca_btl_gm_module_init(btl)) != OMPI_SUCCESS) {
|
if((rc = mca_btl_gm_module_init(btl)) != OMPI_SUCCESS) {
|
||||||
|
@ -124,14 +124,14 @@ mca_btl_gm_proc_t* mca_btl_gm_proc_create(ompi_proc_t* ompi_proc)
|
|||||||
(void*)&gm_proc->proc_addrs,
|
(void*)&gm_proc->proc_addrs,
|
||||||
&size);
|
&size);
|
||||||
if(OMPI_SUCCESS != rc) {
|
if(OMPI_SUCCESS != rc) {
|
||||||
opal_output(0, "[%s:%d] mca_pml_base_modex_recv failed for peer [%d,%d,%d]",
|
opal_output(0, "[%s:%d] mca_pml_base_modex_recv failed for peer [%ld,%ld,%ld]",
|
||||||
__FILE__,__LINE__,ORTE_NAME_ARGS(&ompi_proc->proc_name));
|
__FILE__,__LINE__,ORTE_NAME_ARGS(&ompi_proc->proc_name));
|
||||||
OBJ_RELEASE(gm_proc);
|
OBJ_RELEASE(gm_proc);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if((size % sizeof(mca_btl_gm_addr_t)) != 0) {
|
if((size % sizeof(mca_btl_gm_addr_t)) != 0) {
|
||||||
opal_output(0, "[%s:%d] invalid gm address for peer [%d,%d,%d]",
|
opal_output(0, "[%s:%d] invalid gm address for peer [%ld,%ld,%ld]",
|
||||||
__FILE__,__LINE__,ORTE_NAME_ARGS(&ompi_proc->proc_name));
|
__FILE__,__LINE__,ORTE_NAME_ARGS(&ompi_proc->proc_name));
|
||||||
OBJ_RELEASE(gm_proc);
|
OBJ_RELEASE(gm_proc);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -185,7 +185,7 @@ int mca_btl_gm_proc_insert(
|
|||||||
return OMPI_ERROR;
|
return OMPI_ERROR;
|
||||||
}
|
}
|
||||||
if(mca_btl_gm_component.gm_debug > 0) {
|
if(mca_btl_gm_component.gm_debug > 0) {
|
||||||
opal_output(0, "[%d,%d,%d] mapped global id %lu to node id %lu\n",
|
opal_output(0, "[%ld,%ld,%ld] mapped global id %lu to node id %lu\n",
|
||||||
ORTE_NAME_ARGS(orte_process_info.my_name),
|
ORTE_NAME_ARGS(orte_process_info.my_name),
|
||||||
gm_endpoint->endpoint_addr.global_id,
|
gm_endpoint->endpoint_addr.global_id,
|
||||||
gm_endpoint->endpoint_addr.node_id);
|
gm_endpoint->endpoint_addr.node_id);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user