[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-190-g635969e
mysql vizuser
noreply at mpich.org
Tue May 14 20:50:18 CDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via 635969e76f66b3039f8150bc582f41e324864662 (commit)
via c537d620c2699d5dc347d9f5b82c9e2ef8ce1c43 (commit)
from 74639d55be135e34a787f3627e9a084909dfd081 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/635969e76f66b3039f8150bc582f41e324864662
commit 635969e76f66b3039f8150bc582f41e324864662
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Tue May 14 14:16:40 2013 -0500
Warning squash.
No reviewer.
diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c
index 1ef7097..a4829ee 100644
--- a/src/mpi/coll/ired_scat.c
+++ b/src/mpi/coll/ired_scat.c
@@ -751,7 +751,6 @@ static int MPIR_Ireduce_scatter_noncomm(const void *sendbuf, void *recvbuf,
(outgoing_data + recv_offset*true_extent),
size, datatype, op, s);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
- buf0_was_inout = buf0_was_inout;
}
else {
/* lower ranked value so need to call op(my_data, received_data) */
diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c
index 4dc1243..1018417 100644
--- a/src/mpi/coll/ired_scat_block.c
+++ b/src/mpi/coll/ired_scat_block.c
@@ -727,7 +727,6 @@ int MPIR_Ireduce_scatter_block_noncomm(const void *sendbuf, void *recvbuf, int r
(outgoing_data + recv_offset*true_extent),
size, datatype, op, s);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
- buf0_was_inout = buf0_was_inout;
}
else {
/* lower ranked value so need to call op(my_data, received_data) */
diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c
index 7c783c5..07d8654 100644
--- a/src/mpi/coll/red_scat.c
+++ b/src/mpi/coll/red_scat.c
@@ -129,7 +129,6 @@ static int MPIR_Reduce_scatter_noncomm(const void *sendbuf, void *recvbuf, const
outgoing_data + recv_offset*true_extent,
size, datatype, op );
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
- buf0_was_inout = buf0_was_inout;
}
else {
/* lower ranked value so need to call op(my_data, received_data) */
diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c
index df59dea..d5a298d 100644
--- a/src/mpi/coll/red_scat_block.c
+++ b/src/mpi/coll/red_scat_block.c
@@ -139,7 +139,6 @@ static int MPIR_Reduce_scatter_block_noncomm (
outgoing_data + recv_offset*true_extent,
size, datatype, op);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
- buf0_was_inout = buf0_was_inout;
}
else {
/* lower ranked value so need to call op(my_data, received_data) */
diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c
index 1e7e4a6..6ee752f 100644
--- a/src/mpid/ch3/src/ch3u_rma_sync.c
+++ b/src/mpid/ch3/src/ch3u_rma_sync.c
@@ -98,7 +98,7 @@ static MPIU_INSTR_Duration_count *list_block; /* Inner; while waiting */
static int MPIDI_CH3I_Send_lock_msg(int dest, int lock_type, MPID_Win *win_ptr);
static int MPIDI_CH3I_Send_unlock_msg(int dest, MPID_Win *win_ptr);
-static int MPIDI_CH3I_Send_flush_msg(int dest, MPID_Win *win_ptr);
+/* static int MPIDI_CH3I_Send_flush_msg(int dest, MPID_Win *win_ptr); */
static int MPIDI_CH3I_Wait_for_lock_granted(MPID_Win *win_ptr, int target_rank);
static int MPIDI_CH3I_Acquire_local_lock(MPID_Win *win_ptr, int lock_mode);
static int MPIDI_CH3I_Send_rma_msg(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
@@ -2877,6 +2877,9 @@ static int MPIDI_CH3I_Send_unlock_msg(int dest, MPID_Win *win_ptr) {
}
+/* Commented out function to squash a warning, but retaining the code
+ * for later use. */
+#if 0
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Send_flush_msg
#undef FCNAME
@@ -2916,6 +2919,7 @@ static int MPIDI_CH3I_Send_flush_msg(int dest, MPID_Win *win_ptr) {
goto fn_exit;
/* --END ERROR HANDLING-- */
}
+#endif
#undef FUNCNAME
diff --git a/src/mpid/common/datatype/dataloop/segment_packunpack.c b/src/mpid/common/datatype/dataloop/segment_packunpack.c
index 661bd93..32c4689 100644
--- a/src/mpid/common/datatype/dataloop/segment_packunpack.c
+++ b/src/mpid/common/datatype/dataloop/segment_packunpack.c
@@ -155,8 +155,8 @@ int PREPEND_PREFIX(Segment_vector_m2m)(DLOOP_Offset *blocks_p,
void *bufp ATTRIBUTE((unused)),
void *v_paramp)
{
- DLOOP_Count i, blocks_left, whole_count;
- DLOOP_Offset el_size;
+ DLOOP_Count i;
+ DLOOP_Offset el_size, whole_count, blocks_left;
struct PREPEND_PREFIX(m2m_params) *paramp = v_paramp;
char *cbufp;
@@ -295,7 +295,11 @@ int PREPEND_PREFIX(Segment_blkidx_m2m)(DLOOP_Offset *blocks_p,
rel_off + offsetarray[curblock]);
cbufp = (char*) paramp->userbuf + rel_off + offsetarray[curblock];
- if (blocklen > blocks_left) blocklen = blocks_left;
+ /* Type-cast blocklen to a large type for comparison, but once
+ * we confirm that it is smaller than the blocks_left, we can
+ * safely type-cast blocks_left to a smaller type */
+ if ((DLOOP_Offset) blocklen > blocks_left)
+ blocklen = (DLOOP_Count) blocks_left;
if (paramp->direction == DLOOP_M2M_TO_USERBUF) {
src = paramp->streambuf;
diff --git a/src/mpid/common/datatype/dataloop/veccpy.h b/src/mpid/common/datatype/dataloop/veccpy.h
index ea138a8..687320c 100644
--- a/src/mpid/common/datatype/dataloop/veccpy.h
+++ b/src/mpid/common/datatype/dataloop/veccpy.h
@@ -54,7 +54,8 @@
{ \
type * l_src = (type *) src, * l_dest = (type *) dest; \
type * tmp_src = l_src; \
- register int _i, j, k; \
+ register int k; \
+ register unsigned long _i, j; \
unsigned long total_count = count * nelms; \
const DLOOP_Offset l_stride = stride; \
\
@@ -166,8 +167,8 @@
{ \
type * l_src = (type *) src, * l_dest = (type *) dest; \
type * tmp_src = l_src; \
- register int _i, j, k; \
- unsigned long total_count = count * nelms; \
+ register int k; \
+ register unsigned long _i, j, total_count = count * nelms; \
const DLOOP_Offset l_stride = stride; \
\
if (nelms == 1) { \
@@ -278,7 +279,8 @@
{ \
type * l_src = (type *) src, * l_dest = (type *) dest; \
type * tmp_dest = l_dest; \
- register int _i, j, k; \
+ register int k; \
+ register unsigned long _i, j; \
unsigned long total_count = count * nelms; \
const DLOOP_Offset l_stride = stride; \
\
@@ -390,7 +392,8 @@
{ \
type * l_src = (type *) src, * l_dest = (type *) dest; \
type * tmp_dest = l_dest; \
- register int _i, j, k; \
+ register int k; \
+ register unsigned long _i, j; \
unsigned long total_count = count * nelms; \
const DLOOP_Offset l_stride = stride; \
\
diff --git a/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c b/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
index 3fb1992..6c190b8 100644
--- a/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
+++ b/src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c
@@ -139,7 +139,7 @@ static HYD_status cache_put_flush(int fd)
static HYD_status fn_init(int fd, char *args[])
{
int pmi_version, pmi_subversion, i;
- const char *tmp;
+ const char *tmp = NULL;
static int global_init = 1;
HYD_status status = HYD_SUCCESS;
http://git.mpich.org/mpich.git/commitdiff/c537d620c2699d5dc347d9f5b82c9e2ef8ce1c43
commit c537d620c2699d5dc347d9f5b82c9e2ef8ce1c43
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Tue May 14 13:02:25 2013 -0500
Disable -Wcast-align and -Wshorten-64-to-32.
This is an important warning flag, but given the number of places we
are breaking this in mpich, it is causing us to miss other warnings.
This is meant to be a temporary disabling.
No reviewer.
diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4
index f8ace03..7a92a8a 100644
--- a/confdb/aclocal_cc.m4
+++ b/confdb/aclocal_cc.m4
@@ -492,13 +492,20 @@ if test "$enable_strict_done" != "yes" ; then
# should never be tolerated. This also ensures that we get quick
# compilation failures rather than later link failures that usually
# come from a function name typo.
+ # -Wcast-align -- Casting alignment warnings. This is an
+ # important check, but is temporarily disabled, since it is
+ # throwing too many (correct) warnings currently, causing us
+ # to miss other warnings.
+ # -Wshorten-64-to-32 -- Bad type-casting warnings. This is an
+ # important check, but is temporarily disabled, since it is
+ # throwing too many (correct) warnings currently, causing us
+ # to miss other warnings.
# the embedded newlines in this string are safe because we evaluate each
# argument in the for-loop below and append them to the CFLAGS with a space
# as the separator instead
pac_common_strict_flags="
-Wall
-Wextra
- -Wshorten-64-to-32
-Wno-missing-field-initializers
-Wstrict-prototypes
-Wmissing-prototypes
@@ -512,7 +519,6 @@ if test "$enable_strict_done" != "yes" ; then
-Wno-endif-labels
-Wpointer-arith
-Wbad-function-cast
- -Wcast-align
-Wwrite-strings
-Wno-sign-compare
-Wold-style-definition
-----------------------------------------------------------------------
Summary of changes:
confdb/aclocal_cc.m4 | 10 ++++++++--
src/mpi/coll/ired_scat.c | 1 -
src/mpi/coll/ired_scat_block.c | 1 -
src/mpi/coll/red_scat.c | 1 -
src/mpi/coll/red_scat_block.c | 1 -
src/mpid/ch3/src/ch3u_rma_sync.c | 6 +++++-
.../common/datatype/dataloop/segment_packunpack.c | 10 +++++++---
src/mpid/common/datatype/dataloop/veccpy.h | 13 ++++++++-----
src/pm/hydra/pm/pmiserv/pmip_pmi_v1.c | 2 +-
9 files changed, 29 insertions(+), 16 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list