1
1
This commit was SVN r13381.
Этот коммит содержится в:
George Bosilca 2007-01-31 04:24:56 +00:00
родитель 8cb4024903
Коммит 9f73335bdb
6 изменённых файлов: 11 добавлений и 8 удалений

Просмотреть файл

@ -67,7 +67,8 @@ int orte_dss_pack_buffer(orte_buffer_t *buffer, void *src, orte_std_cntr_t num_v
int rc; int rc;
orte_dss_type_info_t *info; orte_dss_type_info_t *info;
OPAL_OUTPUT( ( orte_dss_verbose, "orte_dss_pack_buffer( %p, %p, %lu, %d )\n", buffer, src, num_vals, (int)type ) ); OPAL_OUTPUT( ( orte_dss_verbose, "orte_dss_pack_buffer( %p, %p, %lu, %d )\n",
(void*)buffer, src, (long unsigned int)num_vals, (int)type ) );
/* Pack the declared data type */ /* Pack the declared data type */
if (ORTE_DSS_BUFFER_FULLY_DESC == buffer->type) { if (ORTE_DSS_BUFFER_FULLY_DESC == buffer->type) {

Просмотреть файл

@ -111,7 +111,8 @@ int orte_dss_unpack_buffer(orte_buffer_t *buffer, void *dst, orte_std_cntr_t *nu
orte_data_type_t local_type; orte_data_type_t local_type;
orte_dss_type_info_t *info; orte_dss_type_info_t *info;
OPAL_OUTPUT( ( orte_dss_verbose, "orte_dss_unpack_buffer( %p, %p, %lu, %d )\n", buffer, dst, *num_vals, (int)type ) ); OPAL_OUTPUT( ( orte_dss_verbose, "orte_dss_unpack_buffer( %p, %p, %lu, %d )\n",
(void*)buffer, dst, (long unsigned int)*num_vals, (int)type ) );
/** Unpack the declared data type */ /** Unpack the declared data type */
if (ORTE_DSS_BUFFER_FULLY_DESC == buffer->type) { if (ORTE_DSS_BUFFER_FULLY_DESC == buffer->type) {

Просмотреть файл

@ -58,7 +58,7 @@ int orte_gpr_replica_dump_local_triggers(void)
if (NULL == trigs[j]->callback) { if (NULL == trigs[j]->callback) {
opal_output(orte_gpr_base_output, "\tNULL callback"); opal_output(orte_gpr_base_output, "\tNULL callback");
} else { } else {
opal_output(orte_gpr_base_output, "\tCallback %0x", trigs[j]->callback); opal_output(orte_gpr_base_output, "\tCallback %llx", (unsigned long long)(intptr_t)trigs[j]->callback);
} }
} }
} }
@ -88,8 +88,9 @@ int orte_gpr_replica_dump_local_subscriptions(void)
if (NULL == subs[j]->callback) { if (NULL == subs[j]->callback) {
opal_output(orte_gpr_base_output, "\tNULL callback"); opal_output(orte_gpr_base_output, "\tNULL callback");
} else { } else {
opal_output(orte_gpr_base_output, "\tCallback %0x", subs[j]->callback); opal_output(orte_gpr_base_output, "\tCallback %llx", (unsigned long long)(intptr_t)subs[j]->callback);
} } }
}
} }
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }

Просмотреть файл

@ -134,7 +134,6 @@ static int mca_oob_xcast_binomial_tree(orte_jobid_t job,
OBJ_DESTRUCT(&xcastmutex); OBJ_DESTRUCT(&xcastmutex);
return ORTE_SUCCESS; return ORTE_SUCCESS;
} }

Просмотреть файл

@ -502,7 +502,7 @@ void mca_oob_tcp_peer_close(mca_oob_tcp_peer_t* peer)
opal_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_close(%p) sd %d state %d\n", opal_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_close(%p) sd %d state %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)), ORTE_NAME_ARGS(&(peer->peer_name)),
peer, (void*)peer,
peer->peer_sd, peer->peer_sd,
peer->peer_state); peer->peer_state);
} }

Просмотреть файл

@ -688,7 +688,8 @@ static void job_state_callback(orte_jobid_t jobid, orte_proc_state_t state)
break; break;
default: default:
opal_output(0, "orterun: job state callback in unexpected state - jobid %lu, state 0x%04x\n", jobid, state); opal_output(0, "orterun: job state callback in unexpected state - jobid %lu, state 0x%04x\n",
(long unsigned int)jobid, state);
break; break;
} }
OPAL_THREAD_UNLOCK(&orterun_globals.lock); OPAL_THREAD_UNLOCK(&orterun_globals.lock);