[mpich2-commits] r4017 - in mpich2/trunk/src/mpid/ch3/channels/nemesis: nemesis/netmod/tcp nemesis/src src
buntinas at mcs.anl.gov
buntinas at mcs.anl.gov
Wed Mar 11 13:55:58 CDT 2009
Author: buntinas
Date: 2009-03-11 13:55:58 -0500 (Wed, 11 Mar 2009)
New Revision: 4017
Modified:
mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c
mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_send.c
mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt_shm.c
mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
Log:
fixed related to %d vs MPIDI_MSG_SZ_FMT in debug messages on 64-bit machines
Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c 2009-03-11 18:38:53 UTC (rev 4016)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c 2009-03-11 18:55:58 UTC (rev 4017)
@@ -1394,7 +1394,7 @@
}
}
- MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "New recv %d (fd=%d, vc=%p, sc=%p)", bytes_recvd, sc->fd, sc->vc, sc));
+ MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "New recv " MPIDI_MSG_SZ_FMT " (fd=%d, vc=%p, sc=%p)", bytes_recvd, sc->fd, sc->vc, sc));
mpi_errno = MPID_nem_handle_pkt(sc->vc, MPID_nem_tcp_recv_buf, bytes_recvd);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_send.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_send.c 2009-03-11 18:38:53 UTC (rev 4016)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_send.c 2009-03-11 18:55:58 UTC (rev 4017)
@@ -121,7 +121,7 @@
else
MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**writev", "**writev %s", strerror (errno));
}
- MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "write %d", offset);
+ MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "write " MPIDI_MSG_SZ_FMT, offset);
complete = 1;
for (iov = &sreq->dev.iov[sreq->dev.iov_offset]; iov < &sreq->dev.iov[sreq->dev.iov_offset + sreq->dev.iov_count]; ++iov)
@@ -264,7 +264,7 @@
else
MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**writev", "**writev %s", strerror (errno));
}
- MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "write %d", offset);
+ MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "write " MPIDI_MSG_SZ_FMT, offset);
if (offset == sizeof(MPIDI_CH3_PktGeneric_t) + data_sz)
{
@@ -368,7 +368,7 @@
else
MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**writev", "**writev %s", strerror (errno));
}
- MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "write %d", offset);
+ MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "write " MPIDI_MSG_SZ_FMT, offset);
if (offset == sizeof(MPIDI_CH3_PktGeneric_t) + data_sz)
{
@@ -491,7 +491,7 @@
else
MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**writev", "**writev %s", strerror (errno));
}
- MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "write noncontig %d", offset);
+ MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "write noncontig " MPIDI_MSG_SZ_FMT, offset);
}
}
else
Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt_shm.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt_shm.c 2009-03-11 18:38:53 UTC (rev 4016)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt_shm.c 2009-03-11 18:55:58 UTC (rev 4017)
@@ -477,7 +477,7 @@
req->dev.segment_first = first;
vc_ch->lmt_buf_num = buf_num;
*done = FALSE;
- MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "first=%d data_sz=%d", first, data_sz));
+ MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "first=" MPIDI_MSG_SZ_FMT " data_sz="MPIDI_MSG_SZ_FMT, first, data_sz));
MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "Waiting on full buffer %d", buf_num);
goto fn_exit;
}
@@ -502,7 +502,7 @@
first = last;
buf_num = (buf_num+1) % NUM_BUFS;
- MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "sent data. last=%d data_sz=%d", last, data_sz));
+ MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "sent data. last=" MPIDI_MSG_SZ_FMT " data_sz=" MPIDI_MSG_SZ_FMT, last, data_sz));
}
while (last < data_sz);
@@ -576,7 +576,7 @@
vc_ch->lmt_buf_num = buf_num;
vc_ch->lmt_surfeit = surfeit;
*done = FALSE;
- MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "first=%d data_sz=%d", first, data_sz));
+ MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "first=" MPIDI_MSG_SZ_FMT " data_sz=" MPIDI_MSG_SZ_FMT, first, data_sz));
MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "Waiting on empty buffer %d", buf_num);
goto fn_exit;
}
@@ -593,7 +593,7 @@
MPID_Segment_unpack(req->dev.segment_ptr, first, &last, src_buf);
- MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "recvd data. last=%d data_sz=%d", last, data_sz));
+ MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "recvd data. last=" MPIDI_MSG_SZ_FMT " data_sz=" MPIDI_MSG_SZ_FMT, last, data_sz));
if (surfeit && buf_num > 0)
{
Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c 2009-03-11 18:38:53 UTC (rev 4016)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c 2009-03-11 18:55:58 UTC (rev 4017)
@@ -586,7 +586,7 @@
{
if (buflen > 0)
{
- MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, " %d\n", buflen);
+ MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, " " MPIDI_MSG_SZ_FMT "\n", buflen);
MPID_NEM_MEMCPY (iov->MPID_IOV_BUF, buf, buflen);
iov->MPID_IOV_BUF = (void *)((char *)iov->MPID_IOV_BUF + buflen);
iov->MPID_IOV_LEN -= buflen;
@@ -596,7 +596,7 @@
rreq->dev.iov_offset = iov - rreq->dev.iov;
rreq->dev.iov_count = n_iov;
vc_ch->recv_active = rreq;
- MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, " remaining: %d bytes + %d iov entries\n", iov->MPID_IOV_LEN, n_iov - rreq->dev.iov_offset - 1));
+ MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, " remaining: " MPIDI_MSG_SZ_FMT " bytes + %d iov entries\n", iov->MPID_IOV_LEN, n_iov - rreq->dev.iov_offset - 1));
}
else
{
More information about the mpich2-commits
mailing list