[mpich2-commits] r6689 - in mpich2/trunk/src: include mpi/attr mpi/coll mpi/comm mpi/datatype mpi/errhan mpi/group mpi/init mpi/pt2pt mpi/rma mpi/romio/mpi-io mpi/spawn mpi/topo mpid/ch3/channels/nemesis/src util/info
goodell at mcs.anl.gov
goodell at mcs.anl.gov
Thu May 20 13:44:37 CDT 2010
Author: goodell
Date: 2010-05-20 13:44:37 -0500 (Thu, 20 May 2010)
New Revision: 6689
Modified:
mpich2/trunk/src/include/mpiimplthreadpost.h
mpich2/trunk/src/mpi/attr/comm_create_keyval.c
mpich2/trunk/src/mpi/attr/comm_delete_attr.c
mpich2/trunk/src/mpi/attr/comm_free_keyval.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_create_keyval.c
mpich2/trunk/src/mpi/attr/type_delete_attr.c
mpich2/trunk/src/mpi/attr/type_free_keyval.c
mpich2/trunk/src/mpi/attr/type_get_attr.c
mpich2/trunk/src/mpi/attr/type_set_attr.c
mpich2/trunk/src/mpi/attr/win_create_keyval.c
mpich2/trunk/src/mpi/attr/win_delete_attr.c
mpich2/trunk/src/mpi/attr/win_free_keyval.c
mpich2/trunk/src/mpi/attr/win_get_attr.c
mpich2/trunk/src/mpi/attr/win_set_attr.c
mpich2/trunk/src/mpi/coll/bcast.c
mpich2/trunk/src/mpi/coll/op_commutative.c
mpich2/trunk/src/mpi/coll/op_create.c
mpich2/trunk/src/mpi/coll/op_free.c
mpich2/trunk/src/mpi/comm/comm_create.c
mpich2/trunk/src/mpi/comm/comm_dup.c
mpich2/trunk/src/mpi/comm/comm_free.c
mpich2/trunk/src/mpi/comm/comm_group.c
mpich2/trunk/src/mpi/comm/comm_remote_group.c
mpich2/trunk/src/mpi/datatype/type_contiguous.c
mpich2/trunk/src/mpi/datatype/type_create_hindexed.c
mpich2/trunk/src/mpi/datatype/type_create_hvector.c
mpich2/trunk/src/mpi/datatype/type_create_indexed_block.c
mpich2/trunk/src/mpi/datatype/type_create_resized.c
mpich2/trunk/src/mpi/datatype/type_create_struct.c
mpich2/trunk/src/mpi/datatype/type_dup.c
mpich2/trunk/src/mpi/datatype/type_free.c
mpich2/trunk/src/mpi/datatype/type_get_contents.c
mpich2/trunk/src/mpi/datatype/type_hindexed.c
mpich2/trunk/src/mpi/datatype/type_hvector.c
mpich2/trunk/src/mpi/datatype/type_indexed.c
mpich2/trunk/src/mpi/datatype/type_struct.c
mpich2/trunk/src/mpi/datatype/type_vector.c
mpich2/trunk/src/mpi/errhan/add_error_class.c
mpich2/trunk/src/mpi/errhan/add_error_code.c
mpich2/trunk/src/mpi/errhan/add_error_string.c
mpich2/trunk/src/mpi/errhan/comm_create_errhandler.c
mpich2/trunk/src/mpi/errhan/comm_get_errhandler.c
mpich2/trunk/src/mpi/errhan/comm_set_errhandler.c
mpich2/trunk/src/mpi/errhan/errhandler_free.c
mpich2/trunk/src/mpi/errhan/file_create_errhandler.c
mpich2/trunk/src/mpi/errhan/file_get_errhandler.c
mpich2/trunk/src/mpi/errhan/win_create_errhandler.c
mpich2/trunk/src/mpi/errhan/win_get_errhandler.c
mpich2/trunk/src/mpi/group/group_compare.c
mpich2/trunk/src/mpi/group/group_difference.c
mpich2/trunk/src/mpi/group/group_excl.c
mpich2/trunk/src/mpi/group/group_free.c
mpich2/trunk/src/mpi/group/group_incl.c
mpich2/trunk/src/mpi/group/group_intersection.c
mpich2/trunk/src/mpi/group/group_range_excl.c
mpich2/trunk/src/mpi/group/group_range_incl.c
mpich2/trunk/src/mpi/group/group_translate_ranks.c
mpich2/trunk/src/mpi/group/group_union.c
mpich2/trunk/src/mpi/init/abort.c
mpich2/trunk/src/mpi/init/init.c
mpich2/trunk/src/mpi/init/initthread.c
mpich2/trunk/src/mpi/pt2pt/bsend.c
mpich2/trunk/src/mpi/pt2pt/bsend_init.c
mpich2/trunk/src/mpi/pt2pt/bufattach.c
mpich2/trunk/src/mpi/pt2pt/buffree.c
mpich2/trunk/src/mpi/pt2pt/greq_complete.c
mpich2/trunk/src/mpi/pt2pt/greq_start.c
mpich2/trunk/src/mpi/pt2pt/iprobe.c
mpich2/trunk/src/mpi/pt2pt/irecv.c
mpich2/trunk/src/mpi/pt2pt/irsend.c
mpich2/trunk/src/mpi/pt2pt/isend.c
mpich2/trunk/src/mpi/pt2pt/issend.c
mpich2/trunk/src/mpi/pt2pt/probe.c
mpich2/trunk/src/mpi/pt2pt/recv.c
mpich2/trunk/src/mpi/pt2pt/recv_init.c
mpich2/trunk/src/mpi/pt2pt/request_free.c
mpich2/trunk/src/mpi/pt2pt/rsend.c
mpich2/trunk/src/mpi/pt2pt/rsend_init.c
mpich2/trunk/src/mpi/pt2pt/send.c
mpich2/trunk/src/mpi/pt2pt/send_init.c
mpich2/trunk/src/mpi/pt2pt/sendrecv.c
mpich2/trunk/src/mpi/pt2pt/ssend.c
mpich2/trunk/src/mpi/pt2pt/ssend_init.c
mpich2/trunk/src/mpi/pt2pt/start.c
mpich2/trunk/src/mpi/pt2pt/startall.c
mpich2/trunk/src/mpi/pt2pt/test.c
mpich2/trunk/src/mpi/pt2pt/testall.c
mpich2/trunk/src/mpi/pt2pt/testany.c
mpich2/trunk/src/mpi/pt2pt/testsome.c
mpich2/trunk/src/mpi/pt2pt/wait.c
mpich2/trunk/src/mpi/pt2pt/waitall.c
mpich2/trunk/src/mpi/pt2pt/waitany.c
mpich2/trunk/src/mpi/pt2pt/waitsome.c
mpich2/trunk/src/mpi/rma/accumulate.c
mpich2/trunk/src/mpi/rma/alloc_mem.c
mpich2/trunk/src/mpi/rma/free_mem.c
mpich2/trunk/src/mpi/rma/get.c
mpich2/trunk/src/mpi/rma/put.c
mpich2/trunk/src/mpi/rma/win_complete.c
mpich2/trunk/src/mpi/rma/win_create.c
mpich2/trunk/src/mpi/rma/win_fence.c
mpich2/trunk/src/mpi/rma/win_free.c
mpich2/trunk/src/mpi/rma/win_lock.c
mpich2/trunk/src/mpi/rma/win_post.c
mpich2/trunk/src/mpi/rma/win_start.c
mpich2/trunk/src/mpi/rma/win_test.c
mpich2/trunk/src/mpi/rma/win_unlock.c
mpich2/trunk/src/mpi/rma/win_wait.c
mpich2/trunk/src/mpi/romio/mpi-io/close.c
mpich2/trunk/src/mpi/romio/mpi-io/delete.c
mpich2/trunk/src/mpi/romio/mpi-io/fsync.c
mpich2/trunk/src/mpi/romio/mpi-io/get_group.c
mpich2/trunk/src/mpi/romio/mpi-io/get_info.c
mpich2/trunk/src/mpi/romio/mpi-io/get_view.c
mpich2/trunk/src/mpi/romio/mpi-io/iread.c
mpich2/trunk/src/mpi/romio/mpi-io/iread_sh.c
mpich2/trunk/src/mpi/romio/mpi-io/iwrite.c
mpich2/trunk/src/mpi/romio/mpi-io/iwrite_sh.c
mpich2/trunk/src/mpi/romio/mpi-io/open.c
mpich2/trunk/src/mpi/romio/mpi-io/prealloc.c
mpich2/trunk/src/mpi/romio/mpi-io/read.c
mpich2/trunk/src/mpi/romio/mpi-io/read_all.c
mpich2/trunk/src/mpi/romio/mpi-io/read_allb.c
mpich2/trunk/src/mpi/romio/mpi-io/read_alle.c
mpich2/trunk/src/mpi/romio/mpi-io/read_ord.c
mpich2/trunk/src/mpi/romio/mpi-io/read_ordb.c
mpich2/trunk/src/mpi/romio/mpi-io/read_orde.c
mpich2/trunk/src/mpi/romio/mpi-io/read_sh.c
mpich2/trunk/src/mpi/romio/mpi-io/register_datarep.c
mpich2/trunk/src/mpi/romio/mpi-io/seek.c
mpich2/trunk/src/mpi/romio/mpi-io/seek_sh.c
mpich2/trunk/src/mpi/romio/mpi-io/set_atom.c
mpich2/trunk/src/mpi/romio/mpi-io/set_info.c
mpich2/trunk/src/mpi/romio/mpi-io/set_size.c
mpich2/trunk/src/mpi/romio/mpi-io/set_view.c
mpich2/trunk/src/mpi/romio/mpi-io/write.c
mpich2/trunk/src/mpi/romio/mpi-io/write_all.c
mpich2/trunk/src/mpi/romio/mpi-io/write_allb.c
mpich2/trunk/src/mpi/romio/mpi-io/write_alle.c
mpich2/trunk/src/mpi/romio/mpi-io/write_ord.c
mpich2/trunk/src/mpi/romio/mpi-io/write_ordb.c
mpich2/trunk/src/mpi/romio/mpi-io/write_orde.c
mpich2/trunk/src/mpi/romio/mpi-io/write_sh.c
mpich2/trunk/src/mpi/spawn/close_port.c
mpich2/trunk/src/mpi/spawn/comm_accept.c
mpich2/trunk/src/mpi/spawn/comm_connect.c
mpich2/trunk/src/mpi/spawn/comm_disconnect.c
mpich2/trunk/src/mpi/spawn/comm_spawn.c
mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c
mpich2/trunk/src/mpi/spawn/open_port.c
mpich2/trunk/src/mpi/spawn/publish_name.c
mpich2/trunk/src/mpi/spawn/unpublish_name.c
mpich2/trunk/src/mpi/topo/cart_create.c
mpich2/trunk/src/mpi/topo/dist_gr_create_adj.c
mpich2/trunk/src/mpi/topo/dist_gr_neighb.c
mpich2/trunk/src/mpi/topo/dist_gr_neighb_count.c
mpich2/trunk/src/mpi/topo/graphcreate.c
mpich2/trunk/src/mpi/topo/graphnbrcnt.c
mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
mpich2/trunk/src/util/info/info_create.c
mpich2/trunk/src/util/info/info_delete.c
mpich2/trunk/src/util/info/info_dup.c
mpich2/trunk/src/util/info/info_free.c
mpich2/trunk/src/util/info/info_get.c
mpich2/trunk/src/util/info/info_getn.c
mpich2/trunk/src/util/info/info_getnth.c
mpich2/trunk/src/util/info/info_getvallen.c
mpich2/trunk/src/util/info/info_set.c
Log:
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.
Modified: mpich2/trunk/src/include/mpiimplthreadpost.h
===================================================================
--- mpich2/trunk/src/include/mpiimplthreadpost.h 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/include/mpiimplthreadpost.h 2010-05-20 18:44:37 UTC (rev 6689)
@@ -23,6 +23,7 @@
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 @@
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 @@
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);
Modified: mpich2/trunk/src/mpi/attr/comm_create_keyval.c
===================================================================
--- mpich2/trunk/src/mpi/attr/comm_create_keyval.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/comm_create_keyval.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -72,7 +72,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/comm_delete_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/comm_delete_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/comm_delete_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -55,7 +55,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/comm_free_keyval.c
===================================================================
--- mpich2/trunk/src/mpi/attr/comm_free_keyval.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/comm_free_keyval.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -55,7 +55,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/comm_get_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/comm_get_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/comm_get_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -42,7 +42,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/comm_set_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/comm_set_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/comm_set_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -34,7 +34,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/type_create_keyval.c
===================================================================
--- mpich2/trunk/src/mpi/attr/type_create_keyval.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/type_create_keyval.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -64,7 +64,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/type_delete_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/type_delete_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/type_delete_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -53,7 +53,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/type_free_keyval.c
===================================================================
--- mpich2/trunk/src/mpi/attr/type_free_keyval.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/type_free_keyval.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -52,7 +52,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/type_get_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/type_get_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/type_get_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -36,7 +36,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/type_set_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/type_set_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/type_set_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -34,7 +34,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/win_create_keyval.c
===================================================================
--- mpich2/trunk/src/mpi/attr/win_create_keyval.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/win_create_keyval.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -64,7 +64,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/win_delete_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/win_delete_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/win_delete_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -54,7 +54,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/win_free_keyval.c
===================================================================
--- mpich2/trunk/src/mpi/attr/win_free_keyval.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/win_free_keyval.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -53,7 +53,6 @@
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();
Modified: mpich2/trunk/src/mpi/attr/win_get_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/win_get_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/win_get_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -34,7 +34,6 @@
#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();
Modified: mpich2/trunk/src/mpi/attr/win_set_attr.c
===================================================================
--- mpich2/trunk/src/mpi/attr/win_set_attr.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/attr/win_set_attr.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -34,7 +34,6 @@
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();
Modified: mpich2/trunk/src/mpi/coll/bcast.c
===================================================================
--- mpich2/trunk/src/mpi/coll/bcast.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/coll/bcast.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -1206,7 +1206,6 @@
{
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();
Modified: mpich2/trunk/src/mpi/coll/op_commutative.c
===================================================================
--- mpich2/trunk/src/mpi/coll/op_commutative.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/coll/op_commutative.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -54,7 +54,6 @@
{
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();
Modified: mpich2/trunk/src/mpi/coll/op_create.c
===================================================================
--- mpich2/trunk/src/mpi/coll/op_create.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/coll/op_create.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -88,7 +88,6 @@
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();
Modified: mpich2/trunk/src/mpi/coll/op_free.c
===================================================================
--- mpich2/trunk/src/mpi/coll/op_free.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/coll/op_free.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -58,7 +58,6 @@
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();
Modified: mpich2/trunk/src/mpi/comm/comm_create.c
===================================================================
--- mpich2/trunk/src/mpi/comm/comm_create.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/comm/comm_create.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -519,7 +519,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Group *group_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CREATE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/comm/comm_dup.c
===================================================================
--- mpich2/trunk/src/mpi/comm/comm_dup.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/comm/comm_dup.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -80,7 +80,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL, *newcomm_ptr;
MPID_Attribute *new_attributes = 0;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DUP);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/comm/comm_free.c
===================================================================
--- mpich2/trunk/src/mpi/comm/comm_free.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/comm/comm_free.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -68,7 +68,6 @@
static const char FCNAME[] = "MPI_Comm_free";
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_FREE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/comm/comm_group.c
===================================================================
--- mpich2/trunk/src/mpi/comm/comm_group.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/comm/comm_group.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -58,7 +58,6 @@
int i, lpid, n;
MPID_Group *group_ptr;
MPID_VCR *local_vcr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GROUP);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/comm/comm_remote_group.c
===================================================================
--- mpich2/trunk/src/mpi/comm/comm_remote_group.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/comm/comm_remote_group.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -60,7 +60,6 @@
MPID_Comm *comm_ptr = NULL;
int i, lpid, n;
MPID_Group *group_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_REMOTE_GROUP);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_contiguous.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_contiguous.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_contiguous.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -54,7 +54,6 @@
static const char FCNAME[] = "MPI_Type_contiguous";
int mpi_errno = MPI_SUCCESS;
MPID_Datatype *new_dtp;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CONTIGUOUS);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_create_hindexed.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_create_hindexed.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_create_hindexed.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -62,7 +62,6 @@
MPID_Datatype *new_dtp;
int i, *ints;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_HINDEXED);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_create_hvector.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_create_hvector.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_create_hvector.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -60,7 +60,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Datatype *new_dtp;
int ints[2];
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_HVECTOR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_create_indexed_block.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_create_indexed_block.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_create_indexed_block.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -83,7 +83,6 @@
MPID_Datatype *new_dtp;
int i, *ints;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_INDEXED_BLOCK);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_create_resized.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_create_resized.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_create_resized.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -57,7 +57,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Datatype *new_dtp;
MPI_Aint aints[2];
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_RESIZED);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_create_struct.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_create_struct.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_create_struct.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -63,7 +63,6 @@
int i, *ints;
MPID_Datatype *new_dtp;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_STRUCT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_dup.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_dup.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_dup.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -51,7 +51,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Datatype *datatype_ptr = NULL;
MPID_Datatype *new_dtp;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_DUP);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_free.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_free.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_free.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -60,7 +60,6 @@
{
int mpi_errno = MPI_SUCCESS;
MPID_Datatype *datatype_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_FREE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_get_contents.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_get_contents.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_get_contents.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -58,7 +58,6 @@
static const char FCNAME[] = "MPI_Type_get_contents";
int mpi_errno = MPI_SUCCESS;
MPID_Datatype *datatype_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_GET_CONTENTS);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_hindexed.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_hindexed.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_hindexed.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -87,7 +87,6 @@
MPID_Datatype *new_dtp;
int i, *ints;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_HINDEXED);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_hvector.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_hvector.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_hvector.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -55,7 +55,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Datatype *new_dtp;
int ints[2];
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_HVECTOR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_indexed.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_indexed.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_indexed.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -84,7 +84,6 @@
MPID_Datatype *new_dtp;
int i, *ints;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_INDEXED);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_struct.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_struct.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_struct.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -103,7 +103,6 @@
static const char FCNAME[] = "MPI_Type_struct";
int mpi_errno = MPI_SUCCESS;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_STRUCT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/datatype/type_vector.c
===================================================================
--- mpich2/trunk/src/mpi/datatype/type_vector.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/datatype/type_vector.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -56,7 +56,6 @@
{
static const char FCNAME[] = "MPI_Type_vector";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_VECTOR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/add_error_class.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/add_error_class.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/add_error_class.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -48,7 +48,6 @@
static const char FCNAME[] = "MPI_Add_error_class";
int mpi_errno = MPI_SUCCESS;
int new_class;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ADD_ERROR_CLASS);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/add_error_code.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/add_error_code.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/add_error_code.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -51,7 +51,6 @@
static const char FCNAME[] = "MPI_Add_error_code";
int mpi_errno = MPI_SUCCESS;
int new_code;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ADD_ERROR_CODE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/add_error_string.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/add_error_string.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/add_error_string.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -60,7 +60,6 @@
{
static const char FCNAME[] = "MPI_Add_error_string";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ADD_ERROR_STRING);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/comm_create_errhandler.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/comm_create_errhandler.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/comm_create_errhandler.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -52,7 +52,6 @@
static const char FCNAME[] = "MPI_Comm_create_errhandler";
int mpi_errno = MPI_SUCCESS;
MPID_Errhandler *errhan_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CREATE_ERRHANDLER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/comm_get_errhandler.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/comm_get_errhandler.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/comm_get_errhandler.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -52,7 +52,6 @@
#endif
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GET_ERRHANDLER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/comm_set_errhandler.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/comm_set_errhandler.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/comm_set_errhandler.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -54,7 +54,6 @@
MPID_Comm *comm_ptr = NULL;
int in_use;
MPID_Errhandler *errhan_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SET_ERRHANDLER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/errhandler_free.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/errhandler_free.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/errhandler_free.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -51,7 +51,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Errhandler *errhan_ptr = NULL;
int in_use;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ERRHANDLER_FREE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/file_create_errhandler.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/file_create_errhandler.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/file_create_errhandler.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -50,7 +50,6 @@
static const char FCNAME[] = "MPI_File_create_errhandler";
int mpi_errno = MPI_SUCCESS;
MPID_Errhandler *errhan_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_FILE_CREATE_ERRHANDLER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/file_get_errhandler.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/file_get_errhandler.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/file_get_errhandler.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -58,7 +58,6 @@
MPI_Errhandler eh;
MPID_Errhandler *e;
#endif
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_FILE_GET_ERRHANDLER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/win_create_errhandler.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/win_create_errhandler.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/win_create_errhandler.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -52,7 +52,6 @@
static const char FCNAME[] = "MPI_Win_create_errhandler";
int mpi_errno = MPI_SUCCESS;
MPID_Errhandler *errhan_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE_ERRHANDLER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/errhan/win_get_errhandler.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/win_get_errhandler.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/errhan/win_get_errhandler.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -53,7 +53,6 @@
#endif
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_ERRHANDLER);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_compare.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_compare.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_compare.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -60,7 +60,6 @@
MPID_Group *group_ptr1 = NULL;
MPID_Group *group_ptr2 = NULL;
int g1_idx, g2_idx, size, i;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_COMPARE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_difference.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_difference.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_difference.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -62,7 +62,6 @@
MPID_Group *group_ptr2 = NULL;
MPID_Group *new_group_ptr;
int size1, i, k, g1_idx, g2_idx, l1_pid, l2_pid, nnew;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_DIFFERENCE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_excl.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_excl.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_excl.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -67,7 +67,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Group *group_ptr = NULL, *new_group_ptr;
int size, i, newi;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_EXCL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_free.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_free.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_free.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -52,7 +52,6 @@
static const char FCNAME[] = "MPI_Group_free";
int mpi_errno = MPI_SUCCESS;
MPID_Group *group_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_FREE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_incl.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_incl.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_incl.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -63,7 +63,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Group *group_ptr = NULL, *new_group_ptr = NULL;
int i;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_INCL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_intersection.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_intersection.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_intersection.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -64,7 +64,6 @@
MPID_Group *group_ptr2 = NULL;
MPID_Group *new_group_ptr;
int size1, i, k, g1_idx, g2_idx, l1_pid, l2_pid, nnew;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_INTERSECTION);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_range_excl.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_range_excl.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_range_excl.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -70,7 +70,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Group *group_ptr = NULL, *new_group_ptr;
int size, i, j, k, nnew, first, last, stride;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_RANGE_EXCL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_range_incl.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_range_incl.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_range_incl.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -65,7 +65,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Group *group_ptr = NULL, *new_group_ptr;
int first, last, stride, nnew, i, j, k;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_RANGE_INCL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_translate_ranks.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_translate_ranks.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_translate_ranks.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -63,7 +63,6 @@
MPID_Group *group_ptr1 = NULL;
MPID_Group *group_ptr2 = NULL;
int i, g2_idx, l1_pid, l2_pid;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_TRANSLATE_RANKS);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/group/group_union.c
===================================================================
--- mpich2/trunk/src/mpi/group/group_union.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/group/group_union.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -59,7 +59,6 @@
MPID_Group *group_ptr2 = NULL;
MPID_Group *new_group_ptr;
int g1_idx, g2_idx, nnew, i, k, size1, size2, mylpid;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_UNION);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/init/abort.c
===================================================================
--- mpich2/trunk/src/mpi/init/abort.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/init/abort.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -60,7 +60,6 @@
/* FIXME: 100 is arbitrary and may not be long enough */
char abort_str[100], comm_name[MPI_MAX_OBJECT_NAME];
int len = MPI_MAX_OBJECT_NAME;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ABORT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/init/init.c
===================================================================
--- mpich2/trunk/src/mpi/init/init.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/init/init.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -72,7 +72,6 @@
int mpi_errno = MPI_SUCCESS;
int rc;
int threadLevel, provided;
- MPIU_THREADPRIV_DECL;
MPID_MPI_INIT_STATE_DECL(MPID_STATE_MPI_INIT);
rc = MPID_Wtime_init();
Modified: mpich2/trunk/src/mpi/init/initthread.c
===================================================================
--- mpich2/trunk/src/mpi/init/initthread.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/init/initthread.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -520,7 +520,6 @@
{
int mpi_errno = MPI_SUCCESS;
int rc, reqd = required;
- MPIU_THREADPRIV_DECL;
MPID_MPI_INIT_STATE_DECL(MPID_STATE_MPI_INIT_THREAD);
rc = MPID_Wtime_init();
Modified: mpich2/trunk/src/mpi/pt2pt/bsend.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/bsend.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/bsend.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -90,7 +90,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_BSEND);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/bsend_init.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/bsend_init.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/bsend_init.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -63,7 +63,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Request *request_ptr = NULL;
MPID_Comm *comm_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_BSEND_INIT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/bufattach.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/bufattach.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/bufattach.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -76,7 +76,6 @@
{
static const char FCNAME[] = "MPI_Buffer_attach";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_BUFFER_ATTACH);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/buffree.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/buffree.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/buffree.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -93,7 +93,6 @@
{
static const char FCNAME[] = "MPI_Buffer_detach";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_BUFFER_DETACH);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/greq_complete.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/greq_complete.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/greq_complete.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -54,7 +54,6 @@
#endif
int mpi_errno = MPI_SUCCESS;
MPID_Request *request_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GREQUEST_COMPLETE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/greq_start.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/greq_start.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/greq_start.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -130,7 +130,6 @@
static const char FCNAME[] = "MPI_Grequest_start";
int mpi_errno = MPI_SUCCESS;
MPID_Request *lrequest_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GREQUEST_START);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/iprobe.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/iprobe.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/iprobe.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -58,7 +58,6 @@
static const char FCNAME[] = "MPI_Iprobe";
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IPROBE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/irecv.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/irecv.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/irecv.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -62,7 +62,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IRECV);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/irsend.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/irsend.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/irsend.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -63,7 +63,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IRSEND);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/isend.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/isend.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/isend.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -61,7 +61,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISEND);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/issend.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/issend.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/issend.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -62,7 +62,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISSEND);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/probe.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/probe.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/probe.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -54,7 +54,6 @@
static const char FCNAME[] = "MPI_Probe";
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_PROBE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/recv.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/recv.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/recv.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -68,7 +68,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request * request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_RECV);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/recv_init.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/recv_init.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/recv_init.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -64,7 +64,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_RECV_INIT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/request_free.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/request_free.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/request_free.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -66,7 +66,6 @@
static const char FCNAME[] = "MPI_Request_free";
int mpi_errno = MPI_SUCCESS;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_REQUEST_FREE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/rsend.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/rsend.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/rsend.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -59,7 +59,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request * request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_RSEND);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/rsend_init.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/rsend_init.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/rsend_init.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -64,7 +64,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_RSEND_INIT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/send.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/send.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/send.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -64,7 +64,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request * request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_SEND);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/send_init.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/send_init.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/send_init.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -64,7 +64,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_SEND_INIT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/sendrecv.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/sendrecv.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/sendrecv.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -73,7 +73,6 @@
MPID_Comm *comm_ptr = NULL;
MPID_Request * sreq;
MPID_Request * rreq;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_SENDRECV);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/ssend.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/ssend.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/ssend.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -58,7 +58,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request * request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_SSEND);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/ssend_init.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/ssend_init.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/ssend_init.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -61,7 +61,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_Request *request_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_SSEND_INIT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/start.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/start.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/start.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -48,7 +48,6 @@
static const char FCNAME[] = "MPI_Start";
MPID_Request * request_ptr = NULL;
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_START);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/startall.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/startall.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/startall.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -64,7 +64,6 @@
int i;
int mpi_errno = MPI_SUCCESS;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_STARTALL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/test.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/test.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/test.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -57,7 +57,6 @@
MPID_Request *request_ptr = NULL;
int active_flag;
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TEST);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/testall.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/testall.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/testall.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -86,7 +86,6 @@
int rc;
int mpi_errno = MPI_SUCCESS;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TESTALL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/testany.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/testany.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/testany.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -72,7 +72,6 @@
int active_flag;
int mpi_errno = MPI_SUCCESS;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TESTANY);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/testsome.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/testsome.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/testsome.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -77,7 +77,6 @@
int rc;
int mpi_errno = MPI_SUCCESS;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_TESTSOME);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/wait.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/wait.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/wait.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -56,7 +56,6 @@
MPID_Request * request_ptr = NULL;
int active_flag;
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WAIT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/waitall.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/waitall.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/waitall.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -84,7 +84,6 @@
int n_greqs;
const int ignoring_statuses = (array_of_statuses == MPI_STATUSES_IGNORE);
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WAITALL);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/waitany.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/waitany.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/waitany.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -77,7 +77,6 @@
int found_nonnull_req;
int mpi_errno = MPI_SUCCESS;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WAITANY);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/pt2pt/waitsome.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/waitsome.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/pt2pt/waitsome.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -95,7 +95,6 @@
int rc;
int mpi_errno = MPI_SUCCESS;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WAITSOME);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/accumulate.c
===================================================================
--- mpich2/trunk/src/mpi/rma/accumulate.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/accumulate.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -67,7 +67,6 @@
static const char FCNAME[] = "MPI_Accumulate";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ACCUMULATE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/alloc_mem.c
===================================================================
--- mpich2/trunk/src/mpi/rma/alloc_mem.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/alloc_mem.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -65,7 +65,6 @@
int mpi_errno = MPI_SUCCESS;
void *ap;
MPID_Info *info_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLOC_MEM);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/free_mem.c
===================================================================
--- mpich2/trunk/src/mpi/rma/free_mem.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/free_mem.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -47,7 +47,6 @@
{
static const char FCNAME[] = "MPI_Free_mem";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_FREE_MEM);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/get.c
===================================================================
--- mpich2/trunk/src/mpi/rma/get.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/get.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -63,7 +63,6 @@
static const char FCNAME[] = "MPI_Get";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GET);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/put.c
===================================================================
--- mpich2/trunk/src/mpi/rma/put.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/put.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -63,7 +63,6 @@
static const char FCNAME[] = "MPI_Put";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_PUT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_complete.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_complete.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_complete.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -49,7 +49,6 @@
static const char FCNAME[] = "MPI_Win_complete";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_COMPLETE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_create.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_create.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_create.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -59,7 +59,6 @@
MPID_Win *win_ptr = NULL;
MPID_Comm *comm_ptr = NULL;
MPID_Info *info_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_fence.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_fence.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_fence.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -67,7 +67,6 @@
static const char FCNAME[] = "MPI_Win_fence";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FENCE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_free.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_free.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_free.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -51,7 +51,6 @@
static const char FCNAME[] = "MPI_Win_free";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FREE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_lock.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_lock.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_lock.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -76,7 +76,6 @@
static const char FCNAME[] = "MPI_Win_lock";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_LOCK);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_post.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_post.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_post.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -66,7 +66,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
MPID_Group *group_ptr=NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_POST);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_start.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_start.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_start.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -67,7 +67,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
MPID_Group *group_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_START);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_test.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_test.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_test.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -58,7 +58,6 @@
static const char FCNAME[] = "MPI_Win_test";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_TEST);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_unlock.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_unlock.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_unlock.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -53,7 +53,6 @@
static const char FCNAME[] = "MPI_Win_unlock";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_UNLOCK);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/rma/win_wait.c
===================================================================
--- mpich2/trunk/src/mpi/rma/win_wait.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/rma/win_wait.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -49,7 +49,6 @@
static const char FCNAME[] = "MPI_Win_wait";
int mpi_errno = MPI_SUCCESS;
MPID_Win *win_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_WAIT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/close.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/close.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/close.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -36,7 +36,6 @@
int error_code;
ADIO_File fh;
static char myname[] = "MPI_FILE_CLOSE";
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/delete.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/delete.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/delete.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -37,7 +37,6 @@
int error_code, file_system;
char *tmp;
ADIOI_Fns *fsops;
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/fsync.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/fsync.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/fsync.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -37,7 +37,6 @@
int error_code;
ADIO_File fh;
static char myname[] = "MPI_FILE_SYNC";
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/get_group.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/get_group.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/get_group.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -40,7 +40,6 @@
int error_code;
ADIO_File fh;
static char myname[] = "MPI_FILE_GET_GROUP";
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/get_info.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/get_info.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/get_info.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -39,7 +39,6 @@
int error_code;
ADIO_File fh;
static char myname[] = "MPI_FILE_GET_INFO";
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/get_view.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/get_view.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/get_view.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -51,7 +51,6 @@
static char myname[] = "MPI_FILE_GET_VIEW";
int i, j, k, combiner;
MPI_Datatype copy_etype, copy_filetype;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/iread.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/iread.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/iread.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -45,7 +45,6 @@
{
int error_code=MPI_SUCCESS;
static char myname[] = "MPI_FILE_IREAD";
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/iread_sh.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/iread_sh.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/iread_sh.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -51,7 +51,6 @@
MPI_Status status;
ADIO_Offset off, shared_fp;
MPI_Offset nbytes=0;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/iwrite.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/iwrite.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/iwrite.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -46,7 +46,6 @@
{
int error_code=MPI_SUCCESS;
static char myname[] = "MPI_FILE_IWRITE";
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/iwrite_sh.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/iwrite_sh.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/iwrite_sh.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -50,7 +50,6 @@
ADIO_Status status;
ADIO_Offset off, shared_fp;
static char myname[] = "MPI_FILE_IWRITE_SHARED";
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/open.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/open.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -47,7 +47,6 @@
MPI_Comm dupcomm;
ADIOI_Fns *fsops;
static char myname[] = "MPI_FILE_OPEN";
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/prealloc.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/prealloc.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/prealloc.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -39,7 +39,6 @@
ADIO_File fh;
static char myname[] = "MPI_FILE_PREALLOCATE";
MPI_Offset tmp_sz;
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/read.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/read.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/read.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -74,7 +74,6 @@
int datatype_size;
ADIO_File fh;
ADIO_Offset off;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/read_all.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/read_all.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/read_all.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -74,7 +74,6 @@
{
int error_code, datatype_size;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/read_allb.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/read_allb.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/read_allb.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -61,7 +61,6 @@
{
int error_code, datatype_size;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/read_alle.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/read_alle.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/read_alle.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -55,7 +55,6 @@
{
int error_code;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_UNREFERENCED_ARG(buf);
Modified: mpich2/trunk/src/mpi/romio/mpi-io/read_ord.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/read_ord.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/read_ord.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -47,7 +47,6 @@
static char myname[] = "MPI_FILE_READ_ORDERED";
ADIO_Offset shared_fp=0;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/read_ordb.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/read_ordb.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/read_ordb.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -44,7 +44,6 @@
ADIO_Offset shared_fp;
ADIO_File fh;
static char myname[] = "MPI_FILE_READ_ORDERED_BEGIN";
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/read_orde.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/read_orde.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/read_orde.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -40,7 +40,6 @@
int error_code=MPI_SUCCESS;
ADIO_File fh;
static char myname[] = "MPI_FILE_READ_ORDERED_END";
- MPIU_THREADPRIV_DECL;
MPIU_UNREFERENCED_ARG(buf);
Modified: mpich2/trunk/src/mpi/romio/mpi-io/read_sh.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/read_sh.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/read_sh.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -47,7 +47,6 @@
int datatype_size, incr;
ADIO_Offset off, shared_fp;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/register_datarep.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/register_datarep.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/register_datarep.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -57,7 +57,6 @@
int error_code;
ADIOI_Datarep *datarep;
static char myname[] = "MPI_REGISTER_DATAREP";
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
Modified: mpich2/trunk/src/mpi/romio/mpi-io/seek.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/seek.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/seek.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -40,7 +40,6 @@
ADIO_File fh;
static char myname[] = "MPI_FILE_SEEK";
MPI_Offset curr_offset, eof_offset;
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/seek_sh.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/seek_sh.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/seek_sh.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -38,7 +38,6 @@
static char myname[] = "MPI_FILE_SEEK_SHARED";
MPI_Offset curr_offset, eof_offset, tmp_offset;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/set_atom.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/set_atom.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/set_atom.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -38,7 +38,6 @@
static char myname[] = "MPI_FILE_SET_ATOMICITY";
ADIO_Fcntl_t *fcntl_struct;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/set_info.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/set_info.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/set_info.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -37,7 +37,6 @@
int error_code;
static char myname[] = "MPI_FILE_SET_INFO";
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/set_size.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/set_size.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/set_size.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -38,7 +38,6 @@
ADIO_File fh;
static char myname[] = "MPI_FILE_SET_SIZE";
MPI_Offset tmp_sz;
- MPIU_THREADPRIV_DECL;
#ifdef MPI_hpux
int fl_xmpi;
Modified: mpich2/trunk/src/mpi/romio/mpi-io/set_view.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/set_view.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/set_view.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -43,7 +43,6 @@
static char myname[] = "MPI_FILE_SET_VIEW";
ADIO_Offset shared_fp, byte_off;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/write.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/write.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/write.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -74,7 +74,6 @@
int datatype_size;
ADIO_Offset off;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/write_all.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/write_all.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/write_all.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -74,7 +74,6 @@
{
int error_code, datatype_size;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/write_allb.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/write_allb.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/write_allb.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -60,7 +60,6 @@
{
int error_code, datatype_size;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/write_alle.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/write_alle.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/write_alle.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -54,7 +54,6 @@
{
int error_code;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_UNREFERENCED_ARG(buf);
Modified: mpich2/trunk/src/mpi/romio/mpi-io/write_ord.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/write_ord.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/write_ord.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -47,7 +47,6 @@
static char myname[] = "MPI_FILE_WRITE_ORDERED";
ADIO_Offset shared_fp;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/write_ordb.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/write_ordb.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/write_ordb.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -44,7 +44,6 @@
static char myname[] = "MPI_FILE_WRITE_ORDERED_BEGIN";
ADIO_Offset shared_fp;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/romio/mpi-io/write_orde.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/write_orde.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/write_orde.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -40,7 +40,6 @@
int error_code;
static char myname[] = "MPI_FILE_WRITE_ORDERED_END";
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_UNREFERENCED_ARG(buf);
Modified: mpich2/trunk/src/mpi/romio/mpi-io/write_sh.c
===================================================================
--- mpich2/trunk/src/mpi/romio/mpi-io/write_sh.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/romio/mpi-io/write_sh.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -47,7 +47,6 @@
int datatype_size, incr;
ADIO_Offset off, shared_fp;
ADIO_File fh;
- MPIU_THREADPRIV_DECL;
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPIR_Nest_incr();
Modified: mpich2/trunk/src/mpi/spawn/close_port.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/close_port.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/close_port.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -45,7 +45,6 @@
{
static const char FCNAME[] = "MPI_Close_port";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_CLOSE_PORT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/spawn/comm_accept.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/comm_accept.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/comm_accept.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -57,7 +57,6 @@
MPID_Comm *comm_ptr = NULL;
MPID_Comm *newcomm_ptr = NULL;
MPID_Info *info_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_ACCEPT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/spawn/comm_connect.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/comm_connect.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/comm_connect.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -58,7 +58,6 @@
MPID_Comm *comm_ptr = NULL;
MPID_Comm *newcomm_ptr = NULL;
MPID_Info *info_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CONNECT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/spawn/comm_disconnect.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/comm_disconnect.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/comm_disconnect.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -53,7 +53,6 @@
static const char FCNAME[] = "MPI_Comm_disconnect";
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DISCONNECT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/spawn/comm_spawn.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/comm_spawn.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/comm_spawn.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -65,7 +65,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL, *intercomm_ptr;
MPID_Info *info_ptr=NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPAWN);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/comm_spawn_multiple.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -70,7 +70,6 @@
MPID_Comm *intercomm_ptr = NULL;
MPID_Info **array_of_info_ptrs = NULL;
MPIU_CHKLMEM_DECL(1);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPAWN_MULTIPLE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/spawn/open_port.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/open_port.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/open_port.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -63,7 +63,6 @@
static const char FCNAME[] = "MPI_Open_port";
int mpi_errno = MPI_SUCCESS;
MPID_Info *info_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_OPEN_PORT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/spawn/publish_name.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/publish_name.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/publish_name.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -56,7 +56,6 @@
static const char FCNAME[] = "MPI_Publish_name";
int mpi_errno = MPI_SUCCESS;
MPID_Info *info_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_PUBLISH_NAME);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/spawn/unpublish_name.c
===================================================================
--- mpich2/trunk/src/mpi/spawn/unpublish_name.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/spawn/unpublish_name.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -53,7 +53,6 @@
static const char FCNAME[] = "MPI_Unpublish_name";
int mpi_errno = MPI_SUCCESS;
MPID_Info *info_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_UNPUBLISH_NAME);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/topo/cart_create.c
===================================================================
--- mpich2/trunk/src/mpi/topo/cart_create.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/topo/cart_create.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -229,7 +229,6 @@
#endif
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_CREATE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/topo/dist_gr_create_adj.c
===================================================================
--- mpich2/trunk/src/mpi/topo/dist_gr_create_adj.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/topo/dist_gr_create_adj.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -73,7 +73,6 @@
MPIR_Topology *topo_ptr = NULL;
MPIR_Dist_graph_topology *dist_graph_ptr = NULL;
MPIU_CHKPMEM_DECL(5);
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_DIST_GRAPH_CREATE_ADJACENT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/topo/dist_gr_neighb.c
===================================================================
--- mpich2/trunk/src/mpi/topo/dist_gr_neighb.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/topo/dist_gr_neighb.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -59,7 +59,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPIR_Topology *topo_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_DIST_GRAPH_NEIGHBORS);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/topo/dist_gr_neighb_count.c
===================================================================
--- mpich2/trunk/src/mpi/topo/dist_gr_neighb_count.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/topo/dist_gr_neighb_count.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -54,7 +54,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPIR_Topology *topo_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_DIST_GRAPH_NEIGHBORS_COUNT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/topo/graphcreate.c
===================================================================
--- mpich2/trunk/src/mpi/topo/graphcreate.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/topo/graphcreate.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -179,7 +179,6 @@
int mpi_errno = MPI_SUCCESS;
int i;
MPID_Comm *comm_ptr = NULL;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPH_CREATE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpi/topo/graphnbrcnt.c
===================================================================
--- mpich2/trunk/src/mpi/topo/graphnbrcnt.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpi/topo/graphnbrcnt.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -57,7 +57,6 @@
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPIR_Topology *graph_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPH_NEIGHBORS_COUNT);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_progress.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -103,7 +103,6 @@
#ifdef MPICH_IS_THREADED
MPIU_THREAD_CHECK_BEGIN;
{
- MPIU_THREADPRIV_DECL;
/* In the case of threads, we poll for lesser number of
* iterations than the case with only processes, as
* threads contend for CPU and the lock, while processes
Modified: mpich2/trunk/src/util/info/info_create.c
===================================================================
--- mpich2/trunk/src/util/info/info_create.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_create.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -46,7 +46,6 @@
MPID_Info *info_ptr;
static const char FCNAME[] = "MPI_Info_create";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_CREATE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/util/info/info_delete.c
===================================================================
--- mpich2/trunk/src/util/info/info_delete.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_delete.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -47,7 +47,6 @@
static const char FCNAME[] = "MPI_Info_delete";
int mpi_errno = MPI_SUCCESS;
MPID_Info *info_ptr=0, *prev_ptr, *curr_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_DELETE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/util/info/info_dup.c
===================================================================
--- mpich2/trunk/src/util/info/info_dup.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_dup.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -51,7 +51,6 @@
MPID_Info *info_ptr=0, *curr_old, *curr_new;
static const char FCNAME[] = "MPI_Info_dup";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_DUP);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/util/info/info_free.c
===================================================================
--- mpich2/trunk/src/util/info/info_free.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_free.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -49,7 +49,6 @@
#endif
int mpi_errno = MPI_SUCCESS;
MPID_Info *info_ptr=0;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_FREE);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/util/info/info_get.c
===================================================================
--- mpich2/trunk/src/util/info/info_get.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_get.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -59,7 +59,6 @@
#endif
MPID_Info *curr_ptr, *info_ptr=0;
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_GET);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/util/info/info_getn.c
===================================================================
--- mpich2/trunk/src/util/info/info_getn.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_getn.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -52,7 +52,6 @@
MPID_Info *info_ptr=0;
int n;
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_GET_NKEYS);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/util/info/info_getnth.c
===================================================================
--- mpich2/trunk/src/util/info/info_getnth.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_getnth.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -52,7 +52,6 @@
int nkeys;
static const char FCNAME[] = "MPI_Info_get_nthkey";
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_GET_NTHKEY);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/util/info/info_getvallen.c
===================================================================
--- mpich2/trunk/src/util/info/info_getvallen.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_getvallen.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -55,7 +55,6 @@
static const char FCNAME[] = "MPI_Info_get_valuelen";
#endif
int mpi_errno = MPI_SUCCESS;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_GET_VALUELEN);
MPIR_ERRTEST_INITIALIZED_ORDIE();
Modified: mpich2/trunk/src/util/info/info_set.c
===================================================================
--- mpich2/trunk/src/util/info/info_set.c 2010-05-20 18:44:32 UTC (rev 6688)
+++ mpich2/trunk/src/util/info/info_set.c 2010-05-20 18:44:37 UTC (rev 6689)
@@ -52,7 +52,6 @@
static const char FCNAME[] = "MPI_Info_set";
int mpi_errno = MPI_SUCCESS;
MPID_Info *info_ptr=0, *curr_ptr, *prev_ptr;
- MPIU_THREADPRIV_DECL;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_SET);
MPIR_ERRTEST_INITIALIZED_ORDIE();
More information about the mpich2-commits
mailing list