[mpich2-commits] r4032 - in mpich2/trunk/src: mpi/attr mpi/coll mpi/comm mpi/pt2pt mpid/ch3/channels/nemesis/nemesis/netmod/tcp mpid/ch3/src
goodell at mcs.anl.gov
goodell at mcs.anl.gov
Thu Mar 12 14:18:18 CDT 2009
Author: goodell
Date: 2009-03-12 14:18:18 -0500 (Thu, 12 Mar 2009)
New Revision: 4032
Modified:
mpich2/trunk/src/mpi/attr/attrutil.c
mpich2/trunk/src/mpi/attr/comm_get_attr.c
mpich2/trunk/src/mpi/attr/comm_set_attr.c
mpich2/trunk/src/mpi/attr/type_get_attr.c
mpich2/trunk/src/mpi/attr/win_get_attr.c
mpich2/trunk/src/mpi/attr/win_set_attr.c
mpich2/trunk/src/mpi/coll/allgather.c
mpich2/trunk/src/mpi/comm/commutil.c
mpich2/trunk/src/mpi/comm/intercomm_create.c
mpich2/trunk/src/mpi/pt2pt/mpir_request.c
mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c
mpich2/trunk/src/mpid/ch3/src/ch3u_handle_recv_req.c
Log:
Minor warnings stomp.
No reviewer.
Modified: mpich2/trunk/src/mpi/attr/attrutil.c
===================================================================
--- mpich2/trunk/src/mpi/attr/attrutil.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/attr/attrutil.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -46,6 +46,10 @@
MPIU_Handle_obj_free(&MPID_Attr_mem, attr_ptr);
}
+#undef FUNCNAME
+#define FUNCNAME MPIR_Call_attr_delete
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*
This function deletes a single attribute.
It is called by both the function to delete a list and attribute set/put
@@ -61,7 +65,6 @@
*/
int MPIR_Call_attr_delete( int handle, MPID_Attribute *attr_p )
{
- static const char FCNAME[] = "MPIR_Call_attr_delete";
int rc;
int mpi_errno = MPI_SUCCESS;
MPID_Keyval* kv = attr_p->keyval;
@@ -109,9 +112,12 @@
Note that this simply invokes the attribute copy function.
*/
+#undef FUNCNAME
+#define FUNCNAME MPIR_Call_attr_copy
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Call_attr_copy( int handle, MPID_Attribute *attr_p, void** value_copy, int* flag)
{
- static const char FCNAME[] = "MPIR_Call_attr_copy";
int mpi_errno = MPI_SUCCESS;
int rc;
MPID_Keyval* kv = attr_p->keyval;
@@ -149,11 +155,14 @@
goto fn_exit;
}
+#undef FUNCNAME
+#define FUNCNAME MPIR_Attr_dup_list
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* Routine to duplicate an attribute list */
int MPIR_Attr_dup_list( int handle, MPID_Attribute *old_attrs,
MPID_Attribute **new_attr )
{
- static const char FCNAME[] = "MPIR_Attr_dup_list";
MPID_Attribute *p, *new_p, **next_new_attr_ptr=new_attr;
void* new_value = NULL;
int mpi_errno = MPI_SUCCESS;
@@ -209,10 +218,13 @@
goto fn_exit;
}
+#undef FUNCNAME
+#define FUNCNAME MPIR_Attr_delete_list
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* Routine to delete an attribute list */
int MPIR_Attr_delete_list( int handle, MPID_Attribute *attr )
{
- static const char FCNAME[] = "MPIR_Attr_delete_list";
MPID_Attribute *p, *new_p;
int mpi_errno = MPI_SUCCESS;
Modified: mpich2/trunk/src/mpi/attr/comm_get_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/comm_get_attr.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/attr/comm_get_attr.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -332,6 +332,8 @@
#undef FUNCNAME
#define FUNCNAME MPI_Comm_get_attr
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* FIXME: Attributes must be visable from all languages */
/*@
@@ -368,7 +370,6 @@
int MPI_Comm_get_attr(MPI_Comm comm, int comm_keyval, void *attribute_val,
int *flag)
{
- static const char FCNAME[] = "MPI_Comm_get_attr";
int mpi_errno = MPI_SUCCESS;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GET_ATTR);
Modified: mpich2/trunk/src/mpi/attr/comm_set_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/comm_set_attr.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/attr/comm_set_attr.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -159,7 +159,8 @@
#undef FUNCNAME
#define FUNCNAME MPI_Comm_set_attr
-
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPI_Comm_set_attr - Stores attribute value associated with a key
@@ -195,7 +196,6 @@
@*/
int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val)
{
- static const char FCNAME[] = "MPI_Comm_set_attr";
int mpi_errno = MPI_SUCCESS;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SET_ATTR);
Modified: mpich2/trunk/src/mpi/attr/type_get_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/type_get_attr.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/attr/type_get_attr.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -151,6 +151,8 @@
#undef FUNCNAME
#define FUNCNAME MPI_Type_get_attr
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPI_Type_get_attr - Retrieves attribute value by key
@@ -185,9 +187,6 @@
int MPI_Type_get_attr(MPI_Datatype type, int type_keyval, void *attribute_val,
int *flag)
{
-#ifdef HAVE_ERROR_CHECKING
- static const char FCNAME[] = "MPI_Type_get_attr";
-#endif
int mpi_errno = MPI_SUCCESS;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_GET_ATTR);
Modified: mpich2/trunk/src/mpi/attr/win_get_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/win_get_attr.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/attr/win_get_attr.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -238,9 +238,7 @@
int MPI_Win_get_attr(MPI_Win win, int win_keyval, void *attribute_val,
int *flag)
{
-#ifdef HAVE_ERROR_CHECKING
static const char FCNAME[] = "MPI_Win_get_attr";
-#endif
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_ATTR);
Modified: mpich2/trunk/src/mpi/attr/win_set_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/win_set_attr.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/attr/win_set_attr.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -165,6 +165,8 @@
#undef FUNCNAME
#define FUNCNAME MPI_Win_set_attr
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPI_Win_set_attr - Stores attribute value associated with a key
@@ -194,7 +196,6 @@
@*/
int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val)
{
- static const char FCNAME[] = "MPI_Win_set_attr";
int mpi_errno = MPI_SUCCESS;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_ATTR);
Modified: mpich2/trunk/src/mpi/coll/allgather.c
===================================================================
--- mpich2/trunk/src/mpi/coll/allgather.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/coll/allgather.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -581,6 +581,10 @@
}
/* end:nested */
+#undef FUNCNAME
+#define FUNCNAME MPIR_Allgather_inter
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* begin:nested */
/* not declared static because a machine-specific function may call this one
in some cases */
@@ -598,7 +602,6 @@
intracommunicator, and then does an intercommunicator broadcast.
*/
- static const char FCNAME[] = "MPIR_Allgather_inter";
int rank, local_size, remote_size, mpi_errno = MPI_SUCCESS, root;
MPI_Aint true_extent, true_lb = 0, extent, send_extent;
void *tmp_buf=NULL;
@@ -698,7 +701,8 @@
#undef FUNCNAME
#define FUNCNAME MPI_Allgather
-
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPI_Allgather - Gathers data from all tasks and distribute the combined
data to all tasks
@@ -746,7 +750,6 @@
void *recvbuf, int recvcount, MPI_Datatype recvtype,
MPI_Comm comm)
{
- static const char FCNAME[] = "MPI_Allgather";
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLGATHER);
Modified: mpich2/trunk/src/mpi/comm/commutil.c
===================================================================
--- mpich2/trunk/src/mpi/comm/commutil.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/comm/commutil.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -848,7 +848,7 @@
{
int mpi_errno = MPI_SUCCESS;
MPIR_Context_id_t new_context_id, new_recvcontext_id;
- MPID_Comm *newcomm_ptr;
+ MPID_Comm *newcomm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_COPY);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_COPY);
Modified: mpich2/trunk/src/mpi/comm/intercomm_create.c
===================================================================
--- mpich2/trunk/src/mpi/comm/intercomm_create.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/comm/intercomm_create.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -20,7 +20,9 @@
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
+#ifdef HAVE_ERROR_CHECKING
PMPI_LOCAL int MPIR_CheckDisjointLpids( int [], int, int [], int );
+#endif
PMPI_LOCAL int MPID_LPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size,
int local_lpids[] );
@@ -33,10 +35,11 @@
#define MAX_LPID32_ARRAY 128
#undef FUNCNAME
#define FUNCNAME MPIR_CheckDisjointLpids
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
PMPI_LOCAL int MPIR_CheckDisjointLpids( int lpids1[], int n1,
int lpids2[], int n2 )
{
- static const char FCNAME[] = "MPIR_CheckDisjointLpids";
int i, maxi, idx, bit, maxlpid = -1;
int mpi_errno = MPI_SUCCESS;
int32_t lpidmaskPrealloc[MAX_LPID32_ARRAY];
@@ -171,7 +174,8 @@
#undef FUNCNAME
#define FUNCNAME MPI_Intercomm_create
-
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPI_Intercomm_create - Creates an intercommuncator from two intracommunicators
@@ -224,7 +228,6 @@
MPI_Comm peer_comm, int remote_leader, int tag,
MPI_Comm *newintercomm)
{
- static const char FCNAME[] = "MPI_Intercomm_create";
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Comm *peer_comm_ptr = NULL;
Modified: mpich2/trunk/src/mpi/pt2pt/mpir_request.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/mpir_request.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpi/pt2pt/mpir_request.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -7,6 +7,10 @@
#include "mpiimpl.h"
+#undef FUNCNAME
+#define FUNCNAME MPIR_Request_complete
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* Complete a request, saving the status data if necessary.
"active" has meaning only if the request is a persistent request; this
allows the completion routines to indicate that a persistent request
@@ -20,7 +24,6 @@
int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr,
MPI_Status * status, int * active)
{
- static const char FCNAME[] = "MPIR_Request_complete";
int mpi_errno = MPI_SUCCESS;
*active = TRUE;
@@ -210,6 +213,10 @@
}
+#undef FUNCNAME
+#define FUNCNAME MPIR_Request_get_error
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* FIXME: What is this routine for?
*
* [BRT] it is used by testall, although looking at testall now, I think the
@@ -217,7 +224,6 @@
*/
int MPIR_Request_get_error(MPID_Request * request_ptr)
{
- static const char FCNAME[] = "MPIR_Request_get_error";
int mpi_errno = MPI_SUCCESS;
MPIU_THREADPRIV_DECL;
@@ -352,9 +358,10 @@
#undef FUNCNAME
#define FUNCNAME MPIR_Grequest_cancel
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Grequest_cancel(MPID_Request * request_ptr, int complete)
{
- static const char * FCNAME = MPIU_QUOTE(FUNCNAME);
int rc;
int mpi_errno = MPI_SUCCESS;
@@ -401,9 +408,10 @@
#undef FUNCNAME
#define FUNCNAME MPIR_Grequest_query
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Grequest_query(MPID_Request * request_ptr)
{
- static const char * FCNAME = MPIU_QUOTE(FUNCNAME);
int rc;
int mpi_errno = MPI_SUCCESS;
@@ -448,9 +456,10 @@
#undef FUNCNAME
#define FUNCNAME MPIR_Grequest_free
+#undef FCNAME
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Grequest_free(MPID_Request * request_ptr)
{
- static const char * FCNAME = MPIU_QUOTE(FUNCNAME);
int rc;
int mpi_errno = MPI_SUCCESS;
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-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -1254,7 +1254,7 @@
{
int mpi_errno = MPI_SUCCESS;
MPID_NEM_TCP_SOCK_STATUS_t stat;
- sockconn_t *fnd_sc;
+ sockconn_t *fnd_sc = NULL;
int snd_nak = FALSE;
MPIDI_STATE_DECL(MPID_STATE_STATE_L_RANKRCVD_HANDLER);
@@ -1685,7 +1685,7 @@
"**sock_accept", "**sock_accept %s", strerror(errno));
}
else {
- int index;
+ int index = -1;
pollfd_t *plfd;
sockconn_t *sc;
Modified: mpich2/trunk/src/mpid/ch3/src/ch3u_handle_recv_req.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/src/ch3u_handle_recv_req.c 2009-03-12 19:17:09 UTC (rev 4031)
+++ mpich2/trunk/src/mpid/ch3/src/ch3u_handle_recv_req.c 2009-03-12 19:18:18 UTC (rev 4032)
@@ -144,7 +144,7 @@
int *complete )
{
int mpi_errno = MPI_SUCCESS;
- MPID_Datatype *new_dtp;
+ MPID_Datatype *new_dtp = NULL;
MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_PUTRESPDERIVEDDTCOMPLETE);
MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_REQHANDLER_PUTRESPDERIVEDDTCOMPLETE);
@@ -195,7 +195,7 @@
int *complete )
{
int mpi_errno = MPI_SUCCESS;
- MPID_Datatype *new_dtp;
+ MPID_Datatype *new_dtp = NULL;
MPI_Aint true_lb, true_extent, extent;
void *tmp_buf;
MPIU_THREADPRIV_DECL;
@@ -274,7 +274,7 @@
int *complete )
{
int mpi_errno = MPI_SUCCESS;
- MPID_Datatype *new_dtp;
+ MPID_Datatype *new_dtp = NULL;
MPIDI_CH3_Pkt_t upkt;
MPIDI_CH3_Pkt_get_resp_t * get_resp_pkt = &upkt.get_resp;
MPID_Request * sreq;
More information about the mpich2-commits
mailing list