ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Fix for a bunch of size_t issues; reviewed by George and Ralph.

Просмотр исходного кода 
- Change all uses of *printf'ing a size_t to use an explicit cast to
  (unsigned long) and the %lu escape
- change ORTE_GPR_REPLICA_MAX_SIZE to INT_MAX until bug 1345 is fixed
  (i.e., until we allow size_t in MCA params)
- ns_base_local_fns.c:orte_ns_base_get_proc_name_string(): changed
  from %0X -> %lu
- ORTE_NAME_ARGS added explicit (unsigned long) casts, and changed all
  usages of ORTE_NAME_ARGS to use %lu's

This commit was SVN r5644.
Этот коммит содержится в:
Jeff Squyres 2005-05-08 13:22:55 +00:00
родитель 1d87c3a87b
Коммит a28b5ae43b
45 изменённых файлов: 214 добавлений и 212 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
src/include/orte_types.h
Просмотреть файл

@ -92,12 +92,6 @@ typedef struct {
uint8_t *bytes;
} orte_byte_object_t;
/* define a print format to handle the variations in size_t */
#if SIZEOF_SIZE_T == SIZEOF_INT
#define ORTE_SIZE_T_PRINTF "%u"
#elif SIZEOF_SIZE_T == SIZEOF_LONG
#define ORTE_SIZE_T_PRINTF "%lu"
#endif
/* define a print format to handle the variations in pid_t */
#if SIZEOF_PID_T == SIZEOF_INT

6
src/mca/base/mca_base_module_exchange.c
Просмотреть файл

