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

usnic: stomp format specifier warnings

Просмотр исходного кода 
The usnic BTL now builds cleanly under `--enable-picky` when `MSGDEBUG1`
is set.

Reviewed-by: jsquyres

cmr=v1.7.4:reviewer=jsquyres

This commit was SVN r29097.
Этот коммит содержится в:
Dave Goodell 2013-08-29 23:24:14 +00:00
родитель a552921171
Коммит c5a7e8a079
7 изменённых файлов: 28 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
ompi/mca/btl/usnic/btl_usnic.h
Просмотреть файл

@ -28,6 +28,7 @@
#include <sys/types.h>
#include <infiniband/verbs.h>
#include "opal_stdint.h"
#include "opal/class/opal_hash_table.h"
#include "opal/class/opal_hash_table.h"
#include "opal/mca/event/event.h"
@ -164,7 +165,7 @@ typedef mca_btl_base_recv_reg_t ompi_btl_usnic_recv_reg_t;
* everywhere)
*/
typedef uint64_t ompi_btl_usnic_seq_t;
#define UDSEQ "lu"
#define UDSEQ PRIu64
/**
* Register the usnic BTL MCA params

11
ompi/mca/btl/usnic/btl_usnic_ack.c
Просмотреть файл

@ -95,7 +95,7 @@ ompi_btl_usnic_handle_ack(
#if MSGDEBUG1
opal_output(0, " Checking ACK/sent_segs window %p, index %lu, seq %lu, occupied=%p, seg_room=%d",
(void*) endpoint->endpoint_sent_segs,
WINDOW_SIZE_MOD(is), is, sseg, (sseg?sseg->ss_hotel_room:-2));
WINDOW_SIZE_MOD(is), is, (void*)sseg, (sseg?sseg->ss_hotel_room:-2));
#endif
assert(sseg != NULL);
@ -130,8 +130,8 @@ ompi_btl_usnic_handle_ack(
/* when no bytes left to ACK, fragment send is truly done */
frag->sf_ack_bytes_left -= bytes_acked;
#if MSGDEBUG1
opal_output(0, " ACKED seg %p, frag %p, ack_bytes=%d, left=%d\n",
sseg, frag, bytes_acked, frag->sf_ack_bytes_left);
opal_output(0, " ACKED seg %p, frag %p, ack_bytes=%"PRIu32", left=%zd\n",
(void*)sseg, (void*)frag, bytes_acked, frag->sf_ack_bytes_left);
#endif
/* perform completion callback for PUT here */
@ -139,7 +139,7 @@ ompi_btl_usnic_handle_ack(
frag->sf_base.uf_dst_seg[0].seg_addr.pval != NULL) {
#if MSGDEBUG1
opal_output(0, "Calling back %p for PUT completion, frag=%p\n",
frag->sf_base.uf_base.des_cbfunc, frag);
(void*)(uintptr_t)frag->sf_base.uf_base.des_cbfunc, (void*)frag);
#endif
frag->sf_base.uf_base.des_cbfunc(&module->super, frag->sf_endpoint,
&frag->sf_base.uf_base, OMPI_SUCCESS);
@ -251,9 +251,8 @@ ompi_btl_usnic_ack_timeout(
#if MSGDEBUG2
{
static int num_timeouts = 0;
opal_output(0, "Send timeout! seg %p, room %d, seq %" UDSEQ "\n",
seg, seg->ss_hotel_room,
(void*)seg, seg->ss_hotel_room,
seg->ss_base.us_btl_header->seq);
}
#endif

2
ompi/mca/btl/usnic/btl_usnic_ack.h
Просмотреть файл

@ -55,7 +55,7 @@ ompi_btl_usnic_piggyback_ack(
sseg->ss_base.us_btl_header->ack_seq =
endpoint->endpoint_next_contig_seq_to_recv - 1;
#if MSGDEBUG1
opal_output(0, "Piggy-backing ACK for sequence %d\n",
opal_output(0, "Piggy-backing ACK for sequence %"UDSEQ"\n",
sseg->ss_base.us_btl_header->ack_seq);
#endif
} else {

18
ompi/mca/btl/usnic/btl_usnic_module.c
Просмотреть файл

@ -280,7 +280,7 @@ static int usnic_free(struct mca_btl_base_module_t* btl,
ompi_btl_usnic_frag_t* frag = (ompi_btl_usnic_frag_t*)des;
#if MSGDEBUG1
opal_output(0, "usnic_free: %p\n", frag);
opal_output(0, "usnic_free: %p\n", (void*)frag);
#endif
OMPI_FREE_LIST_RETURN_MT(frag->uf_freelist, &(frag->uf_base.super));
@ -488,7 +488,7 @@ usnic_put(
frag = (ompi_btl_usnic_send_frag_t *)des;
#if MSGDEBUG2
opal_output(0, "usnic_put: %d bytes to %p\n",
opal_output(0, "usnic_put: %"PRIu64" bytes to %p\n",
des->des_dst->seg_len,
des->des_dst->seg_addr.pval);
opal_output(0, " des_dst=%p, frag->uf_dst_seg=%p\n",
@ -857,7 +857,7 @@ usnic_handle_large_send(
abort();
}
#if MSGDEBUG1
opal_output(0, "send large, frag=%p, addr=%p\n", lfrag, sseg->ss_base.us_payload.raw);
opal_output(0, "send large, frag=%p, addr=%p\n", (void*)lfrag, (void*)sseg->ss_base.us_payload.raw);
#endif
/* save back pointer to fragment */
@ -932,7 +932,7 @@ usnic_handle_large_send(
lfrag->lsf_bytes_left -= payload_len;
#if MSGDEBUG1
opal_output(0, "payload_len = %d, bytes_left=%d\n",
opal_output(0, "payload_len = %zd, bytes_left=%zd\n",
payload_len, lfrag->lsf_bytes_left);
#endif
/* done with fragment? */
@ -944,8 +944,8 @@ usnic_handle_large_send(
if (frag->sf_base.uf_dst_seg[0].seg_addr.pval == NULL) {
#if MSGDEBUG1
opal_output(0, " calling back %p, len=%d\n",
frag->sf_base.uf_base.des_cbfunc,
opal_output(0, " calling back %p, len=%zd\n",
(void*)(uintptr_t)frag->sf_base.uf_base.des_cbfunc,
frag->sf_size);
#endif
frag->sf_base.uf_base.des_cbfunc(&module->super,
@ -1032,7 +1032,7 @@ ompi_btl_usnic_module_progress_sends(
sseg->ss_base.us_btl_header->payload_len = payload_len;
#if MSGDEBUG1
opal_output(0, "send small, ptr=%p, payload=%d, len=%d\n",
opal_output(0, "send small, ptr=%"PRIu64", payload=%zd, len=%"PRIu32"\n",
sseg->ss_base.us_sg_entry[0].addr, payload_len,
sseg->ss_base.us_sg_entry[0].length);
#endif
@ -1043,8 +1043,8 @@ ompi_btl_usnic_module_progress_sends(
/* don't do callback yet if this is a put */
if (frag->sf_base.uf_dst_seg[0].seg_addr.pval == NULL) {
#if MSGDEBUG1
opal_output(0, " calling back %p, len=%d\n",
frag->sf_base.uf_base.des_cbfunc,
opal_output(0, " calling back %p, len=%"PRIu64"\n",
(void*)(uintptr_t)frag->sf_base.uf_base.des_cbfunc,
frag->sf_base.uf_src_seg[0].seg_len);
#endif
/* we have copied the data, proceed with callback */

4
ompi/mca/btl/usnic/btl_usnic_module.h
Просмотреть файл

@ -255,7 +255,7 @@ ompi_btl_usnic_remove_from_endpoints_needing_ack(
endpoint->endpoint_ack_needed = false;
endpoint->endpoint_acktime = 0;
#if MSGDEBUG1
opal_output(0, "clear ack_needed on %p\n", endpoint);
opal_output(0, "clear ack_needed on %p\n", (void*)endpoint);
#endif
}
@ -267,7 +267,7 @@ ompi_btl_usnic_add_to_endpoints_needing_ack(
&endpoint->endpoint_ack_li);
endpoint->endpoint_ack_needed = true;
#if MSGDEBUG1
opal_output(0, "set ack_needed on %p\n", endpoint);
opal_output(0, "set ack_needed on %p\n", (void*)endpoint);
#endif
}

8
ompi/mca/btl/usnic/btl_usnic_recv.c
Просмотреть файл

@ -97,7 +97,7 @@ ompi_btl_usnic_check_rx_seq(
*/
if (seg->rs_base.us_btl_header->ack_seq != 0) {
#if MSGDEBUG1
opal_output(0, "Handle piggy-packed ACK seq %d\n", seg->rs_base.us_btl_header->ack_seq);
opal_output(0, "Handle piggy-packed ACK seq %"UDSEQ"\n", seg->rs_base.us_btl_header->ack_seq);
#endif
ompi_btl_usnic_handle_ack(endpoint,
seg->rs_base.us_btl_header->ack_seq);
@ -220,7 +220,7 @@ ompi_btl_usnic_update_window(
/* Enable ACK reply if not enabled */
#if MSGDEBUG1
opal_output(0, "ep: %p, ack_needed = %s\n", endpoint, endpoint->endpoint_ack_needed?"true":"false");
opal_output(0, "ep: %p, ack_needed = %s\n", (void*)endpoint, endpoint->endpoint_ack_needed?"true":"false");
#endif
if (!endpoint->endpoint_ack_needed) {
ompi_btl_usnic_add_to_endpoints_needing_ack(endpoint);
@ -371,7 +371,7 @@ void ompi_btl_usnic_recv(ompi_btl_usnic_module_t *module,
#if MSGDEBUG1
opal_output(0, "Copy %d PUT bytes to %p\n",
seg->rs_base.us_btl_header->payload_len,
chunk_hdr->ch_hdr.put_addr);
(void*)seg->rs_base.us_btl_header->put_addr);
#endif
memcpy(seg->rs_base.us_btl_header->put_addr,
seg->rs_base.us_payload.raw,
@ -503,7 +503,7 @@ opal_output(0, "Start PUT to %p\n", chunk_hdr->ch_hdr.put_addr);
/* Pass this segment up to the PML */
#if MSGDEBUG2
opal_output(0, " large FRAG complete, pass up %p, %d bytes, tag=%d\n",
opal_output(0, " large FRAG complete, pass up %p, %"PRIu64" bytes, tag=%d\n",
desc.des_dst->seg_addr.pval, desc.des_dst->seg_len,
pml_header->tag);
#endif

10
ompi/mca/btl/usnic/btl_usnic_send.h
Просмотреть файл

@ -42,7 +42,7 @@ ompi_btl_usnic_check_rts(
&endpoint->super);
endpoint->endpoint_ready_to_send = true;
#if MSGDEBUG1
opal_output(0, "make endpoint %p RTS\n", endpoint);
opal_output(0, "make endpoint %p RTS\n", (void*)endpoint);
} else {
opal_output(0, "rts:%d empty:%d cred:%d open%d\n",
endpoint->endpoint_ready_to_send,
@ -171,7 +171,7 @@ ompi_btl_usnic_endpoint_send_segment(
sseg->ss_base.us_btl_header->sender,
endpoint->endpoint_module->device->name,
mac_str1, module->local_addr.qp_num[sseg->ss_channel],
sseg, sseg->ss_hotel_room,
(void*)sseg, sseg->ss_hotel_room,
sseg->ss_base.us_sg_entry[0].length,
mac_str2, endpoint->endpoint_remote_addr.qp_num[sseg->ss_channel]);
}
@ -218,13 +218,13 @@ ompi_btl_usnic_endpoint_enqueue_frag(
module = endpoint->endpoint_module;
#if MSGDEBUG1
opal_output(0, "enq_frag: frag=%p, endpoint=%p, type=%d, len=%d\n",
frag, endpoint, frag->sf_base.uf_type,
opal_output(0, "enq_frag: frag=%p, endpoint=%p, type=%d, len=%"PRIu64"\n",
(void*)frag, (void*)endpoint, frag->sf_base.uf_type,
frag->sf_base.uf_base.des_src->seg_len);
if (frag->sf_base.uf_type == OMPI_BTL_USNIC_FRAG_LARGE_SEND) {
ompi_btl_usnic_large_send_frag_t *lfrag;
lfrag = (ompi_btl_usnic_large_send_frag_t *)frag;
opal_output(0, " large size=%d\n", lfrag->lsf_base.sf_size);
opal_output(0, " large size=%zd\n", lfrag->lsf_base.sf_size);
}
#endif