Commit 9df3f7eb authored by David Goodell's avatar David Goodell
Browse files

[svn-r6689] fix unused variable 'MPIR_Thread' warnings introduced by previous commit

This is done as a separate commit to de-clutter the change with actual
logic changes in it.

No reviewer.
parent d15ce70d
......@@ -23,6 +23,7 @@ MPIU_Thread_CS_enter_lockname_impl_(enum MPIU_Nest_mutexes kind,
MPID_Thread_mutex_t *mutex)
{
MPIU_THREADPRIV_DECL;
MPIU_THREADPRIV_GET;
MPIU_THREAD_CHECKDEPTH(kind, lockname, 0);
MPIU_THREAD_CHECKNEST(kind, lockname)
{
......@@ -42,6 +43,7 @@ MPIU_Thread_CS_exit_lockname_impl_(enum MPIU_Nest_mutexes kind,
MPID_Thread_mutex_t *mutex)
{
MPIU_THREADPRIV_DECL;
MPIU_THREADPRIV_GET;
MPIU_THREAD_CHECKDEPTH(kind, lockname, 1);
MPIU_THREAD_CHECKNEST(kind, lockname)
{
......@@ -61,6 +63,7 @@ MPIU_Thread_CS_yield_lockname_impl_(enum MPIU_Nest_mutexes kind,
MPID_Thread_mutex_t *mutex)
{
MPIU_THREADPRIV_DECL;
MPIU_THREADPRIV_GET;
MPIU_THREAD_CHECKDEPTH(kind, lockname, 1);
/* don't CHECKNEST here, we want nesting to be >0 */
MPID_Thread_mutex_unlock(mutex);
......
......@@ -72,7 +72,6 @@ int MPI_Comm_create_keyval(MPI_Comm_copy_attr_function *comm_copy_attr_fn,
static const char FCNAME[] = "MPI_Comm_create_keyval";
int mpi_errno = MPI_SUCCESS;
MPID_Keyval *keyval_ptr;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CREATE_KEYVAL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -55,7 +55,6 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval)
MPID_Comm *comm_ptr = NULL;
MPID_Attribute *p, **old_p;
MPID_Keyval *keyval_ptr;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DELETE_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -55,7 +55,6 @@ int MPI_Comm_free_keyval(int *comm_keyval)
MPID_Keyval *keyval_ptr = NULL;
int in_use;
int mpi_errno = MPI_SUCCESS;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_FREE_KEYVAL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -42,7 +42,6 @@ int MPIR_CommGetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val,
MPID_Comm *comm_ptr = NULL;
static PreDefined_attrs attr_copy; /* Used to provide a copy of the
predefined attributes */
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_GET_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -34,7 +34,6 @@ int MPIR_CommSetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val,
MPID_Comm *comm_ptr = NULL;
MPID_Keyval *keyval_ptr = NULL;
MPID_Attribute *p, **old_p;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_SET_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -64,7 +64,6 @@ int MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn,
static const char FCNAME[] = "MPI_Type_create_keyval";
int mpi_errno = MPI_SUCCESS;
MPID_Keyval *keyval_ptr;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_KEYVAL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -53,7 +53,6 @@ int MPI_Type_delete_attr(MPI_Datatype type, int type_keyval)
MPID_Datatype *type_ptr = NULL;
MPID_Attribute *p, **old_p;
MPID_Keyval *keyval_ptr = 0;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_DELETE_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -52,7 +52,6 @@ int MPI_Type_free_keyval(int *type_keyval)
MPID_Keyval *keyval_ptr = NULL;
int in_use;
int mpi_errno = MPI_SUCCESS;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_FREE_KEYVAL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -36,7 +36,6 @@ int MPIR_TypeGetAttr( MPI_Datatype type, int type_keyval, void *attribute_val,
int mpi_errno = MPI_SUCCESS;
MPID_Datatype *type_ptr = NULL;
MPID_Attribute *p;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_TYPE_GET_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -34,7 +34,6 @@ int MPIR_TypeSetAttr(MPI_Datatype type, int type_keyval, void *attribute_val,
MPID_Datatype *type_ptr = NULL;
MPID_Keyval *keyval_ptr = NULL;
MPID_Attribute *p, **old_p;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_TYPE_SET_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -64,7 +64,6 @@ int MPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_attr_fn,
static const char FCNAME[] = "MPI_Win_create_keyval";
int mpi_errno = MPI_SUCCESS;
MPID_Keyval *keyval_ptr;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE_KEYVAL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -54,7 +54,6 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval)
MPID_Win *win_ptr = NULL;
MPID_Attribute *p, **old_p;
MPID_Keyval *keyval_ptr=0;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_DELETE_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -53,7 +53,6 @@ int MPI_Win_free_keyval(int *win_keyval)
int mpi_errno = MPI_SUCCESS;
MPID_Keyval *keyval_ptr = NULL;
int in_use;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FREE_KEYVAL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -34,7 +34,6 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val,
#endif
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_WIN_GET_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -34,7 +34,6 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val,
MPID_Win *win_ptr = NULL;
MPID_Keyval *keyval_ptr = NULL;
MPID_Attribute *p, **old_p;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIR_WIN_SET_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -1206,7 +1206,6 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root,
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_BCAST);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -54,7 +54,6 @@ int MPI_Op_commutative(MPI_Op op, int *commute)
{
MPID_Op *op_ptr = NULL;
int mpi_errno = MPI_SUCCESS;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_OP_COMMUTATIVE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -88,7 +88,6 @@ int MPI_Op_create(MPI_User_function *function, int commute, MPI_Op *op)
static const char FCNAME[] = "MPI_Op_create";
MPID_Op *op_ptr;
int mpi_errno = MPI_SUCCESS;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_OP_CREATE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
......@@ -58,7 +58,6 @@ int MPI_Op_free(MPI_Op *op)
MPID_Op *op_ptr = NULL;
int in_use;
int mpi_errno = MPI_SUCCESS;
MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_OP_FREE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
......
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