Commit a1b51968 authored by Darius Buntinas's avatar Darius Buntinas
Browse files

[svn-r6903] Fixed some warnings, fixed compile failure with --enable-fast,...

[svn-r6903] Fixed some warnings, fixed compile failure with --enable-fast, fixed places where MPIR_Err_return_* was not being called.  No reviewer.
parent fb991bd1
......@@ -332,6 +332,7 @@ int MPI_Comm_get_attr(MPI_Comm comm, int comm_keyval, void *attribute_val,
"**mpi_comm_get_attr %C %d %p %p", comm, comm_keyval, attribute_val, flag);
}
# endif
mpi_errno = MPIR_Err_return_comm( NULL, FCNAME, mpi_errno );
goto fn_exit;
/* --END ERROR HANDLING-- */
}
......@@ -206,6 +206,7 @@ int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val)
"**mpi_comm_set_attr %C %d %p", comm, comm_keyval, attribute_val);
}
# endif
mpi_errno = MPIR_Err_return_comm( NULL, FCNAME, mpi_errno );
goto fn_exit;
/* --END ERROR HANDLING-- */
}
......@@ -215,8 +215,8 @@ int MPI_Type_get_attr(MPI_Datatype type, int type_keyval, void *attribute_val,
"**mpi_type_get_attr %D %d %p %p",
type, type_keyval, attribute_val, flag);
}
mpi_errno = MPIR_Err_return_comm( NULL, FCNAME, mpi_errno );
#endif
mpi_errno = MPIR_Err_return_comm( NULL, FCNAME, mpi_errno );
goto fn_exit;
/* --END ERROR HANDLING-- */
}
......@@ -25,13 +25,11 @@
#undef FUNCNAME
#define FUNCNAME MPIR_WinGetAttr
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val,
int *flag, MPIR_AttrType outAttrType )
{
#ifdef HAVE_ERROR_CHECKING
static const char FCNAME[] = "MPIR_WinGetAttr";
#endif
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_WIN_GET_ATTR);
......@@ -206,7 +204,8 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val,
#undef FUNCNAME
#define FUNCNAME MPI_Win_get_attr
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPI_Win_get_attr - Get attribute cached on an MPI window object
......@@ -238,7 +237,6 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val,
int MPI_Win_get_attr(MPI_Win win, int win_keyval, void *attribute_val,
int *flag)
{
static const char FCNAME[] = "MPI_Win_get_attr";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_ATTR);
......@@ -267,8 +265,9 @@ int MPI_Win_get_attr(MPI_Win win, int win_keyval, void *attribute_val,
"**mpi_win_get_attr %W %d %p %p",
win, win_keyval, attribute_val, flag);
}
mpi_errno = MPIR_Err_return_win( win_ptr, FCNAME, mpi_errno );
#endif
MPID_Win_get_ptr( win, win_ptr );
mpi_errno = MPIR_Err_return_win( win_ptr, FCNAME, mpi_errno );
goto fn_exit;
/* --END ERROR HANDLING-- */
}
......@@ -197,6 +197,7 @@ corresponding keyval was created) will be called.
int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val)
{
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......@@ -220,6 +221,8 @@ int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val)
"**mpi_win_set_attr %W %d %p", win, win_keyval, attribute_val);
}
# endif
MPID_Win_get_ptr( win, win_ptr );
mpi_errno = MPIR_Err_return_win( win_ptr, FCNAME, mpi_errno );
goto fn_exit;
/* --END ERROR HANDLING-- */
}
......@@ -70,6 +70,10 @@
/* begin:nested */
/* not declared static because a machine-specific function may call this
one in some cases */
#undef FUNCNAME
#define FUNCNAME MPIR_Allgather_intra
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Allgather_intra (
void *sendbuf,
int sendcount,
......@@ -84,7 +88,6 @@ int MPIR_Allgather_intra (
MPI_Aint recvtype_extent, tot_bytes;
MPI_Aint recvtype_true_extent, recvbuf_extent, recvtype_true_lb;
int j, i, pof2, src, rem;
static const char FCNAME[] = "MPIR_Allgather_intra";
void *tmp_buf = NULL;
int curr_cnt, dst, type_size, left, right, jnext;
MPI_Comm comm;
......
......@@ -124,11 +124,3 @@ int MPI_Type_contiguous(int count,
goto fn_exit;
/* --END ERROR HANDLING-- */
}
......@@ -134,10 +134,3 @@ int MPI_Type_vector(int count,
goto fn_exit;
/* --END ERROR HANDLING-- */
}
......@@ -342,8 +342,8 @@ int MPI_Cart_create(MPI_Comm comm_old, int ndims, int *dims, int *periods,
"**mpi_cart_create %C %d %p %p %d %p", comm_old, ndims, dims,
periods, reorder, comm_cart);
}
mpi_errno = MPIR_Err_return_comm( comm_ptr, FCNAME, mpi_errno );
# endif
mpi_errno = MPIR_Err_return_comm( comm_ptr, FCNAME, mpi_errno );
/* --END ERROR HANDLING-- */
goto fn_exit;
}
......@@ -179,15 +179,13 @@ int MPI_Cart_map(MPI_Comm comm_old, int ndims, int *dims, int *periods,
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* ... end of body of routine ... */
#ifdef HAVE_ERROR_CHECKING
fn_exit:
#endif
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_CART_MAP);
return mpi_errno;
/* --BEGIN ERROR HANDLING-- */
# ifdef HAVE_ERROR_CHECKING
fn_fail:
# ifdef HAVE_ERROR_CHECKING
{
mpi_errno = MPIR_Err_create_code(
mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER,
......@@ -195,8 +193,8 @@ int MPI_Cart_map(MPI_Comm comm_old, int ndims, int *dims, int *periods,
"**mpi_cart_map %C %d %p %p %p", comm_old, ndims, dims, periods,
newrank);
}
# endif
mpi_errno = MPIR_Err_return_comm( comm_ptr, FCNAME, mpi_errno );
goto fn_exit;
# endif
/* --END ERROR HANDLING-- */
}
......@@ -91,7 +91,6 @@ int MPI_Cart_rank(MPI_Comm comm, int *coords, int *rank)
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPIR_Topology *cart_ptr;
int i, ndims, coord;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_RANK);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......@@ -132,6 +131,7 @@ int MPI_Cart_rank(MPI_Comm comm, int *coords, int *rank)
/* Validate coordinates */
# ifdef HAVE_ERROR_CHECKING
{
int i, ndims, coord;
MPID_BEGIN_ERROR_CHECKS;
{
ndims = cart_ptr->topo.cart.ndims;
......
......@@ -420,6 +420,7 @@ int MPI_Dims_create(int nnodes, int ndims, int *dims)
else {
mpi_errno = MPIR_Dims_create( nnodes, ndims, dims );
}
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* ... end of body of routine ... */
fn_exit:
......@@ -427,16 +428,16 @@ int MPI_Dims_create(int nnodes, int ndims, int *dims)
return mpi_errno;
/* --BEGIN ERROR HANDLING-- */
# ifdef HAVE_ERROR_CHECKING
fn_fail:
# ifdef HAVE_ERROR_CHECKING
{
mpi_errno = MPIR_Err_create_code(
mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER,
"**mpi_dims_create",
"**mpi_dims_create %d %d %p", nnodes, ndims, dims);
}
# endif
mpi_errno = MPIR_Err_return_comm( NULL, FCNAME, mpi_errno );
goto fn_exit;
# endif
/* --END ERROR HANDLING-- */
}
......@@ -403,10 +403,12 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, int sources[],
MPIU_Free(dist_graph_ptr->out_weights);
MPIU_CHKPMEM_REAP();
/* --BEGIN ERROR HANDLING-- */
#ifdef HAVE_ERROR_CHECKING
mpi_errno = MPIR_Err_create_code(
mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER,
"**mpi_dist_graph_create", "**mpi_dist_graph_create %C %d %p %p %p %p %I %d %p",
comm_old, n, sources, degrees, destinations, weights, info, reorder, comm_dist_graph);
#endif
mpi_errno = MPIR_Err_return_comm(comm_ptr, FCNAME, mpi_errno);
goto fn_exit;
/* --END ERROR HANDLING-- */
......
......@@ -180,6 +180,7 @@ int MPI_Dist_graph_create_adjacent(MPI_Comm comm_old,
/* --BEGIN ERROR HANDLING-- */
fn_fail:
#ifdef HAVE_ERROR_CHECKING
mpi_errno = MPIR_Err_create_code(
mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER,
"**mpi_dist_graph_create_adjacent",
......@@ -187,6 +188,7 @@ int MPI_Dist_graph_create_adjacent(MPI_Comm comm_old,
comm_old, indegree, sources, sourceweights,
outdegree, destinations, destweights,
info, reorder, comm_dist_graph);
#endif
mpi_errno = MPIR_Err_return_comm(comm_ptr, FCNAME, mpi_errno);
goto fn_exit;
/* --END ERROR HANDLING-- */
......
......@@ -121,10 +121,12 @@ int MPI_Dist_graph_neighbors(MPI_Comm comm,
fn_fail:
/* --BEGIN ERROR HANDLING-- */
#ifdef HAVE_ERROR_CHECKING
mpi_errno = MPIR_Err_create_code(
mpi_errno, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER,
"**mpi_dist_graph_neighbors", "**mpi_dist_graph_neighbors %C %d %p %p %d %p %p",
comm, maxindegree, sources, sourceweights, maxoutdegree, destinations, destweights);
#endif
mpi_errno = MPIR_Err_return_comm(comm_ptr, FCNAME, mpi_errno);
goto fn_exit;
/* --END ERROR HANDLING-- */
......
......@@ -177,7 +177,6 @@ int MPI_Graph_create(MPI_Comm comm_old, int nnodes, int *indx, int *edges,
{
static const char FCNAME[] = "MPI_Graph_create";
int mpi_errno = MPI_SUCCESS;
int i;
MPID_Comm *comm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPH_CREATE);
......@@ -229,6 +228,7 @@ int MPI_Graph_create(MPI_Comm comm_old, int nnodes, int *indx, int *edges,
MPID_BEGIN_ERROR_CHECKS;
{
int comm_size = comm_ptr->remote_size;
int i;
/* Check that the communicator is large enough */
if (nnodes > comm_size) {
......
......@@ -247,7 +247,7 @@ static int expand_sc_plfd_tbls (void)
{
sockconn_t *sc = &g_sc_tbl[i];
MPIDI_VC_t *vc = sc->vc;
MPID_nem_tcp_vc_area *vc_tcp = VC_TCP(vc);
MPIU_AssertDeclValue(MPID_nem_tcp_vc_area *vc_tcp, VC_TCP(vc));
/* sockconn_t *dbg_sc = g_sc_tbl[i].vc ? VC_FIELD(g_sc_tbl[i].vc, sc) : (sockconn_t*)(-1); */
/* The state is only valid if the FD is valid. The VC field is only
......@@ -1426,7 +1426,7 @@ fn_exit:
static int MPID_nem_tcp_recv_handler (struct pollfd *pfd, sockconn_t *const sc)
{
MPIDI_VC_t *const sc_vc = sc->vc;
MPID_nem_tcp_vc_area *const sc_vc_tcp = VC_TCP(sc_vc);
MPIU_AssertDeclValue(MPID_nem_tcp_vc_area *const sc_vc_tcp, VC_TCP(sc_vc));
int mpi_errno = MPI_SUCCESS;
ssize_t bytes_recvd;
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_TCP_RECV_HANDLER);
......
......@@ -406,7 +406,7 @@ void PREPEND_PREFIX(Segment_manipulate)(struct DLOOP_Segment *segp,
/* --BEGIN ERROR HANDLING-- */
/* verify that we're in the right location */
if (tmp_last != first) DLOOP_Assert(0);
DLOOP_Assert(tmp_last == first);
/* --END ERROR HANDLING-- */
}
......
......@@ -184,7 +184,7 @@ static HYD_status handle_exit_status(int fd, struct HYD_proxy *proxy)
static HYD_status control_cb(int fd, HYD_event_t events, void *userp)
{
int count, closed, i;
int count, closed;
enum HYD_pmcd_pmi_cmd cmd = INVALID_CMD;
struct HYD_pmcd_pmi_hdr hdr;
struct HYD_proxy *proxy;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment