[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc1-44-g53640e2
mysql vizuser
noreply at mpich.org
Fri Nov 15 17:15:13 CST 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 53640e262bc9f35d9729530c3af80773098bc34d (commit)
via 95ca219e1713846f5c5b51fd94663398fbf9369f (commit)
via e39d17eaedecd5655eb5699699d0edbdb8c8aad4 (commit)
via 893492169ea02c41140c32c2c6e8be4753667d4d (commit)
via 30fc08e100d45ebaea60941a22b3711da5864637 (commit)
via 6363c2aa21495fb30b15f6e91ee39523333fbef2 (commit)
via 5ae8a7198dea0791a23756833710119d490e94ca (commit)
via 769f698c8e2d300632a66adf5a2d42c3e4729916 (commit)
via 4bf29080cd818959c47cfdc1a83c8b21c78c40b9 (commit)
via c750a8b82bd7ca7a76451f0cab37d47d3aa4aa7d (commit)
via ee7f0aae436f669091016311c13b1c6af135c49d (commit)
via c2dc7a35e2398f5e93bb6a63efa7ca728f525a16 (commit)
via d8b8eb6f8e59031853d167c2580c8cb8c5ec4a9b (commit)
via 6e8dae1b4fdbfd2d7225ca3fd285855322d25466 (commit)
via 8822485c3bdfb99130ba6b00912e19fe6a6eb255 (commit)
from 65a3af4338217e941e0d099a1fadad1a517d3411 (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/53640e262bc9f35d9729530c3af80773098bc34d
commit 53640e262bc9f35d9729530c3af80773098bc34d
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Fri Nov 15 17:01:57 2013 -0600
Removed unused variable
Commented out in case we need it in the future. All other related functions
have it, but they actually use it. This avoids a compiler warning.
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/nameserv/file/file_nameserv.c b/src/nameserv/file/file_nameserv.c
index 97e45fa..327a487 100644
--- a/src/nameserv/file/file_nameserv.c
+++ b/src/nameserv/file/file_nameserv.c
@@ -172,7 +172,7 @@ int MPID_NS_Publish( MPID_NS_Handle handle, const MPID_Info *info_ptr,
int MPID_NS_Lookup( MPID_NS_Handle handle, const MPID_Info *info_ptr,
const char service_name[], char port[] )
{
- static const char FCNAME[] = "MPID_NS_Lookup";
+ /* static const char FCNAME[] = "MPID_NS_Lookup"; */
FILE *fp;
char filename[MAXPATHLEN];
int mpi_errno = MPI_SUCCESS;
http://git.mpich.org/mpich.git/commitdiff/95ca219e1713846f5c5b51fd94663398fbf9369f
commit 95ca219e1713846f5c5b51fd94663398fbf9369f
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Fri Nov 15 17:00:13 2013 -0600
Moved variable declarations to avoud warnings
Moved a couple of variable declarations inside their block to avoid compilers
complaining when those blocks are not compiled because of an #ifdef evaluated
to false.
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c
index 7a6774e..07d1cb0 100644
--- a/src/mpi/coll/iscatter.c
+++ b/src/mpi/coll/iscatter.c
@@ -620,7 +620,6 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- MPID_Datatype *sendtype_ptr, *recvtype_ptr;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISCATTER);
MPIU_THREAD_CS_ENTER(ALLFUNC,);
@@ -647,6 +646,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
{
MPID_BEGIN_ERROR_CHECKS
{
+ MPID_Datatype *sendtype_ptr, *recvtype_ptr;
MPID_Comm_valid_ptr(comm_ptr, mpi_errno);
if (comm_ptr->comm_kind == MPID_INTRACOMM) {
MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno);
diff --git a/src/mpi/coll/reduce_local.c b/src/mpi/coll/reduce_local.c
index 1c69ce1..113b47f 100644
--- a/src/mpi/coll/reduce_local.c
+++ b/src/mpi/coll/reduce_local.c
@@ -143,7 +143,6 @@ Output Parameters:
int MPI_Reduce_local(const void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op)
{
int mpi_errno = MPI_SUCCESS;
- MPID_Op *op_ptr;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE_LOCAL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
@@ -159,6 +158,7 @@ int MPI_Reduce_local(const void *inbuf, void *inoutbuf, int count, MPI_Datatype
MPIR_ERRTEST_OP(op, mpi_errno);
if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) {
+ MPID_Op *op_ptr;
MPID_Op_get_ptr(op, op_ptr);
MPID_Op_valid_ptr( op_ptr, mpi_errno );
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
http://git.mpich.org/mpich.git/commitdiff/e39d17eaedecd5655eb5699699d0edbdb8c8aad4
commit e39d17eaedecd5655eb5699699d0edbdb8c8aad4
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Fri Nov 15 16:58:27 2013 -0600
Fix compiler warnings - unused variables
Warnings related to unused variables intended to be used for debugging, but
always declared.
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
index d27a525..9269b5a 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
@@ -1903,7 +1903,9 @@ int MPID_nem_tcp_state_listening_handler(struct pollfd *const unused_1, sockconn
len = sizeof(SA_IN);
MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, (MPIU_DBG_FDEST, "before accept"));
if ((connfd = accept(l_sc->fd, (SA *) &rmt_addr, &len)) < 0) {
+#ifdef HAVE_ERROR_CHECKING
int save_errno = errno;
+#endif
MPIU_DBG_MSG_FMT(NEM_SOCK_DET, VERBOSE, (MPIU_DBG_FDEST, "after accept, l_sc=%p lstnfd=%d connfd=%d, errno=%d:%s ", l_sc, l_sc->fd, connfd, errno, MPIU_Strerror(save_errno)));
if (errno == EINTR)
continue;
diff --git a/src/mpid/ch3/src/mpid_imrecv.c b/src/mpid/ch3/src/mpid_imrecv.c
index fc2c5ae..0acb680 100644
--- a/src/mpid/ch3/src/mpid_imrecv.c
+++ b/src/mpid/ch3/src/mpid_imrecv.c
@@ -115,7 +115,9 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype,
else
{
/* --BEGIN ERROR HANDLING-- */
+#ifdef HAVE_ERROR_CHECKING
int msg_type = MPIDI_Request_get_msg_type(rreq);
+#endif
MPID_Request_release(rreq);
rreq = NULL;
MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype",
diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c
index 93a3ab9..103a352 100644
--- a/src/mpid/ch3/src/mpid_irecv.c
+++ b/src/mpid/ch3/src/mpid_irecv.c
@@ -124,7 +124,9 @@ int MPID_Irecv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
else
{
/* --BEGIN ERROR HANDLING-- */
+#ifdef HAVE_ERROR_CHECKING
int msg_type = MPIDI_Request_get_msg_type(rreq);
+#endif
MPID_Request_release(rreq);
rreq = NULL;
MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype",
diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c
index 1eeeb06..76d782e 100644
--- a/src/mpid/ch3/src/mpid_recv.c
+++ b/src/mpid/ch3/src/mpid_recv.c
@@ -139,7 +139,9 @@ int MPID_Recv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
else
{
/* --BEGIN ERROR HANDLING-- */
+#ifdef HAVE_ERROR_CHECKING
int msg_type = MPIDI_Request_get_msg_type(rreq);
+#endif
MPID_Request_release(rreq);
rreq = NULL;
MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype",
http://git.mpich.org/mpich.git/commitdiff/893492169ea02c41140c32c2c6e8be4753667d4d
commit 893492169ea02c41140c32c2c6e8be4753667d4d
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Tue Nov 12 19:37:07 2013 -0600
Fixes warnings in some collectives with pgcc
Fixes compiler warnings complaining about a missing cast from void * to const
void *.
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c
index ef5451e..0de26b5 100644
--- a/src/mpi/coll/exscan.c
+++ b/src/mpi/coll/exscan.c
@@ -137,7 +137,7 @@ int MPIR_Exscan (
/* adjust for potential negative lower bound in datatype */
tmp_buf = (void *)((char*)tmp_buf - true_lb);
- mpi_errno = MPIR_Localcopy((sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf), count, datatype,
+ mpi_errno = MPIR_Localcopy((sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf), count, datatype,
partial_scan, count, datatype);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c
index b5d1ae7..f7b7f17 100644
--- a/src/mpi/coll/iexscan.c
+++ b/src/mpi/coll/iexscan.c
@@ -102,7 +102,7 @@ int MPIR_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dat
/* adjust for potential negative lower bound in datatype */
tmp_buf = (void *)((char*)tmp_buf - true_lb);
- mpi_errno = MPID_Sched_copy((sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf), count, datatype,
+ mpi_errno = MPID_Sched_copy((sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf), count, datatype,
partial_scan, count, datatype, s);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c
index 07ccd20..68a64ff 100644
--- a/src/mpi/coll/ired_scat.c
+++ b/src/mpi/coll/ired_scat.c
@@ -707,7 +707,7 @@ static int MPIR_Ireduce_scatter_noncomm(const void *sendbuf, void *recvbuf,
/* Copy our send data to tmp_buf0. We do this one block at a time and
permute the blocks as we go according to the mirror permutation. */
for (i = 0; i < comm_size; ++i) {
- mpi_errno = MPID_Sched_copy(((char *)(sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf) + (i * true_extent * block_size)),
+ mpi_errno = MPID_Sched_copy(((char *)(sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf) + (i * true_extent * block_size)),
block_size, datatype,
((char *)tmp_buf0 + (MPIU_Mirror_permutation(i, log2_comm_size) * true_extent * block_size)),
block_size, datatype, s);
diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c
index b224b41..acb8ff2 100644
--- a/src/mpi/coll/ired_scat_block.c
+++ b/src/mpi/coll/ired_scat_block.c
@@ -683,7 +683,7 @@ int MPIR_Ireduce_scatter_block_noncomm(const void *sendbuf, void *recvbuf, int r
/* Copy our send data to tmp_buf0. We do this one block at a time and
permute the blocks as we go according to the mirror permutation. */
for (i = 0; i < comm_size; ++i) {
- mpi_errno = MPID_Sched_copy(((char *)(sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf) + (i * true_extent * block_size)),
+ mpi_errno = MPID_Sched_copy(((char *)(sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf) + (i * true_extent * block_size)),
block_size, datatype,
((char *)tmp_buf0 + (MPIU_Mirror_permutation(i, log2_comm_size) * true_extent * block_size)),
block_size, datatype, s);
diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c
index 5a9aaca..b04ea60 100644
--- a/src/mpi/coll/red_scat.c
+++ b/src/mpi/coll/red_scat.c
@@ -84,7 +84,8 @@ static int MPIR_Reduce_scatter_noncomm(const void *sendbuf, void *recvbuf, const
/* Copy our send data to tmp_buf0. We do this one block at a time and
permute the blocks as we go according to the mirror permutation. */
for (i = 0; i < comm_size; ++i) {
- mpi_errno = MPIR_Localcopy((char *)(sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf) + (i * true_extent * block_size), block_size, datatype,
+ mpi_errno = MPIR_Localcopy((char *)(sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf) + (i * true_extent * block_size),
+ block_size, datatype,
(char *)tmp_buf0 + (MPIU_Mirror_permutation(i, log2_comm_size) * true_extent * block_size), block_size, datatype);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
}
diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c
index b9a6c5e..045f63a 100644
--- a/src/mpi/coll/red_scat_block.c
+++ b/src/mpi/coll/red_scat_block.c
@@ -94,7 +94,8 @@ static int MPIR_Reduce_scatter_block_noncomm (
/* Copy our send data to tmp_buf0. We do this one block at a time and
permute the blocks as we go according to the mirror permutation. */
for (i = 0; i < comm_size; ++i) {
- mpi_errno = MPIR_Localcopy((char *)(sendbuf == MPI_IN_PLACE ? recvbuf : sendbuf) + (i * true_extent * block_size), block_size, datatype,
+ mpi_errno = MPIR_Localcopy((char *)(sendbuf == MPI_IN_PLACE ? (const void *)recvbuf : sendbuf) + (i * true_extent * block_size),
+ block_size, datatype,
(char *)tmp_buf0 + (MPIU_Mirror_permutation(i, log2_comm_size) * true_extent * block_size), block_size, datatype);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
}
http://git.mpich.org/mpich.git/commitdiff/30fc08e100d45ebaea60941a22b3711da5864637
commit 30fc08e100d45ebaea60941a22b3711da5864637
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Tue Nov 12 19:35:52 2013 -0600
Fix warnings in mpidrma.h when compiling with pgcc
Fixes the following warnings:
PGC-W-0095-Type cast required for this conversion
(./src/mpid/ch3/include/mpidrma.h: 703)
PGC-W-0095-Type cast required for this conversion
(./src/mpid/ch3/include/mpidrma.h: 864)
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h
index 4eb6206..bceb847 100644
--- a/src/mpid/ch3/include/mpidrma.h
+++ b/src/mpid/ch3/include/mpidrma.h
@@ -700,7 +700,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun
MPID_Segment_pack_vector(segp, first, &last, dloop_vec, &vec_len);
- source_buf = (tmp_buf != NULL) ? tmp_buf : origin_addr;
+ source_buf = (tmp_buf != NULL) ? (const void *)tmp_buf : origin_addr;
target_buf = (char *) base + disp_unit * target_disp;
type = dtp->eltype;
type_size = MPID_Datatype_get_basic_size(type);
@@ -861,7 +861,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_
MPID_Segment_pack_vector(segp, first, &last, dloop_vec, &vec_len);
- source_buf = (tmp_buf != NULL) ? tmp_buf : origin_addr;
+ source_buf = (tmp_buf != NULL) ? (const void *)tmp_buf : origin_addr;
target_buf = (char *) base + disp_unit * target_disp;
type = dtp->eltype;
type_size = MPID_Datatype_get_basic_size(type);
http://git.mpich.org/mpich.git/commitdiff/6363c2aa21495fb30b15f6e91ee39523333fbef2
commit 6363c2aa21495fb30b15f6e91ee39523333fbef2
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Tue Nov 12 19:29:55 2013 -0600
Fix warning in ckpoint.c with Portland compilers
Fixes the following warning:
PGC-W-0155-Pointer value created from a nonlong integral type
(tools/ckpoint/ckpoint.c: 86)
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/pm/hydra/tools/ckpoint/ckpoint.c b/src/pm/hydra/tools/ckpoint/ckpoint.c
index 3913852..d24888f 100644
--- a/src/pm/hydra/tools/ckpoint/ckpoint.c
+++ b/src/pm/hydra/tools/ckpoint/ckpoint.c
@@ -83,7 +83,7 @@ static void *ckpoint_thread(void *arg)
fn_exit:
in_ckpt = HYDT_CKPOINT_FINISHED;
- return (void *) status;
+ return (void *) (long) status;
fn_fail:
HYDT_ftb_publish("FTB_MPI_PROCS_CKPT_FAIL", ftb_event_payload);
http://git.mpich.org/mpich.git/commitdiff/5ae8a7198dea0791a23756833710119d490e94ca
commit 5ae8a7198dea0791a23756833710119d490e94ca
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Mon Nov 11 17:30:05 2013 -0600
Removed unused variables from dll_mpich.c
They were causing compiler warnings
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c
index cf957eb..fa362ae 100644
--- a/src/mpi/debugger/dll_mpich.c
+++ b/src/mpi/debugger/dll_mpich.c
@@ -255,7 +255,6 @@ int mqs_image_has_queues (mqs_image *image, char **message)
{
mpich_image_info * i_info =
(mpich_image_info *)dbgr_get_image_info (image);
- int have_co = 0, have_cl = 0, have_req = 0, have_dreq = 0;
/* Default failure message ! */
*message = (char *)"The symbols and types in the MPICH library used by TotalView\n"
@@ -282,7 +281,6 @@ int mqs_image_has_queues (mqs_image *image, char **message)
mqs_type *cl_type = dbgr_find_type( image, (char *)"MPIR_Comm_list",
mqs_lang_c );
if (cl_type) {
- have_cl = 1;
i_info->sequence_number_offs =
dbgr_field_offset( cl_type, (char *)"sequence_number" );
i_info->comm_head_offs = dbgr_field_offset( cl_type, (char *)"head" );
@@ -291,7 +289,6 @@ int mqs_image_has_queues (mqs_image *image, char **message)
{
mqs_type *co_type = dbgr_find_type( image, (char *)"MPID_Comm", mqs_lang_c );
if (co_type) {
- have_co = 1;
i_info->comm_name_offs = dbgr_field_offset( co_type, (char *)"name" );
i_info->comm_next_offs = dbgr_field_offset( co_type, (char *)"comm_next" );
i_info->comm_rsize_offs = dbgr_field_offset( co_type, (char *)"remote_size" );
@@ -310,7 +307,6 @@ int mqs_image_has_queues (mqs_image *image, char **message)
mqs_type *req_type = dbgr_find_type( image, (char *)"MPID_Request", mqs_lang_c );
if (req_type) {
int mpid_offs;
- have_req = 1;
mpid_offs = dbgr_field_offset( req_type, (char *)"mpid" );
i_info->req_status_offs = dbgr_field_offset( req_type, (char *)"status" );
i_info->req_cc_offs = dbgr_field_offset( req_type, (char *)"cc" );
@@ -321,7 +317,6 @@ int mqs_image_has_queues (mqs_image *image, char **message)
i_info->req_mpid_offs = mpid_offs;
if (dreq_type) {
int loff, envelope_offs;
- have_dreq = 1;
loff = dbgr_field_offset( dreq_type, (char *)"next" );
i_info->req_next_offs = mpid_offs + loff;
loff = dbgr_field_offset( dreq_type, (char *)"userbuf" );
@@ -655,8 +650,6 @@ static int fetch_receive (mqs_process *proc, mpich_process_info *p_info,
int is_complete = fetch_int ( proc, base + i_info->req_cc_offs, p_info);
mqs_taddr_t buffer = 0;
unsigned buf_count = -1;
- int datatype;
- datatype = fetch_int(proc, base + i_info->req_datatype_offs, p_info);
if(look_for_user_buffer)
{
http://git.mpich.org/mpich.git/commitdiff/769f698c8e2d300632a66adf5a2d42c3e4729916
commit 769f698c8e2d300632a66adf5a2d42c3e4729916
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Mon Nov 11 17:28:50 2013 -0600
Fixes compiler warnings in init.c / initthread.c
src/mpi/init/init.c: In function 'PMPI_Init':
src/mpi/init/init.c:78:9: warning: variable 'rc' set but not used
[-Wunused-but-set-variable]
src/mpi/init/initthread.c: In function 'PMPI_Init_thread':
src/mpi/init/initthread.c:554:9: warning: variable 'rc' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpi/init/init.c b/src/mpi/init/init.c
index be70c9e..2ffcfce 100644
--- a/src/mpi/init/init.c
+++ b/src/mpi/init/init.c
@@ -75,7 +75,7 @@ int MPI_Init( int *argc, char ***argv )
{
static const char FCNAME[] = "MPI_Init";
int mpi_errno = MPI_SUCCESS;
- int rc;
+ int rc ATTRIBUTE((unused));
int threadLevel, provided;
MPID_MPI_INIT_STATE_DECL(MPID_STATE_MPI_INIT);
diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c
index a765374..7401af7 100644
--- a/src/mpi/init/initthread.c
+++ b/src/mpi/init/initthread.c
@@ -551,7 +551,7 @@ Notes for Fortran:
int MPI_Init_thread( int *argc, char ***argv, int required, int *provided )
{
int mpi_errno = MPI_SUCCESS;
- int rc, reqd = required;
+ int rc ATTRIBUTE((unused)), reqd = required;
MPID_MPI_INIT_STATE_DECL(MPID_STATE_MPI_INIT_THREAD);
rc = MPID_Wtime_init();
http://git.mpich.org/mpich.git/commitdiff/4bf29080cd818959c47cfdc1a83c8b21c78c40b9
commit 4bf29080cd818959c47cfdc1a83c8b21c78c40b9
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Mon Nov 11 17:27:32 2013 -0600
Fix compiler warnings in mpid_type_debug.c
Fixes warnings in mpid_type_debug.c about unused variables in
MPIDI_Datatype_printf.
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpid/common/datatype/mpid_type_debug.c b/src/mpid/common/datatype/mpid_type_debug.c
index fcece4b..8bd6806 100644
--- a/src/mpid/common/datatype/mpid_type_debug.c
+++ b/src/mpid/common/datatype/mpid_type_debug.c
@@ -233,6 +233,7 @@ void MPIDI_Datatype_printf(MPI_Datatype type,
int blocklength,
int header)
{
+#ifdef USE_DBG_LOGGING
char *string;
MPI_Aint size;
MPI_Aint extent, true_lb, true_ub, lb, ub, sticky_lb, sticky_ub;
@@ -278,6 +279,7 @@ void MPIDI_Datatype_printf(MPI_Datatype type,
(MPI_Aint) sticky_ub,
(MPI_Aint) displacement,
(int) blocklength));
+#endif
return;
}
/* --END ERROR HANDLING-- */
http://git.mpich.org/mpich.git/commitdiff/c750a8b82bd7ca7a76451f0cab37d47d3aa4aa7d
commit c750a8b82bd7ca7a76451f0cab37d47d3aa4aa7d
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Mon Nov 11 17:25:08 2013 -0600
Fix braces compiler suggestion (warning)
Fixes the following warning in ch3u_handle_connection.c whith --enable-strict:
src/mpid/ch3/src/ch3u_handle_connection.c:317:194: warning: suggest braces
around empty body in an 'if' statement [-Wempty-body]
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpid/ch3/src/ch3u_handle_connection.c b/src/mpid/ch3/src/ch3u_handle_connection.c
index cc34eb9..00bdb8e 100644
--- a/src/mpid/ch3/src/ch3u_handle_connection.c
+++ b/src/mpid/ch3/src/ch3u_handle_connection.c
@@ -314,11 +314,12 @@ int MPIDI_CH3_PktHandler_Close( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
else /* (vc->state == MPIDI_VC_STATE_ACTIVE) */
{
if (vc->state != MPIDI_VC_STATE_ACTIVE)
+ {
MPIU_DBG_MSG_FMT(CH3_DISCONNECT, TYPICAL, (MPIU_DBG_FDEST, "Unexpected state %s in vc %p (rank=%d) (expecting MPIDI_VC_STATE_ACTIVE)\n", MPIDI_VC_GetStateString(vc->state), vc, vc->pg_rank ));
MPIU_DBG_MSG_D(CH3_DISCONNECT,TYPICAL,
"received close(FALSE) from %d, moving to REMOTE_CLOSE.",
vc->pg_rank);
-
+ }
MPIU_Assert(vc->state == MPIDI_VC_STATE_ACTIVE);
MPIDI_CHANGE_VC_STATE(vc, REMOTE_CLOSE);
}
http://git.mpich.org/mpich.git/commitdiff/ee7f0aae436f669091016311c13b1c6af135c49d
commit ee7f0aae436f669091016311c13b1c6af135c49d
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Mon Nov 11 17:23:08 2013 -0600
Fix compiler warnings in pmip_cb.c
Fixes the following warnings when compiling pmip_cb.c with --enable-strict:
pm/pmiserv/pmip_cb.c:803:9: warning: null argument where non-null required
(argument 1) [-Wnonnull]
pm/pmiserv/pmip_cb.c:803:9: warning: null argument where non-null required
(argument 2) [-Wnonnull]
Related to ticket #1966
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac
index d6028f8..e0fa208 100644
--- a/src/pm/hydra/configure.ac
+++ b/src/pm/hydra/configure.ac
@@ -520,8 +520,6 @@ AC_DEFINE_UNQUOTED(HYDRA_AVAILABLE_CKPOINTLIBS,"$available_ckpointlibs",
if test "$hydra_default_ckpointlib" != "" ; then
AC_DEFINE_UNQUOTED(HYDRA_DEFAULT_CKPOINTLIB,"$hydra_default_ckpointlib",
[Default checkpointing library])
-else
- AC_DEFINE(HYDRA_DEFAULT_CKPOINTLIB,NULL,[Default checkpointing library])
fi
AM_CONDITIONAL([hydra_have_blcr], [test "${have_blcr}" = "yes"])
diff --git a/src/pm/hydra/pm/pmiserv/pmip_cb.c b/src/pm/hydra/pm/pmiserv/pmip_cb.c
index e284028..597c800 100644
--- a/src/pm/hydra/pm/pmiserv/pmip_cb.c
+++ b/src/pm/hydra/pm/pmiserv/pmip_cb.c
@@ -799,8 +799,10 @@ static HYD_status parse_exec_params(char **t_argv)
if (HYD_pmcd_pmip.user_global.topolib == NULL && HYDRA_DEFAULT_TOPOLIB)
HYD_pmcd_pmip.user_global.topolib = HYDU_strdup(HYDRA_DEFAULT_TOPOLIB);
- if (HYD_pmcd_pmip.user_global.ckpointlib == NULL && HYDRA_DEFAULT_CKPOINTLIB)
+#ifdef HYDRA_DEFAULT_CKPOINTLIB
+ if (HYD_pmcd_pmip.user_global.ckpointlib == NULL)
HYD_pmcd_pmip.user_global.ckpointlib = HYDU_strdup(HYDRA_DEFAULT_CKPOINTLIB);
+#endif
fn_exit:
HYDU_FUNC_EXIT();
diff --git a/src/pm/hydra/tools/ckpoint/ckpoint.c b/src/pm/hydra/tools/ckpoint/ckpoint.c
index b730bd3..3913852 100644
--- a/src/pm/hydra/tools/ckpoint/ckpoint.c
+++ b/src/pm/hydra/tools/ckpoint/ckpoint.c
@@ -30,11 +30,16 @@ HYD_status HYDT_ckpoint_init(const char *user_ckpointlib, int user_ckpoint_num)
if (user_ckpointlib)
HYDT_ckpoint_info.ckpointlib = user_ckpointlib;
else if (MPL_env2str("HYDRA_CKPOINTLIB", (const char **) &HYDT_ckpoint_info.ckpointlib) == 0)
+#ifdef HYDRA_DEFAULT_CKPOINTLIB
HYDT_ckpoint_info.ckpointlib = HYDRA_DEFAULT_CKPOINTLIB;
-
- /* If there is no default checkpointlib, we bail out */
- if (HYDRA_DEFAULT_CKPOINTLIB == NULL)
+#else
+ {
+ /* If there is no default checkpointlib, we bail out */
+ HYDT_ckpoint_info.ckpointlib = NULL;
goto fn_exit;
+ }
+#endif
+
HYDT_ckpoint_info.ckpoint_num = (user_ckpoint_num == -1) ? 0 : user_ckpoint_num;
in_ckpt = HYDT_CKPOINT_NONE;
http://git.mpich.org/mpich.git/commitdiff/c2dc7a35e2398f5e93bb6a63efa7ca728f525a16
commit c2dc7a35e2398f5e93bb6a63efa7ca728f525a16
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Wed Nov 6 16:32:02 2013 -0600
Fix compiler warning in tcp_init.c
Fixes the following warning when compiling tcp_init.c with --enable-strict:
src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c: In function
'GetSockInterfaceAddr':
src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c:248:9: warning:
dereferencing type-punned pointer will break strict-aliasing rules
[-Wstrict-aliasing]
Reported in ticket #1966
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
index 02f7c2b..ae992ed 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
@@ -246,8 +246,9 @@ static int GetSockInterfaceAddr(int myRank, char *ifname, int maxIfname,
MPIU_ERR_CHKANDJUMP1(mpi_errno || !ifaddrFound, mpi_errno, MPI_ERR_OTHER, "**iface_notfound", "**iface_notfound %s", MPIR_CVAR_NEMESIS_TCP_NETWORK_IFACE);
MPIU_DBG_MSG_FMT(CH3_CONNECT, VERBOSE, (MPIU_DBG_FDEST,
- "ifaddrFound=TRUE ifaddr->type=%d ifaddr->len=%d ifaddr->ifaddr[0-3]=%#08x",
- ifaddr->type, ifaddr->len, *((unsigned int *)ifaddr->ifaddr)));
+ "ifaddrFound=TRUE ifaddr->type=%d ifaddr->len=%d ifaddr->ifaddr[0-3]=%d.%d.%d.%d",
+ ifaddr->type, ifaddr->len, ifaddr->ifaddr[0], ifaddr->ifaddr[1], ifaddr->ifaddr[2],
+ ifaddr->ifaddr[3]));
/* In this case, ifname is only used for debugging purposes */
mpi_errno = MPID_Get_processor_name(ifname, maxIfname, &len );
http://git.mpich.org/mpich.git/commitdiff/d8b8eb6f8e59031853d167c2580c8cb8c5ec4a9b
commit d8b8eb6f8e59031853d167c2580c8cb8c5ec4a9b
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Wed Nov 6 16:26:10 2013 -0600
Fix warnings about possible uninitialized accesses
Fixes compiler warnings related to the possible use of uninitialized memory in
mpiu_chkpmem_stk_[0] and mpir_sched_chkpmem_stk_[0]. A couple of examples:
src/mpid/ch3/src/ch3u_rma_sync.c: In function 'MPIDI_CH3I_Recv_rma_msg':
src/mpid/ch3/src/ch3u_rma_sync.c:1265:5: warning: 'mpiu_chkpmem_stk_[0]'
may be used uninitialized in this function [-Wmaybe-uninitialized]
src/mpi/coll/iallgather.c: In function 'MPIR_Iallgather_bruck':
src/mpi/coll/iallgather.c:329:5: warning: 'mpir_sched_chkpmem_stk_[0]' may
be used uninitialized in this function [-Wmaybe-uninitialized]
While the code seems correct, this patch avoids the warning.
See ticket #1966
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/include/mpimem.h b/src/include/mpimem.h
index 876fd63..59e965d 100644
--- a/src/include/mpimem.h
+++ b/src/include/mpimem.h
@@ -368,7 +368,7 @@ if (pointer_) { \
/* Persistent memory that we may want to recover if something goes wrong */
#define MPIU_CHKPMEM_DECL(n_) \
- void *(mpiu_chkpmem_stk_[n_]);\
+ void *(mpiu_chkpmem_stk_[n_]) = { NULL }; \
int mpiu_chkpmem_stk_sp_=0;\
MPIU_AssertDeclValue(const int mpiu_chkpmem_stk_sz_,n_)
#define MPIU_CHKPMEM_MALLOC_ORSTMT(pointer_,type_,nbytes_,rc_,name_,stmt_) \
diff --git a/src/include/mpir_nbc.h b/src/include/mpir_nbc.h
index bd821cc..1a3964e 100644
--- a/src/include/mpir_nbc.h
+++ b/src/include/mpir_nbc.h
@@ -117,7 +117,7 @@ int MPIR_Sched_cb_free_buf(MPID_Comm *comm, int tag, void *state);
/* an upgraded version of MPIU_CHKPMEM_MALLOC/_DECL/_REAP/_COMMIT that adds
* corresponding cleanup callbacks to the given schedule at _COMMIT time */
#define MPIR_SCHED_CHKPMEM_DECL(n_) \
- void *(mpir_sched_chkpmem_stk_[n_]); \
+ void *(mpir_sched_chkpmem_stk_[n_]) = { NULL }; \
int mpir_sched_chkpmem_stk_sp_=0; \
MPIU_AssertDeclValue(const int mpir_sched_chkpmem_stk_sz_,n_)
http://git.mpich.org/mpich.git/commitdiff/6e8dae1b4fdbfd2d7225ca3fd285855322d25466
commit 6e8dae1b4fdbfd2d7225ca3fd285855322d25466
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Wed Nov 6 16:21:12 2013 -0600
Fix warning in opminloc.c and opmaxloc.c
Fixes the following warnings (with --enable-strict):
src/mpi/coll/opminloc.c: In function 'MPIR_MINLOC':
src/mpi/coll/opminloc.c:85:24: warning: variable 'flen' set but not used
[-Wunused-but-set-variable]
src/mpi/coll/opmaxloc.c: In function 'MPIR_MAXLOC':
src/mpi/coll/opmaxloc.c:86:24: warning: variable 'flen' set but not used
[-Wunused-but-set-variable]
See ticket #1966
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpi/coll/opmaxloc.c b/src/mpi/coll/opmaxloc.c
index 3f335d5..cf4ada7 100644
--- a/src/mpi/coll/opmaxloc.c
+++ b/src/mpi/coll/opmaxloc.c
@@ -83,9 +83,13 @@ void MPIR_MAXLOC(
MPI_Datatype *type )
{
int mpi_errno = MPI_SUCCESS;
- int i, len = *Len, flen;
+ int i, len = *Len;
- flen = len * 2; /* used for Fortran types */
+#ifdef HAVE_FORTRAN_BINDING
+#ifndef HAVE_NO_FORTRAN_MPI_TYPES_IN_C
+ int flen = len * 2; /* used for Fortran types */
+#endif
+#endif
switch (*type) {
/* first the C types */
diff --git a/src/mpi/coll/opminloc.c b/src/mpi/coll/opminloc.c
index a4ee0ce..c55c59a 100644
--- a/src/mpi/coll/opminloc.c
+++ b/src/mpi/coll/opminloc.c
@@ -82,9 +82,13 @@ void MPIR_MINLOC(
MPI_Datatype *type )
{
int mpi_errno = MPI_SUCCESS;
- int i, len = *Len, flen;
+ int i, len = *Len;
- flen = len * 2; /* used for Fortran types */
+#ifdef HAVE_FORTRAN_BINDING
+#ifndef HAVE_NO_FORTRAN_MPI_TYPES_IN_C
+ int flen = len * 2; /* used for Fortran types */
+#endif
+#endif
switch (*type) {
/* first the C types */
http://git.mpich.org/mpich.git/commitdiff/8822485c3bdfb99130ba6b00912e19fe6a6eb255
commit 8822485c3bdfb99130ba6b00912e19fe6a6eb255
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Wed Nov 6 16:18:48 2013 -0600
Fix warning in mpltrmem.c
Fixes the following warning (with --enable-strict):
src/mpltrmem.c: In function 'MPL_trdump':
src/mpltrmem.c:584:14: warning: variable 'old_head' set but not used
[-Wunused-but-set-variable]
See ticket #1966
Modifications by: Wesley Bland <wbland at mcs.anl.gov>
Signed-off-by: Wesley Bland <wbland at mcs.anl.gov>
diff --git a/src/mpl/src/mpltrmem.c b/src/mpl/src/mpltrmem.c
index b33887f..9d0d919 100644
--- a/src/mpl/src/mpltrmem.c
+++ b/src/mpl/src/mpltrmem.c
@@ -581,7 +581,9 @@ Input Parameters:
void MPL_trdump(FILE * fp, int minid)
{
TRSPACE *head;
+#ifdef VALGRIND_MAKE_MEM_NOACCESS
TRSPACE *old_head;
+#endif
char hexstring[MAX_ADDRESS_CHARS];
if (fp == 0)
@@ -607,7 +609,9 @@ void MPL_trdump(FILE * fp, int minid)
fprintf(fp, "%s[%d]\n", head->fname, head->lineno);
}
}
+#ifdef VALGRIND_MAKE_MEM_NOACCESS
old_head = head;
+#endif
head = head->next;
MPL_VG_MAKE_MEM_NOACCESS(old_head, sizeof(*old_head));
}
-----------------------------------------------------------------------
Summary of changes:
src/include/mpimem.h | 2 +-
src/include/mpir_nbc.h | 2 +-
src/mpi/coll/exscan.c | 2 +-
src/mpi/coll/iexscan.c | 2 +-
src/mpi/coll/ired_scat.c | 2 +-
src/mpi/coll/ired_scat_block.c | 2 +-
src/mpi/coll/iscatter.c | 2 +-
src/mpi/coll/opmaxloc.c | 8 ++++++--
src/mpi/coll/opminloc.c | 8 ++++++--
src/mpi/coll/red_scat.c | 3 ++-
src/mpi/coll/red_scat_block.c | 3 ++-
src/mpi/coll/reduce_local.c | 2 +-
src/mpi/debugger/dll_mpich.c | 7 -------
src/mpi/init/init.c | 2 +-
src/mpi/init/initthread.c | 2 +-
src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 2 ++
.../ch3/channels/nemesis/netmod/tcp/tcp_init.c | 5 +++--
src/mpid/ch3/include/mpidrma.h | 4 ++--
src/mpid/ch3/src/ch3u_handle_connection.c | 3 ++-
src/mpid/ch3/src/mpid_imrecv.c | 2 ++
src/mpid/ch3/src/mpid_irecv.c | 2 ++
src/mpid/ch3/src/mpid_recv.c | 2 ++
src/mpid/common/datatype/mpid_type_debug.c | 2 ++
src/mpl/src/mpltrmem.c | 4 ++++
src/nameserv/file/file_nameserv.c | 2 +-
src/pm/hydra/configure.ac | 2 --
src/pm/hydra/pm/pmiserv/pmip_cb.c | 4 +++-
src/pm/hydra/tools/ckpoint/ckpoint.c | 13 +++++++++----
28 files changed, 60 insertions(+), 36 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list