@ -214,7 +214,7 @@ static void mca_base_modex_registry_callback(
int rc;
#if 0
ompi_output(0, "[%d,%d,%d] mca_base_modex_registry_callback\n",
ompi_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback\n",
ORTE_NAME_ARGS(orte_process_info.my_name));
orte_gpr_base_dump_notify_data(data,0);
#endif
@ -342,7 +342,7 @@ orte_gpr_base_dump_notify_data(data,0);
modex_module->module_data_size = num_bytes;
modex_module->module_data_avail = true;
#if 0
ompi_output(0, "[%d,%d,%d] mca_base_modex_registry_callback: %s-%s-%d-%d received %d bytes\n",
ompi_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback: %s-%s-%d-%d received %d bytes\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
component.mca_type_name,
component.mca_component_name,
@ -644,7 +644,7 @@ int mca_base_modex_recv(
/* wait until data is available */
while(modex_module->module_data_avail == false) {
#if 0
ompi_output(0, "[%d,%d,%d] mca_base_modex_registry_callback: waiting for %s-%s-%d-%d\n",
ompi_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback: waiting for %s-%s-%d-%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
component->mca_type_name,
component->mca_component_name,

2
src/mca/errmgr/base/errmgr_base_fns.c
Просмотреть файл

@ -40,7 +40,7 @@ void orte_errmgr_base_log(int error_code, char *filename, int line)
ompi_output(0, "[NO-NAME] ORTE_ERROR_LOG: %s in file %s at line %d",
ORTE_ERROR_NAME(error_code), filename, line);
} else {
ompi_output(0, "[%d,%d,%d] ORTE_ERROR_LOG: %s in file %s at line %d",
ompi_output(0, "[%lu,%lu,%lu] ORTE_ERROR_LOG: %s in file %s at line %d",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_ERROR_NAME(error_code), filename, line);
}

2
src/mca/errmgr/base/errmgr_base_log.c
Просмотреть файл

@ -26,7 +26,7 @@
void mca_errmgr_base_log(char *msg, char *filename, int line)
{
ompi_output(0, "[%d,%d,%d] ORTE_ERROR_LOG: %s in file %s at line %d",
ompi_output(0, "[%lu,%lu,%lu] ORTE_ERROR_LOG: %s in file %s at line %d",
ORTE_NAME_ARGS(orte_process_info.my_name),
msg, filename, line);
}

57
src/mca/gpr/base/unpack_api_response/gpr_base_dump_notify.c
Просмотреть файл

@ -51,15 +51,14 @@ int orte_gpr_base_dump_notify_msg(orte_buffer_t *buffer,
return ORTE_SUCCESS;
}
asprintf(&tmp_out, ORTE_SIZE_T_PRINTF
" Notify data structures in message going to trigger "
ORTE_SIZE_T_PRINTF,
msg->cnt, msg->idtag);
asprintf(&tmp_out, "%lu Notify data structures in message going to trigger %lu",
(unsigned long) msg->cnt, (unsigned long) msg->idtag);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
if (0 < msg->cnt && NULL != msg->data) {
for (i=0; i < msg->cnt; i++) {
asprintf(&tmp_out, "\nDump of data structure " ORTE_SIZE_T_PRINTF, i);
asprintf(&tmp_out, "\nDump of data structure %lu",
(unsigned long) i);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
orte_gpr_base_dump_data(buffer, msg->data[i]);
}
@ -93,15 +92,15 @@ static void orte_gpr_base_dump_data(orte_buffer_t *buffer,
orte_gpr_value_t **values;
size_t i;
asprintf(&tmp_out, ORTE_SIZE_T_PRINTF " Values from segment %s", data->cnt, data->segment);
asprintf(&tmp_out, "%lu Values from segment %s",
(unsigned long) data->cnt, data->segment);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
if (0 < data->cnt && NULL != data->values) {
values = data->values;
for (i=0; i < data->cnt; i++) {
asprintf(&tmp_out, "\nData for value " ORTE_SIZE_T_PRINTF
" going to callback num " ORTE_SIZE_T_PRINTF,
i, data->cb_num);
asprintf(&tmp_out, "\nData for value %lu going to callback num %lu",
(unsigned long) i, (unsigned long) data->cb_num);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
if (NULL == values[i]) {
asprintf(&tmp_out, "\tError encountered: NULL value pointer");
@ -119,8 +118,8 @@ int orte_gpr_base_dump_value(orte_buffer_t *buffer, orte_gpr_value_t *value)
orte_gpr_addr_mode_t addr;
size_t j;
asprintf(&tmp_out, "\tValue from segment %s with " ORTE_SIZE_T_PRINTF " keyvals",
value->segment, value->cnt);
asprintf(&tmp_out, "\tValue from segment %s with %lu keyvals",
value->segment, (unsigned long) value->cnt);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
addr = value->addr_mode;
@ -128,10 +127,12 @@ int orte_gpr_base_dump_value(orte_buffer_t *buffer, orte_gpr_value_t *value)
asprintf(&tmp_out, "\tNULL tokens (wildcard)");
orte_gpr_base_dump_load_string(buffer, &tmp_out);
} else {
asprintf(&tmp_out, "\t" ORTE_SIZE_T_PRINTF " Tokens returned", value->num_tokens);
asprintf(&tmp_out, "\t%lu Tokens returned",
(unsigned long) value->num_tokens);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
for (j=0; j < value->num_tokens; j++) {
asprintf(&tmp_out, "\tToken " ORTE_SIZE_T_PRINTF ": %s", j, value->tokens[j]);
asprintf(&tmp_out, "\tToken %lu: %s", (unsigned long) j,
value->tokens[j]);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
}
}
@ -186,8 +187,8 @@ int orte_gpr_base_dump_value(orte_buffer_t *buffer, orte_gpr_value_t *value)
}
for (j=0; j < value->cnt; j++) {
asprintf(&tmp_out, "\t\tData for keyval " ORTE_SIZE_T_PRINTF ": Key: %s", j,
(value->keyvals[j])->key);
asprintf(&tmp_out, "\t\tData for keyval %lu: Key: %s",
(unsigned long) j, (value->keyvals[j])->key);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
orte_gpr_base_dump_keyval_value(buffer, value->keyvals[j]);
}
@ -218,7 +219,8 @@ void orte_gpr_base_dump_keyval_value(orte_buffer_t *buffer, orte_gpr_keyval_t *i
break;
case ORTE_SIZE:
asprintf(&tmp_out, "\t\t\tData type: ORTE_SIZE:\tValue: " ORTE_SIZE_T_PRINTF, iptr->value.size);
asprintf(&tmp_out, "\t\t\tData type: ORTE_SIZE:\tValue: %lu",
(unsigned long) iptr->value.size);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
break;
@ -277,35 +279,32 @@ void orte_gpr_base_dump_keyval_value(orte_buffer_t *buffer, orte_gpr_keyval_t *i
#endif
case ORTE_BYTE_OBJECT:
asprintf(&tmp_out, "\t\t\tData type: ORTE_BYTE_OBJECT\tSize: "
ORTE_SIZE_T_PRINTF, (iptr->value.byteobject).size);
asprintf(&tmp_out, "\t\t\tData type: ORTE_BYTE_OBJECT\tSize: %lu",
(unsigned long) (iptr->value.byteobject).size);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
break;
case ORTE_NAME:
asprintf(&tmp_out, "\t\t\tData type: ORTE_NAME\tValue: ["
ORTE_SIZE_T_PRINTF ","
ORTE_SIZE_T_PRINTF ","
ORTE_SIZE_T_PRINTF "]",
ORTE_NAME_ARGS(&(iptr->value.proc)));
asprintf(&tmp_out, "\t\t\tData type: ORTE_NAME\tValue: [%lu,%lu,%lu]",
ORTE_NAME_ARGS(&(iptr->value.proc)));
orte_gpr_base_dump_load_string(buffer, &tmp_out);
break;
case ORTE_VPID:
asprintf(&tmp_out, "\t\t\tData type: ORTE_VPID\tValue: " ORTE_SIZE_T_PRINTF,
iptr->value.vpid);
asprintf(&tmp_out, "\t\t\tData type: ORTE_VPID\tValue: %lu",
(unsigned long) iptr->value.vpid);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
break;
case ORTE_JOBID:
asprintf(&tmp_out, "\t\t\tData type: ORTE_JOBID\tValue: " ORTE_SIZE_T_PRINTF,
iptr->value.jobid);
asprintf(&tmp_out, "\t\t\tData type: ORTE_JOBID\tValue: %lu",
(unsigned long) iptr->value.jobid);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
break;
case ORTE_CELLID:
asprintf(&tmp_out, "\t\t\tData type: ORTE_CELLID\tValue: " ORTE_SIZE_T_PRINTF,
iptr->value.cellid);
asprintf(&tmp_out, "\t\t\tData type: ORTE_CELLID\tValue: %lu",
(unsigned long) iptr->value.cellid);
orte_gpr_base_dump_load_string(buffer, &tmp_out);
break;

4
src/mca/gpr/proxy/gpr_proxy_arithmetic_ops.c
Просмотреть файл

@ -44,7 +44,7 @@ int orte_gpr_proxy_increment_value(orte_gpr_value_t *value)
int rc, ret;
if (orte_gpr_proxy_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_proxy_increment_value entered",
ompi_output(0, "[%lu,%lu,%lu] gpr_proxy_increment_value entered",
ORTE_NAME_ARGS(orte_process_info.my_name));
}
@ -105,7 +105,7 @@ int orte_gpr_proxy_decrement_value(orte_gpr_value_t *value)
int rc, ret;
if (orte_gpr_proxy_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_proxy_decrement_value entered",
ompi_output(0, "[%lu,%lu,%lu] gpr_proxy_decrement_value entered",
ORTE_NAME_ARGS(orte_process_info.my_name));
}

2
src/mca/gpr/proxy/gpr_proxy_component.c
Просмотреть файл

@ -313,7 +313,7 @@ void orte_gpr_proxy_notify_recv(int status, orte_process_name_t* sender,
size_t num_msgs, cnt, i, j, k;
if (orte_gpr_proxy_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr proxy: received trigger message",
ompi_output(0, "[%lu,%lu,%lu] gpr proxy: received trigger message",
ORTE_NAME_ARGS(orte_process_info.my_name));
}

2
src/mca/gpr/proxy/gpr_proxy_compound_cmd.c
Просмотреть файл

@ -105,7 +105,7 @@ int orte_gpr_proxy_exec_compound_cmd(void)
int rc, response;
if (orte_gpr_proxy_globals.debug) {
ompi_output(0, "[%d,%d,%d] transmitting compound command",
ompi_output(0, "[%lu,%lu,%lu] transmitting compound command",
ORTE_NAME_ARGS(orte_process_info.my_name));
}

2
src/mca/gpr/proxy/gpr_proxy_del_index.c
Просмотреть файл

@ -108,7 +108,7 @@ int orte_gpr_proxy_delete_entries(orte_gpr_addr_mode_t mode,
int rc, ret;
if (orte_gpr_proxy_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_proxy_delete_object", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] gpr_proxy_delete_object", ORTE_NAME_ARGS(orte_process_info.my_name));
}
/* need to protect against errors */

2
src/mca/gpr/proxy/gpr_proxy_internals.c
Просмотреть файл

@ -76,7 +76,7 @@ orte_gpr_proxy_enter_notify_request(orte_gpr_notify_id_t *local_idtag,
*local_idtag = idtag;
if (orte_gpr_proxy_globals.debug) {
ompi_output(0, "[%d,%d,%d] enter_notify_request: tracker %d created",
ompi_output(0, "[%lu,%lu,%lu] enter_notify_request: tracker %d created",
ORTE_NAME_ARGS(orte_process_info.my_name), idtag);
}

2
src/mca/gpr/proxy/gpr_proxy_put_get.c
Просмотреть файл

@ -44,7 +44,7 @@ int orte_gpr_proxy_put(size_t cnt, orte_gpr_value_t **values)
int rc, ret;
if (orte_gpr_proxy_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_proxy_put: entered with %d values",
ompi_output(0, "[%lu,%lu,%lu] gpr_proxy_put: entered with %d values",
ORTE_NAME_ARGS(orte_process_info.my_name), cnt);
}

2
src/mca/gpr/proxy/gpr_proxy_subscribe.c
Просмотреть файл

@ -128,7 +128,7 @@ orte_gpr_proxy_subscribe(orte_gpr_notify_action_t action,
}
if (orte_gpr_proxy_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr proxy subscribe: register subscribe for local idtag %d",
ompi_output(0, "[%lu,%lu,%lu] gpr proxy subscribe: register subscribe for local idtag %d",
ORTE_NAME_ARGS(orte_process_info.my_name), (int)idtag);
}

2
src/mca/gpr/replica/api_layer/gpr_replica_compound_cmd_api.c
Просмотреть файл

@ -103,7 +103,7 @@ int orte_gpr_replica_exec_compound_cmd(void)
orte_buffer_t *answer;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] Executing compound command",
ompi_output(0, "[%lu,%lu,%lu] Executing compound command",
ORTE_NAME_ARGS(orte_process_info.my_name));
}

8
src/mca/gpr/replica/api_layer/gpr_replica_dump_api.c
Просмотреть файл

@ -40,7 +40,7 @@ int orte_gpr_replica_dump_all(int output_id)
int rc;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_replica_dump_all: entered for output on %d",
ompi_output(0, "[%lu,%lu,%lu] gpr_replica_dump_all: entered for output on %d",
ORTE_NAME_ARGS(orte_process_info.my_name), output_id);
}
@ -80,7 +80,7 @@ int orte_gpr_replica_dump_segments(int output_id)
int rc;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_replica_dump_segments: entered for output on %d",
ompi_output(0, "[%lu,%lu,%lu] gpr_replica_dump_segments: entered for output on %d",
ORTE_NAME_ARGS(orte_process_info.my_name), output_id);
}
@ -120,7 +120,7 @@ int orte_gpr_replica_dump_triggers(int output_id)
int rc;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_replica_dump_triggers: entered for output on %d",
ompi_output(0, "[%lu,%lu,%lu] gpr_replica_dump_triggers: entered for output on %d",
ORTE_NAME_ARGS(orte_process_info.my_name), output_id);
}
@ -160,7 +160,7 @@ int orte_gpr_replica_dump_callbacks(int output_id)
int rc;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_replica_dump_callbacks: entered for output on %d",
ompi_output(0, "[%lu,%lu,%lu] gpr_replica_dump_callbacks: entered for output on %d",
ORTE_NAME_ARGS(orte_process_info.my_name), output_id);
}

2
src/mca/gpr/replica/api_layer/gpr_replica_put_get_api.c
Просмотреть файл

@ -44,7 +44,7 @@ int orte_gpr_replica_put(size_t cnt, orte_gpr_value_t **values)
/* protect ourselves against errors */
if (NULL == values) {
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica: error in input - put rejected",
ompi_output(0, "[%lu,%lu,%lu] gpr replica: error in input - put rejected",
ORTE_NAME_ARGS(orte_process_info.my_name));
}
return ORTE_ERROR;

2
src/mca/gpr/replica/communications/gpr_replica_recv_proxy_msgs.c
Просмотреть файл

@ -45,7 +45,7 @@ void orte_gpr_replica_recv(int status, orte_process_name_t* sender,
int rc;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica: received message from [%d,%d,%d]",
ompi_output(0, "[%lu,%lu,%lu] gpr replica: received message from [%lu,%lu,%lu]",
ORTE_NAME_ARGS(orte_process_info.my_name), ORTE_NAME_ARGS(sender));
}

2
src/mca/gpr/replica/communications/gpr_replica_subscribe_cm.c
Просмотреть файл

@ -107,7 +107,7 @@ int orte_gpr_replica_recv_subscribe_cmd(orte_process_name_t* sender,
if (NULL != sender) { /* remote sender */
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] subscribe requested for remote sender [%d,%d,%d] for idtag %d",
ompi_output(0, "[%lu,%lu,%lu] subscribe requested for remote sender [%lu,%lu,%lu] for idtag %d",
ORTE_NAME_ARGS(orte_process_info.my_name), ORTE_NAME_ARGS(sender), idtag);
}

2
src/mca/gpr/replica/functional_layer/gpr_replica_cleanup_fn.c
Просмотреть файл

@ -72,7 +72,7 @@ int orte_gpr_replica_cleanup_proc_fn(orte_process_name_t *proc)
size_t i, j;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr_replica_cleanup_proc: function entered for process [%d,%d,%d]",
ompi_output(0, "[%lu,%lu,%lu] gpr_replica_cleanup_proc: function entered for process [%lu,%lu,%lu]",
ORTE_NAME_ARGS(orte_process_info.my_name), ORTE_NAME_ARGS(proc));
}

4
src/mca/gpr/replica/functional_layer/gpr_replica_del_index_fn.c
Просмотреть файл

@ -44,7 +44,7 @@ int orte_gpr_replica_delete_entries_fn(orte_gpr_addr_mode_t addr_mode,
int i, j;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] replica_delete_object entered: segment %s",
ompi_output(0, "[%lu,%lu,%lu] replica_delete_object entered: segment %s",
ORTE_NAME_ARGS(*(orte_process_info.my_name)), seg->name);
}
@ -141,7 +141,7 @@ int orte_gpr_replica_index_fn(orte_gpr_replica_segment_t *seg,
ompi_registry_index_value_t *ans;
if (orte_gpr_replica_debug) {
ompi_output(0, "[%d,%d,%d] gpr replica: index entered segment: %s",
ompi_output(0, "[%lu,%lu,%lu] gpr replica: index entered segment: %s",
ORTE_NAME_ARGS(*ompi_rte_get_self()), seg->name);
}

115
src/mca/gpr/replica/functional_layer/gpr_replica_dump_fn.c
Просмотреть файл

@ -95,17 +95,19 @@ int orte_gpr_replica_dump_segments_fn(orte_buffer_t *buffer)
num_objects = (seg[i]->containers)->size - (seg[i]->containers)->number_free;
sprintf(tmp_out, "\tNumber of containers: " ORTE_SIZE_T_PRINTF "\n", num_objects);
sprintf(tmp_out, "\tNumber of containers: %lu\n",
(unsigned long) num_objects);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
/* loop through all containers and print their info and contents */
cptr = (orte_gpr_replica_container_t**)(seg[i]->containers)->addr;
for (j=0; j < (seg[i]->containers)->size; j++) {
if (NULL != cptr[j]) {
sprintf(tmp_out, "\n\tInfo for container " ORTE_SIZE_T_PRINTF
"\tNumber of keyvals: " ORTE_SIZE_T_PRINTF
sprintf(tmp_out, "\n\tInfo for container %lu"
"\tNumber of keyvals: %lu"
"\n\tTokens:\n",
j, (cptr[j]->itagvals)->size - (cptr[j]->itagvals)->number_free);
(unsigned long) j,
((unsigned long) (cptr[j]->itagvals)->size - (cptr[j]->itagvals)->number_free));
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
/* reverse lookup tokens and print them */
@ -113,14 +115,14 @@ int orte_gpr_replica_dump_segments_fn(orte_buffer_t *buffer)
for (k=0; k < cptr[j]->num_itags; k++) {
if (ORTE_SUCCESS != orte_gpr_replica_dict_reverse_lookup(
&token, seg[i], itaglist[k])) {
sprintf(tmp_out, "\t\titag num " ORTE_SIZE_T_PRINTF
": No entry found for itag "
ORTE_SIZE_T_PRINTF,
k, itaglist[k]);
sprintf(tmp_out, "\t\titag num %lu"
": No entry found for itag %lu",
(unsigned long) k,
(unsigned long) itaglist[k]);
} else {
sprintf(tmp_out, "\t\titag num " ORTE_SIZE_T_PRINTF
": itag " ORTE_SIZE_T_PRINTF "\tToken: %s",
k, itaglist[k], token);
sprintf(tmp_out, "\t\titag num %lu: itag %lu\tToken: %s",
(unsigned long) k,
(unsigned long) itaglist[k], token);
free(token);
}
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
@ -135,14 +137,13 @@ int orte_gpr_replica_dump_segments_fn(orte_buffer_t *buffer)
if (NULL != iptr[k]) {
if (ORTE_SUCCESS != orte_gpr_replica_dict_reverse_lookup(
&token, seg[i], iptr[k]->itag)) {
sprintf(tmp_out, "\n\t\titag num " ORTE_SIZE_T_PRINTF
": No entry found for itag "
ORTE_SIZE_T_PRINTF,
k, iptr[k]->itag);
sprintf(tmp_out, "\n\t\titag num %lu: No entry found for itag %lu",
(unsigned long) k,
(unsigned long) iptr[k]->itag);
} else {
sprintf(tmp_out, "\n\t\tEntry " ORTE_SIZE_T_PRINTF
": itag " ORTE_SIZE_T_PRINTF "\tKey: %s",
k, iptr[k]->itag, token);
sprintf(tmp_out, "\n\t\tEntry %lu: itag %lu\tKey: %s",
(unsigned long) k,
(unsigned long) iptr[k]->itag, token);
free(token);
}
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
@ -181,7 +182,8 @@ int orte_gpr_replica_dump_callbacks_fn(orte_buffer_t *buffer)
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
return ORTE_SUCCESS;
} else {
sprintf(tmp_out, "--- " ORTE_SIZE_T_PRINTF " callback(s) registered at this time", k);
sprintf(tmp_out, "--- %lu callback(s) registered at this time",
(unsigned long) k);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
}
@ -190,29 +192,31 @@ int orte_gpr_replica_dump_callbacks_fn(orte_buffer_t *buffer)
cb != (orte_gpr_replica_callbacks_t*)ompi_list_get_end(&(orte_gpr_replica.callbacks));
cb = (orte_gpr_replica_callbacks_t*)ompi_list_get_next(cb)) {
if (NULL == cb) {
sprintf(tmp_out, "\n\t--- BAD CALLBACK POINTER " ORTE_SIZE_T_PRINTF " ---", i);
sprintf(tmp_out, "\n\t--- BAD CALLBACK POINTER %lu ---",
(unsigned long) i);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
return ORTE_SUCCESS;
}
sprintf(tmp_out, "\nInfo for callback " ORTE_SIZE_T_PRINTF, i);
sprintf(tmp_out, "\nInfo for callback %lu", (unsigned long) i);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
if (NULL == cb->requestor) {
sprintf(tmp_out, "Local requestor");
} else {
sprintf(tmp_out, "Requestor: [%d,%d,%d]", ORTE_NAME_ARGS(cb->requestor));
sprintf(tmp_out, "Requestor: [%lu,%lu,%lu]",
ORTE_NAME_ARGS(cb->requestor));
}
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
j = ompi_list_get_size(&(cb->messages));
sprintf(tmp_out, "Num messages: " ORTE_SIZE_T_PRINTF, j);
sprintf(tmp_out, "Num messages: %lu", (unsigned long) j);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
for (k=0, item = ompi_list_get_first(&(cb->messages));
item != ompi_list_get_end(&(cb->messages));
item = ompi_list_get_next(item), k++) {
msg = (orte_gpr_replica_notify_msg_list_t*)item;
sprintf(tmp_out, "\n\nInfo for message " ORTE_SIZE_T_PRINTF
" sending " ORTE_SIZE_T_PRINTF
" data objects to notifier id " ORTE_SIZE_T_PRINTF,
k, (msg->message)->cnt, (msg->message)->idtag);
sprintf(tmp_out, "\n\nInfo for message %lu sending %lu "
" data objects to notifier id %lu",
(unsigned long) k, (unsigned long) (msg->message)->cnt,
(unsigned long) (msg->message)->idtag);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
orte_gpr_base_dump_notify_msg(buffer, msg->message);
}
@ -242,7 +246,7 @@ int orte_gpr_replica_dump_triggers_fn(orte_buffer_t *buffer)
if (NULL != trig[j]) k++;
}
sprintf(tmp_out, "Number of triggers: " ORTE_SIZE_T_PRINTF "\n", k);
sprintf(tmp_out, "Number of triggers: %lu\n", (unsigned long) k);
orte_gpr_replica_dump_load_string(buffer, &tmp);
/* dump the trigger info for the registry */
@ -270,18 +274,17 @@ static void orte_gpr_replica_dump_trigger(orte_buffer_t *buffer, size_t cnt,
return;
}
sprintf(tmp_out, "\nData for trigger " ORTE_SIZE_T_PRINTF, cnt);
sprintf(tmp_out, "\nData for trigger %lu", (unsigned long) cnt);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
/* output recipient info */
if (NULL == trig->requestor) {
sprintf(tmp_out, "\tIntended recipient: LOCAL @ notifier idtag "
ORTE_SIZE_T_PRINTF,
trig->index);
sprintf(tmp_out, "\tIntended recipient: LOCAL @ notifier idtag %lu",
(unsigned long) trig->index);
} else {
sprintf(tmp_out, "\tIntended recipient: [%d,%d,%d] @ notifier idtag "
ORTE_SIZE_T_PRINTF,
ORTE_NAME_ARGS(trig->requestor), trig->remote_idtag);
sprintf(tmp_out, "\tIntended recipient: [%lu,%lu,%lu] @ notifier idtag %lu",
ORTE_NAME_ARGS(trig->requestor),
(unsigned long) trig->remote_idtag);
}
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
@ -348,7 +351,8 @@ static void orte_gpr_replica_dump_trigger(orte_buffer_t *buffer, size_t cnt,
sprintf(tmp_out, "\t\tNULL token (wildcard)");
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
} else {
sprintf(tmp_out, "\t\tNumber of tokens: " ORTE_SIZE_T_PRINTF, k);
sprintf(tmp_out, "\t\tNumber of tokens: %lu",
(unsigned long) k);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
for (j=0; j < k; j++) {
@ -390,7 +394,7 @@ static void orte_gpr_replica_dump_trigger(orte_buffer_t *buffer, size_t cnt,
sprintf(tmp_out, "\t\tNULL key (wildcard)");
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
} else {
sprintf(tmp_out, "\t\tNumber of keys: " ORTE_SIZE_T_PRINTF, k);
sprintf(tmp_out, "\t\tNumber of keys: %lu", (unsigned long) k);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
for (j=0; j < k; j++) {
@ -432,9 +436,11 @@ static void orte_gpr_replica_dump_trigger(orte_buffer_t *buffer, size_t cnt,
if (0 < trig->num_counters) {
if (ORTE_GPR_TRIG_AT_LEVEL & trig->action) {
sprintf(tmp_out, "\tTrigger monitoring " ORTE_SIZE_T_PRINTF " counters for level", trig->num_counters);
sprintf(tmp_out, "\tTrigger monitoring %lu counters for level",
(unsigned long) trig->num_counters);
} else {
sprintf(tmp_out, "\tTrigger monitoring " ORTE_SIZE_T_PRINTF " counters for compare", trig->num_counters);
sprintf(tmp_out, "\tTrigger monitoring %lu counters for compare",
(unsigned long) trig->num_counters);
}
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
cntr = (orte_gpr_replica_counter_t**)((trig->counters)->addr);
@ -442,8 +448,8 @@ static void orte_gpr_replica_dump_trigger(orte_buffer_t *buffer, size_t cnt,
if (NULL != cntr[i] &&
ORTE_SUCCESS == orte_gpr_replica_dict_reverse_lookup(&token, cntr[i]->seg,
(cntr[i]->iptr)->itag)) {
sprintf(tmp_out, "\t\tCounter: " ORTE_SIZE_T_PRINTF "\tSegment: %s\tName: %s", i,
(cntr[i]->seg)->name, token);
sprintf(tmp_out, "\t\tCounter: %lu\tSegment: %s\tName: %s",
(unsigned long) i, (cntr[i]->seg)->name, token);
free(token);
orte_gpr_replica_dump_load_string(buffer, &tmp_out);
if (ORTE_GPR_TRIG_AT_LEVEL & trig->action) {
@ -484,8 +490,8 @@ void orte_gpr_replica_dump_itagval_value(orte_buffer_t *buffer,
break;
case ORTE_SIZE:
sprintf(tmp, "\t\tData type: ORTE_SIZE\tValue: " ORTE_SIZE_T_PRINTF,
iptr->value.size);
sprintf(tmp, "\t\tData type: ORTE_SIZE\tValue: %lu",
(unsigned long) iptr->value.size);
break;
case ORTE_PID:
@ -534,31 +540,28 @@ void orte_gpr_replica_dump_itagval_value(orte_buffer_t *buffer,
#endif
case ORTE_BYTE_OBJECT:
sprintf(tmp, "\t\tData type: ORTE_BYTE_OBJECT\tSize: " ORTE_SIZE_T_PRINTF,
(iptr->value.byteobject).size);
sprintf(tmp, "\t\tData type: ORTE_BYTE_OBJECT\tSize: %lu",
(unsigned long) (iptr->value.byteobject).size);
break;
case ORTE_NAME:
sprintf(tmp, "\t\tData type: ORTE_NAME\tValue: ["
ORTE_SIZE_T_PRINTF ","
ORTE_SIZE_T_PRINTF ","
ORTE_SIZE_T_PRINTF "]",
ORTE_NAME_ARGS(&(iptr->value.proc)));
sprintf(tmp, "\t\tData type: ORTE_NAME\tValue: [%lu,%lu,%lu]",
ORTE_NAME_ARGS(&(iptr->value.proc)));
break;
case ORTE_VPID:
sprintf(tmp, "\t\tData type: ORTE_VPID\tValue: " ORTE_SIZE_T_PRINTF,
iptr->value.vpid);
sprintf(tmp, "\t\tData type: ORTE_VPID\tValue: %lu",
(unsigned long) iptr->value.vpid);
break;
case ORTE_JOBID:
sprintf(tmp, "\t\tData type: ORTE_JOBID\tValue: " ORTE_SIZE_T_PRINTF,
iptr->value.jobid);
sprintf(tmp, "\t\tData type: ORTE_JOBID\tValue: %lu",
(unsigned long) iptr->value.jobid);
break;
case ORTE_CELLID:
sprintf(tmp, "\t\tData type: ORTE_CELLID\tValue: " ORTE_SIZE_T_PRINTF,
iptr->value.cellid);
sprintf(tmp, "\t\tData type: ORTE_CELLID\tValue: %lu",
(unsigned long) iptr->value.cellid);
break;
case ORTE_NODE_STATE:

8
src/mca/gpr/replica/functional_layer/gpr_replica_messaging_fn.c
Просмотреть файл

@ -93,7 +93,7 @@ int orte_gpr_replica_process_callbacks(void)
}
} else { /* remote request - send messages back */
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "process_callbacks: remote to [%d,%d,%d]",
ompi_output(0, "process_callbacks: remote to [%lu,%lu,%lu]",
ORTE_NAME_ARGS(cb->requestor));
}
orte_gpr_replica_remote_notify(cb->requestor, &(cb->messages));
@ -181,7 +181,7 @@ int orte_gpr_replica_register_callback(orte_gpr_replica_triggers_t *trig)
if (NULL == trig->requestor) { /* local request - queue local callback */
cb->requestor = NULL;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] process_trig: queueing local message\n",
ompi_output(0, "[%lu,%lu,%lu] process_trig: queueing local message\n",
ORTE_NAME_ARGS(orte_process_info.my_name));
}
@ -192,7 +192,7 @@ int orte_gpr_replica_register_callback(orte_gpr_replica_triggers_t *trig)
return rc;
}
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] process_trig: queueing message for [%d,%d,%d] using remoteid %d\n",
ompi_output(0, "[%lu,%lu,%lu] process_trig: queueing message for [%lu,%lu,%lu] using remoteid %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), ORTE_NAME_ARGS(cb->requestor),
(int)trig->remote_idtag);
}
@ -228,7 +228,7 @@ int orte_gpr_replica_register_callback(orte_gpr_replica_triggers_t *trig)
}
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica-process_trig: complete",
ompi_output(0, "[%lu,%lu,%lu] gpr replica-process_trig: complete",
ORTE_NAME_ARGS(orte_process_info.my_name));
}

8
src/mca/gpr/replica/functional_layer/gpr_replica_put_get_fn.c
Просмотреть файл

@ -138,7 +138,7 @@ int orte_gpr_replica_put_fn(orte_gpr_addr_mode_t addr_mode,
size_t i, j, num_found;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica: put entered on segment %s\nValues:",
ompi_output(0, "[%lu,%lu,%lu] gpr replica: put entered on segment %s\nValues:",
ORTE_NAME_ARGS(orte_process_info.my_name), seg->name);
for (i=0; i < cnt; i++) {
ompi_output(0, "\tKey: %s", keyvals[i]->key);
@ -229,7 +229,7 @@ int orte_gpr_replica_put_fn(orte_gpr_addr_mode_t addr_mode,
}
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica-put: complete", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] gpr replica-put: complete", ORTE_NAME_ARGS(orte_process_info.my_name));
}
return ORTE_SUCCESS;
@ -264,7 +264,7 @@ int orte_gpr_replica_get_fn(orte_gpr_addr_mode_t addr_mode,
char *token;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica: get entered", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] gpr replica: get entered", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "\tGetting data from segment %s wiht %d tokens and %d keys",
seg->name, num_tokens, num_keys);
for (i=0; i < num_tokens; i++) {
@ -428,7 +428,7 @@ CLEANUP:
OBJ_DESTRUCT(&get_list);
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica-get: finished search", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] gpr replica-get: finished search", ORTE_NAME_ARGS(orte_process_info.my_name));
}
return rc;

4
src/mca/gpr/replica/functional_layer/gpr_replica_subscribe_fn.c
Просмотреть файл

@ -52,7 +52,7 @@ int orte_gpr_replica_subscribe_fn(orte_gpr_notify_action_t action, size_t num_su
bool found;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica: subscribe entered - registering idtag %d",
ompi_output(0, "[%lu,%lu,%lu] gpr replica: subscribe entered - registering idtag %d",
ORTE_NAME_ARGS(orte_process_info.my_name), idtag);
ompi_output(0, "Received %d subscriptions", num_subs);
for (i=0; i < num_subs; i++) {
@ -312,7 +312,7 @@ int orte_gpr_replica_unsubscribe_fn(orte_gpr_notify_id_t sub_number)
orte_gpr_replica_triggers_t *trig;
if (orte_gpr_replica_globals.debug) {
ompi_output(0, "[%d,%d,%d] gpr replica: unsubscribe entered for sub number %d",
ompi_output(0, "[%lu,%lu,%lu] gpr replica: unsubscribe entered for sub number %d",
ORTE_NAME_ARGS(orte_process_info.my_name), sub_number);
}

5
src/mca/gpr/replica/gpr_replica.h
Просмотреть файл

@ -40,7 +40,10 @@
* typedefs needed in replica component
*/
#define ORTE_GPR_REPLICA_MAX_SIZE SIZE_MAX
/* JMS: This is only INT_MAX until bug 1345 is fixed, because this
value is used to set an MAC parameter, which can [currently] only
take an int. */
#define ORTE_GPR_REPLICA_MAX_SIZE INT_MAX
#define ORTE_GPR_REPLICA_BLOCK_SIZE 100

2
src/mca/iof/svc/iof_svc_proxy.c
Просмотреть файл

@ -130,7 +130,7 @@ static void orte_iof_svc_proxy_msg(
/* source match */
if(orte_ns.compare(sub->src_mask,&sub->src_name,&hdr->msg_src) == 0) {
if(mca_iof_svc_component.svc_debug > 1) {
ompi_output(0, "[%d,%d,%d] orte_iof_svc_proxy_msg: tag %d sequence %d\n",
ompi_output(0, "[%lu,%lu,%lu] orte_iof_svc_proxy_msg: tag %d sequence %d\n",
ORTE_NAME_ARGS(&sub->src_name),hdr->msg_tag,hdr->msg_seq);
}
orte_iof_svc_sub_forward(sub,src,hdr,data);

14
src/mca/ns/base/ns_base_local_fns.c
Просмотреть файл

@ -190,7 +190,7 @@ int orte_ns_base_get_proc_name_string(char **name_string,
return ORTE_ERR_BAD_PARAM;
}
if (0 > asprintf(name_string, "%0X.%0X.%0X", name->cellid, name->jobid, name->vpid)) {
if (0 > asprintf(name_string, "%lu.%lu.%lu", name->cellid, name->jobid, name->vpid)) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
}
@ -284,7 +284,7 @@ int orte_ns_base_get_vpid_string(char **vpid_string, const orte_process_name_t*
return ORTE_ERR_BAD_PARAM;
}
if (0 > asprintf(vpid_string, ORTE_SIZE_T_PRINTF, name->vpid)) {
if (0 > asprintf(vpid_string, "%lu", (unsigned long) name->vpid)) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
}
@ -297,7 +297,7 @@ int orte_ns_base_convert_vpid_to_string(char **vpid_string, const orte_vpid_t vp
{
*vpid_string = NULL;
if (0 > asprintf(vpid_string, ORTE_SIZE_T_PRINTF, vpid)) {
if (0 > asprintf(vpid_string, "%lu", (unsigned long) vpid)) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
}
@ -339,7 +339,7 @@ int orte_ns_base_get_jobid_string(char **jobid_string, const orte_process_name_t
return ORTE_ERR_BAD_PARAM;
}
if (0 > asprintf(jobid_string, ORTE_SIZE_T_PRINTF, name->jobid)) {
if (0 > asprintf(jobid_string, "%lu", (unsigned long) name->jobid)) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
}
@ -352,7 +352,7 @@ int orte_ns_base_convert_jobid_to_string(char **jobid_string, const orte_jobid_t
{
*jobid_string = NULL;
if (0 > asprintf(jobid_string, ORTE_SIZE_T_PRINTF, jobid)) {
if (0 > asprintf(jobid_string, "%lu", (unsigned long) jobid)) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
}
@ -394,7 +394,7 @@ int orte_ns_base_get_cellid_string(char **cellid_string, const orte_process_name
return ORTE_ERR_BAD_PARAM;
}
if (0 > asprintf(cellid_string, ORTE_SIZE_T_PRINTF, name->cellid)) {
if (0 > asprintf(cellid_string, "%lu", (unsigned long) name->cellid)) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
}
@ -407,7 +407,7 @@ int orte_ns_base_convert_cellid_to_string(char **cellid_string, const orte_celli
{
*cellid_string = NULL;
if (0 > asprintf(cellid_string, ORTE_SIZE_T_PRINTF, cellid)) {
if (0 > asprintf(cellid_string, "%lu", (unsigned long) cellid)) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
}

4
src/mca/ns/base/ns_base_nds_env.c
Просмотреть файл

@ -185,7 +185,7 @@ int orte_ns_nds_env_put(const orte_process_name_t* name,
free(param);
free(vpid);
asprintf(&value, ORTE_SIZE_T_PRINTF, vpid_start);
asprintf(&value, "%lu", (unsigned long) vpid_start);
if(NULL == (param = mca_base_param_environ_variable("ns","nds","vpid_start"))) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;
@ -194,7 +194,7 @@ int orte_ns_nds_env_put(const orte_process_name_t* name,
free(param);
free(value);
asprintf(&value, ORTE_SIZE_T_PRINTF, num_procs);
asprintf(&value, "%lu", (unsigned long) num_procs);
if(NULL == (param = mca_base_param_environ_variable("ns","nds","num_procs"))) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;

9
src/mca/ns/ns_types.h
Просмотреть файл

@ -41,9 +41,9 @@
#include "class/ompi_list.h"
#define ORTE_NAME_ARGS(n) \
((NULL == n) ? -1 : (ssize_t)(n)->cellid), \
((NULL == n) ? -1 : (ssize_t)(n)->jobid), \
((NULL == n) ? -1 : (ssize_t)(n)->vpid)
(unsigned long) ((NULL == n) ? -1 : (ssize_t)(n)->cellid), \
(unsigned long) ((NULL == n) ? -1 : (ssize_t)(n)->jobid), \
(unsigned long) ((NULL == n) ? -1 : (ssize_t)(n)->vpid)
/*
@ -67,6 +67,9 @@
* general typedefs & structures
*/
/** Set the allowed range for ids in each space
*
* NOTE: Be sure to update the ORTE_NAME_ARGS #define (above) and all
* uses of it if these types change to be larger than (unsigned long)!
*/
typedef size_t orte_jobid_t;
typedef size_t orte_cellid_t;

30
src/mca/oob/tcp/oob_tcp.c
Просмотреть файл

@ -259,7 +259,7 @@ static void mca_oob_tcp_accept(void)
/* log the accept */
if(mca_oob_tcp_component.tcp_debug) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_accept: %s:%d\n",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_accept: %s:%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
inet_ntoa(addr.sin_addr),
addr.sin_port);
@ -351,7 +351,7 @@ static void mca_oob_tcp_recv_probe(int sd, mca_oob_tcp_hdr_t* hdr)
if(retval < 0) {
IMPORTANT_WINDOWS_COMMENT();
if(ompi_socket_errno != EINTR && ompi_socket_errno != EAGAIN && ompi_socket_errno != EWOULDBLOCK) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_recv_probe: send() failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_recv_probe: send() failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(hdr->msg_src)),
ompi_socket_errno);
@ -376,12 +376,12 @@ static void mca_oob_tcp_recv_connect(int sd, mca_oob_tcp_hdr_t* hdr)
/* now set socket up to be non-blocking */
if((flags = fcntl(sd, F_GETFL, 0)) < 0) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_recv_handler: fcntl(F_GETFL) failed with errno=%d",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: fcntl(F_GETFL) failed with errno=%d",
ORTE_NAME_ARGS(orte_process_info.my_name), ompi_socket_errno);
} else {
flags |= O_NONBLOCK;
if(fcntl(sd, F_SETFL, flags) < 0) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_recv_handler: fcntl(F_SETFL) failed with errno=%d",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: fcntl(F_SETFL) failed with errno=%d",
ORTE_NAME_ARGS(orte_process_info.my_name), ompi_socket_errno);
}
}
@ -405,7 +405,7 @@ static void mca_oob_tcp_recv_connect(int sd, mca_oob_tcp_hdr_t* hdr)
/* lookup the corresponding process */
peer = mca_oob_tcp_peer_lookup(&hdr->msg_src);
if(NULL == peer) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_recv_handler: unable to locate peer",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: unable to locate peer",
ORTE_NAME_ARGS(orte_process_info.my_name));
close(sd);
return;
@ -413,8 +413,8 @@ static void mca_oob_tcp_recv_connect(int sd, mca_oob_tcp_hdr_t* hdr)
/* is the peer instance willing to accept this connection */
if(mca_oob_tcp_peer_accept(peer, sd) == false) {
if(mca_oob_tcp_component.tcp_debug > 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_recv_handler: "
"rejected connection from [%d,%d,%d] connection state %d",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_recv_handler: "
"rejected connection from [%lu,%lu,%lu] connection state %d",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ORTE_NAME_ARGS(&(hdr->msg_src)),
@ -447,14 +447,14 @@ static void mca_oob_tcp_recv_handler(int sd, short flags, void* user)
while((rc = recv(sd, (char *)&hdr, sizeof(hdr), 0)) != sizeof(hdr)) {
if(rc >= 0) {
if(mca_oob_tcp_component.tcp_debug > 1) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_recv_handler: peer closed connection",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: peer closed connection",
ORTE_NAME_ARGS(orte_process_info.my_name));
}
close(sd);
return;
}
if(ompi_socket_errno != EINTR) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_recv_handler: recv() failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: recv() failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), ompi_socket_errno);
close(sd);
return;
@ -471,7 +471,7 @@ static void mca_oob_tcp_recv_handler(int sd, short flags, void* user)
mca_oob_tcp_recv_connect(sd, &hdr);
break;
default:
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_recv_handler: invalid message type: %d\n", hdr.msg_type);
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_recv_handler: invalid message type: %d\n", hdr.msg_type);
close(sd);
break;
}
@ -534,7 +534,7 @@ void mca_oob_tcp_registry_callback(
{
size_t i;
if(mca_oob_tcp_component.tcp_debug > 1) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_registry_callback\n",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_registry_callback\n",
ORTE_NAME_ARGS(orte_process_info.my_name));
}
@ -568,13 +568,13 @@ void mca_oob_tcp_registry_callback(
addr = mca_oob_tcp_addr_unpack(&buffer);
OBJ_DESTRUCT(&buffer);
if(NULL == addr) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_registry_callback: unable to unpack peer address\n",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_registry_callback: unable to unpack peer address\n",
ORTE_NAME_ARGS(orte_process_info.my_name));
continue;
}
if(mca_oob_tcp_component.tcp_debug > 1) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_registry_callback: received peer [%d,%d,%d]\n",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_registry_callback: received peer [%lu,%lu,%lu]\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(addr->addr_name)));
}
@ -768,7 +768,7 @@ int mca_oob_tcp_init(void)
OMPI_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
if(mca_oob_tcp_component.tcp_debug > 2) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_init: calling orte_gpr.subscribe\n",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_init: calling orte_gpr.subscribe\n",
ORTE_NAME_ARGS(orte_process_info.my_name));
}
@ -912,7 +912,7 @@ int mca_oob_tcp_init(void)
}
if(mca_oob_tcp_component.tcp_debug > 2) {
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_init: calling orte_gpr.put(%s)\n",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_init: calling orte_gpr.put(%s)\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
value->segment);
}

10
src/mca/oob/tcp/oob_tcp_msg.c
Просмотреть файл

@ -182,7 +182,7 @@ bool mca_oob_tcp_msg_send_handler(mca_oob_tcp_msg_t* msg, struct mca_oob_tcp_pee
else if (ompi_socket_errno == EAGAIN || ompi_socket_errno == EWOULDBLOCK)
return false;
else {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_msg_send_handler: writev failed with errno=%d",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_msg_send_handler: writev failed with errno=%d",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
@ -229,7 +229,7 @@ bool mca_oob_tcp_msg_recv_handler(mca_oob_tcp_msg_t* msg, struct mca_oob_tcp_pee
if(msg->msg_hdr.msg_size > 0) {
msg->msg_rwbuf = malloc(msg->msg_hdr.msg_size);
if(NULL == msg->msg_rwbuf) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_msg_recv_handler: malloc(%d) failed\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_msg_recv_handler: malloc(%d) failed\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
msg->msg_hdr.msg_size);
@ -281,7 +281,7 @@ static bool mca_oob_tcp_msg_recv(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* pee
else if (ompi_socket_errno == EAGAIN || ompi_socket_errno == EWOULDBLOCK)
return false;
else {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_msg_recv: readv failed with errno=%d",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_msg_recv: readv failed with errno=%d",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
@ -290,7 +290,7 @@ static bool mca_oob_tcp_msg_recv(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* pee
}
} else if (rc == 0) {
if(mca_oob_tcp_component.tcp_debug > 3) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_msg_recv: peer closed connection",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_msg_recv: peer closed connection",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
@ -334,7 +334,7 @@ void mca_oob_tcp_msg_recv_complete(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* p
mca_oob_tcp_msg_data(msg,peer);
break;
default:
ompi_output(0, "[%d,%d,%d] mca_oob_tcp_msg_recv_complete: invalid message type: %d\n",
ompi_output(0, "[%lu,%lu,%lu] mca_oob_tcp_msg_recv_complete: invalid message type: %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), msg->msg_hdr.msg_type);
MCA_OOB_TCP_MSG_RETURN(msg);
break;

42
src/mca/oob/tcp/oob_tcp_peer.c
Просмотреть файл

@ -282,7 +282,7 @@ static int mca_oob_tcp_peer_start_connect(mca_oob_tcp_peer_t* peer)
if (peer->peer_sd < 0) {
struct timeval tv = { 1,0 };
ompi_output(0,
"[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_start_connect: socket() failed with errno=%d\n",
"[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_start_connect: socket() failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
@ -296,14 +296,14 @@ static int mca_oob_tcp_peer_start_connect(mca_oob_tcp_peer_t* peer)
/* setup the socket as non-blocking */
if((flags = fcntl(peer->peer_sd, F_GETFL, 0)) < 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_connect: fcntl(F_GETFL) failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_connect: fcntl(F_GETFL) failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
} else {
flags |= O_NONBLOCK;
if(fcntl(peer->peer_sd, F_SETFL, flags) < 0)
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_connect: fcntl(F_SETFL) failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_connect: fcntl(F_SETFL) failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
@ -311,7 +311,7 @@ static int mca_oob_tcp_peer_start_connect(mca_oob_tcp_peer_t* peer)
/* pick an address in round-robin fashion from the list exported by the peer */
if((rc = mca_oob_tcp_addr_get_next(peer->peer_addr, &inaddr)) != OMPI_SUCCESS) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_start_connect: mca_oob_tcp_addr_get_next failed with error=%d",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_start_connect: mca_oob_tcp_addr_get_next failed with error=%d",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
rc);
@ -319,7 +319,7 @@ static int mca_oob_tcp_peer_start_connect(mca_oob_tcp_peer_t* peer)
}
if(mca_oob_tcp_component.tcp_debug > 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_start_connect: connecting port %d to: %s:%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_start_connect: connecting port %d to: %s:%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ntohs(mca_oob_tcp_component.tcp_listen_port),
@ -335,7 +335,7 @@ static int mca_oob_tcp_peer_start_connect(mca_oob_tcp_peer_t* peer)
ompi_event_add(&peer->peer_send_event, 0);
return OMPI_SUCCESS;
}
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_start_connect: connect failed with errno=%d",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_start_connect: connect failed with errno=%d",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
@ -349,7 +349,7 @@ static int mca_oob_tcp_peer_start_connect(mca_oob_tcp_peer_t* peer)
ompi_event_add(&peer->peer_recv_event, 0);
} else {
ompi_output(0,
"[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_start_connect: "
"[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_start_connect: "
"mca_oob_tcp_peer_send_connect_ack failed with errno=%d",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
@ -375,7 +375,7 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer)
/* check connect completion status */
if(getsockopt(peer->peer_sd, SOL_SOCKET, SO_ERROR, (char *)&so_error, &so_length) < 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_complete_connect: getsockopt() failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_complete_connect: getsockopt() failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
@ -387,7 +387,7 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer)
return;
} else if (so_error == ECONNREFUSED || so_error == ETIMEDOUT) {
struct timeval tv = { 1,0 };
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_complete_connect: "
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_complete_connect: "
"connection failed (errno=%d) - retrying (pid=%d)\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
@ -396,7 +396,7 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer)
ompi_evtimer_add(&peer->peer_timer_event, &tv);
return;
} else if(so_error != 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_complete_connect: connect() failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_complete_connect: connect() failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
so_error);
@ -408,7 +408,7 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer)
peer->peer_state = MCA_OOB_TCP_CONNECT_ACK;
ompi_event_add(&peer->peer_recv_event, 0);
} else {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_complete_connect: unable to send connect ack.",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_complete_connect: unable to send connect ack.",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)));
mca_oob_tcp_peer_close(peer);
@ -440,7 +440,7 @@ static void mca_oob_tcp_peer_connected(mca_oob_tcp_peer_t* peer)
void mca_oob_tcp_peer_close(mca_oob_tcp_peer_t* peer)
{
if(mca_oob_tcp_component.tcp_debug > 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_close(%p) sd %d state %d\n",
ompi_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(&(peer->peer_name)),
peer,
@ -527,7 +527,7 @@ static int mca_oob_tcp_peer_recv_connect_ack(mca_oob_tcp_peer_t* peer)
/* compare the peers name to the expected value */
if(memcmp(&peer->peer_name, &hdr.msg_src, sizeof(orte_process_name_t)) != 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_recv_connect_ack: "
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_recv_connect_ack: "
"received unexpected process identifier [%d,%d,%d]\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
@ -564,7 +564,7 @@ static int mca_oob_tcp_peer_recv_blocking(mca_oob_tcp_peer_t* peer, void* data,
/* remote closed connection */
if(retval == 0) {
if(mca_oob_tcp_component.tcp_debug > 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_recv_blocking: "
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_recv_blocking: "
"peer closed connection: peer state %d",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
@ -578,7 +578,7 @@ static int mca_oob_tcp_peer_recv_blocking(mca_oob_tcp_peer_t* peer, void* data,
if(retval < 0) {
IMPORTANT_WINDOWS_COMMENT();
if(ompi_socket_errno != EINTR && ompi_socket_errno != EAGAIN && ompi_socket_errno != EWOULDBLOCK) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_recv_blocking: recv() failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_recv_blocking: recv() failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
errno);
@ -605,7 +605,7 @@ static int mca_oob_tcp_peer_send_blocking(mca_oob_tcp_peer_t* peer, void* data,
if(retval < 0) {
IMPORTANT_WINDOWS_COMMENT();
if(ompi_socket_errno != EINTR && ompi_socket_errno != EAGAIN && ompi_socket_errno != EWOULDBLOCK) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_send_blocking: send() failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_send_blocking: send() failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
ompi_socket_errno);
@ -670,7 +670,7 @@ static void mca_oob_tcp_peer_recv_handler(int sd, short flags, void* user)
mca_oob_tcp_msg_t* msg;
MCA_OOB_TCP_MSG_ALLOC(msg, rc);
if(NULL == msg) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_recv_handler: unable to allocate recv message\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_recv_handler: unable to allocate recv message\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)));
return;
@ -702,7 +702,7 @@ static void mca_oob_tcp_peer_recv_handler(int sd, short flags, void* user)
}
default:
{
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_recv_handler: invalid socket state(%d)",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_recv_handler: invalid socket state(%d)",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
peer->peer_state);
@ -749,7 +749,7 @@ static void mca_oob_tcp_peer_send_handler(int sd, short flags, void* user)
break;
}
default:
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_send_handler: invalid connection state (%d)",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_send_handler: invalid connection state (%d)",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
peer->peer_state);
@ -807,7 +807,7 @@ static void mca_oob_tcp_peer_dump(mca_oob_tcp_peer_t* peer, const char* msg)
nodelay = 0;
#endif
sprintf(buff, "[%d,%d,%d]-[%d,%d,%d] %s: %s - %s nodelay %d sndbuf %d rcvbuf %d flags %08x\n",
sprintf(buff, "[%lu,%lu,%lu]-[%lu,%lu,%lu] %s: %s - %s nodelay %d sndbuf %d rcvbuf %d flags %08x\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
msg, src, dst, nodelay, sndbuf, rcvbuf, flags);
@ -836,7 +836,7 @@ bool mca_oob_tcp_peer_accept(mca_oob_tcp_peer_t* peer, int sd)
mca_oob_tcp_peer_event_init(peer);
if(mca_oob_tcp_peer_send_connect_ack(peer) != OMPI_SUCCESS) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_peer_accept: "
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_accept: "
"mca_oob_tcp_peer_send_connect_ack failed\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)));

10
src/mca/oob/tcp/oob_tcp_ping.c
Просмотреть файл

@ -60,7 +60,7 @@ int mca_oob_tcp_ping(
/* parse uri string */
if(OMPI_SUCCESS != (rc = mca_oob_tcp_parse_uri(uri, &inaddr))) {
ompi_output(0,
"[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_ping: invalid uri: %s\n",
"[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_ping: invalid uri: %s\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(name),
uri);
@ -71,7 +71,7 @@ int mca_oob_tcp_ping(
sd = socket(AF_INET, SOCK_STREAM, 0);
if (sd < 0) {
ompi_output(0,
"[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_ping: socket() failed with errno=%d\n",
"[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_ping: socket() failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(name),
ompi_socket_errno);
@ -80,14 +80,14 @@ int mca_oob_tcp_ping(
/* setup the socket as non-blocking */
if((flags = fcntl(sd, F_GETFL, 0)) < 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_ping: fcntl(F_GETFL) failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_ping: fcntl(F_GETFL) failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(name),
ompi_socket_errno);
} else {
flags |= O_NONBLOCK;
if(fcntl(sd, F_SETFL, flags) < 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_ping: fcntl(F_SETFL) failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_ping: fcntl(F_SETFL) failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(name),
ompi_socket_errno);
@ -116,7 +116,7 @@ int mca_oob_tcp_ping(
/* set socket back to blocking */
flags &= ~O_NONBLOCK;
if(fcntl(sd, F_SETFL, flags) < 0) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_ping: fcntl(F_SETFL) failed with errno=%d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_ping: fcntl(F_SETFL) failed with errno=%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(name),
ompi_socket_errno);

2
src/mca/oob/tcp/oob_tcp_recv.c
Просмотреть файл

@ -42,7 +42,7 @@ int mca_oob_tcp_recv(
int i, rc = 0, size = 0;
if(mca_oob_tcp_component.tcp_debug > 3) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_recv: tag %d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_recv: tag %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(peer),
tag);

2
src/mca/oob/tcp/oob_tcp_send.c
Просмотреть файл

@ -73,7 +73,7 @@ int mca_oob_tcp_send(
return OMPI_ERR_UNREACH;
if(mca_oob_tcp_component.tcp_debug > 3) {
ompi_output(0, "[%d,%d,%d]-[%d,%d,%d] mca_oob_tcp_send: tag %d\n",
ompi_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_send: tag %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
ORTE_NAME_ARGS(&(peer->peer_name)),
tag);

4
src/mca/pls/bproc_seed/pls_bproc_seed.c
Просмотреть файл

@ -527,7 +527,7 @@ static int orte_pls_bproc_launch_app(
pid_t pid;
if(mca_pls_bproc_seed_component.debug) {
ompi_output(0, "orte_pls_bproc: starting: %d.%d.%d\n", ORTE_NAME_ARGS(&proc->proc_name));
ompi_output(0, "orte_pls_bproc: starting: [%lu,%lu,%lu]\n", ORTE_NAME_ARGS(&proc->proc_name));
}
rc = orte_pls_bproc_undump(proc, vpid_start, vpid_range, image, image_len, &pid);
if(ORTE_SUCCESS != rc) {
@ -542,7 +542,7 @@ static int orte_pls_bproc_launch_app(
orte_wait_cb(pid, orte_pls_bproc_wait_proc, proc);
if(mca_pls_bproc_seed_component.debug) {
ompi_output(0, "orte_pls_bproc: started: %d.%d.%d\n", ORTE_NAME_ARGS(&proc->proc_name));
ompi_output(0, "orte_pls_bproc: started: [%lu,%lu,%lu]\n", ORTE_NAME_ARGS(&proc->proc_name));
}
}

2
src/mca/pls/rsh/pls_rsh_module.c
Просмотреть файл

@ -266,7 +266,7 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
}
/* need integer value for command line parameter */
asprintf(&jobid_string, ORTE_SIZE_T_PRINTF, jobid);
asprintf(&jobid_string, "%lu", (unsigned long) jobid);
/*
* Build argv/env arrays.

14
src/mca/ptl/ib/src/ptl_ib_peer.c
Просмотреть файл

@ -196,7 +196,7 @@ static int mca_ptl_ib_peer_start_connect(mca_ptl_base_peer_t* peer)
&peer->lcl_qp_hndl,
&peer->lcl_qp_prop,
VAPI_TS_RC))) {
ompi_output(0, "[%d,%d,%d] %s:%d errcode %d\n",
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -204,7 +204,7 @@ static int mca_ptl_ib_peer_start_connect(mca_ptl_base_peer_t* peer)
/* Send connection info over to remote peer */
peer->peer_state = MCA_PTL_IB_CONNECTING;
if(OMPI_SUCCESS != (rc = mca_ptl_ib_peer_send_connect_req(peer))) {
ompi_output(0, "[%d,%d,%d] %s:%d errcode %d\n",
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -228,7 +228,7 @@ static int mca_ptl_ib_peer_reply_start_connect(mca_ptl_ib_peer_t *peer, orte_buf
&peer->lcl_qp_hndl,
&peer->lcl_qp_prop,
VAPI_TS_RC))) {
ompi_output(0, "[%d,%d,%d] %s:%d errcode %d\n",
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -239,14 +239,14 @@ static int mca_ptl_ib_peer_reply_start_connect(mca_ptl_ib_peer_t *peer, orte_buf
/* Connect to peer */
rc = mca_ptl_ib_peer_connect(peer);
if(rc != OMPI_SUCCESS) {
ompi_output(0, "[%d,%d,%d] %s:%d errcode %d\n",
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
/* Send connection info over to remote peer */
if(OMPI_SUCCESS != (rc = mca_ptl_ib_peer_send_connect_req(peer))) {
ompi_output(0, "[%d,%d,%d] %s:%d errcode %d\n",
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -310,7 +310,7 @@ static void mca_ptl_ib_peer_recv(
* and then reply with our QP information */
if(OMPI_SUCCESS != (rc = mca_ptl_ib_peer_reply_start_connect(ib_peer, buffer))) {
ompi_output(0, "[%d,%d,%d] %s:%d errcode %d\n",
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
break;
}
@ -323,7 +323,7 @@ static void mca_ptl_ib_peer_recv(
mca_ptl_ib_peer_set_remote_info(ib_peer, buffer);
if(OMPI_SUCCESS != (rc = mca_ptl_ib_peer_connect(ib_peer))) {
ompi_output(0, "[%d,%d,%d] %s:%d errcode %d\n",
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
break;
}

2
src/mca/rmgr/proxy/rmgr_proxy.c
Просмотреть файл

@ -243,7 +243,7 @@ static void orte_rmgr_proxy_callback(orte_gpr_notify_data_t *data, void *cbdata)
/* get the jobid from the segment name */
if (ORTE_SUCCESS != (rc = orte_schema.extract_jobid_from_segment_name(&jobid, data->segment))) {
ORTE_ERROR_LOG(rc);
ompi_output(0, "[%d,%d,%d] orte_rmgr_proxy_callback: %s\n",
ompi_output(0, "[%lu,%lu,%lu] orte_rmgr_proxy_callback: %s\n",
ORTE_NAME_ARGS(orte_process_info.my_name), data->segment);
return;
}

2
src/mca/schema/base/schema_base_fns.c
Просмотреть файл

@ -152,7 +152,7 @@ int orte_schema_base_extract_jobid_from_segment_name(orte_jobid_t *jobid, char *
jobstring++;
if (ORTE_SUCCESS != (rc = orte_ns.convert_string_to_jobid(&job, jobstring))) {
ORTE_ERROR_LOG(rc);
ompi_output(0, "[%d,%d,%d] %s\n", ORTE_NAME_ARGS(orte_process_info.my_name), jobstring);
ompi_output(0, "[%lu,%lu,%lu] %s\n", ORTE_NAME_ARGS(orte_process_info.my_name), jobstring);
return rc;
}
*jobid = job;

2
src/mpi/runtime/ompi_mpi_init.c
Просмотреть файл

@ -451,7 +451,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
ompi_mpi_initialized = true;
if (orte_debug_flag) {
ompi_output(0, "[%d,%d,%d] ompi_mpi_init completed",
ompi_output(0, "[%lu,%lu,%lu] ompi_mpi_init completed",
ORTE_NAME_ARGS(orte_process_info.my_name));
}

2
src/runtime/orte_init_stage1.c
Просмотреть файл

@ -277,7 +277,7 @@ int orte_init_stage1(void)
}
if (orte_debug_flag) {
ompi_output(0, "[%d,%d,%d] setting up session dir with",
ompi_output(0, "[%lu,%lu,%lu] setting up session dir with",
ORTE_NAME_ARGS(orte_process_info.my_name));
if (NULL != orte_process_info.tmpdir_base) {
ompi_output(0, "\ttmpdir %s", orte_process_info.tmpdir_base);

2
src/runtime/orte_monitor.c
Просмотреть файл

@ -46,7 +46,7 @@ static bool ompi_rte_waiting = false;
void orte_all_procs_registered(orte_gpr_notify_message_t* match, void* cbdata)
{
if (orte_debug_flag) {
ompi_output(0, "[%d,%d,%d] all procs registered",
ompi_output(0, "[%lu,%lu,%lu] all procs registered",
ORTE_NAME_ARGS(orte_process_info.my_name));
}

2
src/runtime/orte_restart.c
Просмотреть файл

@ -168,7 +168,7 @@ int orte_restart(orte_process_name_t *name, const char* uri)
}
if (orte_debug_flag) {
ompi_output(0, "[%d,%d,%d] setting up session dir with",
ompi_output(0, "[%lu,%lu,%lu] setting up session dir with",
ORTE_NAME_ARGS(orte_process_info.my_name));
if (NULL != orte_process_info.tmpdir_base) {
ompi_output(0, "\ttmpdir %s", orte_process_info.tmpdir_base);

14
src/tools/orted/orted.c
Просмотреть файл

@ -250,16 +250,16 @@ int main(int argc, char *argv[])
if (OMPI_SUCCESS != (ret = orte_write_universe_setup_file(contact_path, &orte_universe_info))) {
if (orted_globals.debug) {
ompi_output(0, "[%d,%d,%d] ompid: couldn't write setup file", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] ompid: couldn't write setup file", ORTE_NAME_ARGS(orte_process_info.my_name));
}
} else if (orted_globals.debug) {
ompi_output(0, "[%d,%d,%d] ompid: wrote setup file", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] ompid: wrote setup file", ORTE_NAME_ARGS(orte_process_info.my_name));
}
}
if (orted_globals.debug) {
ompi_output(0, "[%d,%d,%d] ompid: issuing callback", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] ompid: issuing callback", ORTE_NAME_ARGS(orte_process_info.my_name));
}
/* register the daemon main callback function */
@ -274,7 +274,7 @@ int main(int argc, char *argv[])
*/
if (orted_globals.debug) {
ompi_output(0, "[%d,%d,%d] ompid: setting up event monitor", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] ompid: setting up event monitor", ORTE_NAME_ARGS(orte_process_info.my_name));
}
/* setup and enter the event monitor */
@ -287,7 +287,7 @@ int main(int argc, char *argv[])
OMPI_THREAD_UNLOCK(&orted_globals.mutex);
if (orted_globals.debug) {
ompi_output(0, "[%d,%d,%d] ompid: mutex cleared - finalizing", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] ompid: mutex cleared - finalizing", ORTE_NAME_ARGS(orte_process_info.my_name));
}
/* cleanup */
@ -302,7 +302,7 @@ int main(int argc, char *argv[])
orte_finalize();
if (orted_globals.debug) {
ompi_output(0, "[%d,%d,%d] ompid: done - exiting", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] ompid: done - exiting", ORTE_NAME_ARGS(orte_process_info.my_name));
}
exit(0);
@ -321,7 +321,7 @@ static void orte_daemon_recv(int status, orte_process_name_t* sender,
OMPI_THREAD_LOCK(&orted_globals.mutex);
if (orted_globals.debug) {
ompi_output(0, "[%d,%d,%d] ompid: received message", ORTE_NAME_ARGS(orte_process_info.my_name));
ompi_output(0, "[%lu,%lu,%lu] ompid: received message", ORTE_NAME_ARGS(orte_process_info.my_name));
}
answer = OBJ_NEW(orte_buffer_t);

4
test/mca/ns/ns_replica.c
Просмотреть файл

@ -108,7 +108,7 @@ int main(int argc, char **argv)
test_finalize();
exit(1);
} else {
fprintf(test_out, "got process name: %0X %0X %0X\n", ORTE_NAME_ARGS(test_name));
fprintf(test_out, "got process name: %lu %lu %lu\n", ORTE_NAME_ARGS(test_name));
test_success();
}
free(test_name);
@ -122,7 +122,7 @@ int main(int argc, char **argv)
test_finalize();
exit(1);
} else {
fprintf(test_out, "got process name: %0X %0X %0X\n",
fprintf(test_out, "got process name: %lu %lu %lu\n",
ORTE_NAME_ARGS(test_name));
test_success();
}