Commit a6fb4d63 authored by William Gropp's avatar William Gropp
Browse files

[svn-r3177] Switch to the new macro for the global thread critical section...

[svn-r3177] Switch to the new macro for the global thread critical section (most of this is an automated change, tested against the MPICH2 test suite)
parent 07f99dbc
......@@ -69,7 +69,7 @@ int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val)
/* The thread lock prevents a valid attr delete on the same window
but in a different thread from causing problems */
MPIU_THREAD_SINGLE_CS_ENTER("attr");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_WIN_SET_ATTR);
/* Validate parameters, especially handles needing to be converted */
......@@ -174,7 +174,7 @@ int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_WIN_SET_ATTR);
MPIU_THREAD_SINGLE_CS_EXIT("attr");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -765,7 +765,7 @@ int MPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_ALLGATHER);
/* Validate parameters, especially handles needing to be converted */
......@@ -859,7 +859,7 @@ int MPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_ALLGATHER);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -910,7 +910,7 @@ int MPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_ALLGATHERV);
/* Validate parameters, especially handles needing to be converted */
......@@ -1018,7 +1018,7 @@ int MPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_ALLGATHERV);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -604,7 +604,7 @@ int MPI_Allreduce ( void *sendbuf, void *recvbuf, int count,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_ALLREDUCE);
/* Validate parameters, especially handles needing to be converted */
......@@ -697,7 +697,7 @@ int MPI_Allreduce ( void *sendbuf, void *recvbuf, int count,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_ALLREDUCE);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -617,7 +617,7 @@ int MPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_ALLTOALL);
/* Validate parameters, especially handles needing to be converted */
......@@ -704,7 +704,7 @@ int MPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_ALLTOALL);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -297,7 +297,7 @@ int MPI_Alltoallv(void *sendbuf, int *sendcnts, int *sdispls,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_ALLTOALLV);
/* Validate parameters, especially handles needing to be converted */
......@@ -404,7 +404,7 @@ int MPI_Alltoallv(void *sendbuf, int *sendcnts, int *sdispls,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_ALLTOALLV);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -321,7 +321,7 @@ int MPI_Alltoallw(void *sendbuf, int *sendcnts, int *sdispls,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_ALLTOALLW);
/* Validate parameters, especially handles needing to be converted */
......@@ -428,7 +428,7 @@ int MPI_Alltoallw(void *sendbuf, int *sendcnts, int *sdispls,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_ALLTOALLW);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -335,7 +335,7 @@ int MPI_Barrier( MPI_Comm comm )
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_BARRIER);
/* Validate parameters, especially handles needing to be converted */
......@@ -395,7 +395,7 @@ int MPI_Barrier( MPI_Comm comm )
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_BARRIER);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -698,7 +698,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_BCAST);
/* Validate parameters, especially handles needing to be converted */
......@@ -784,7 +784,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_BCAST);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -329,7 +329,7 @@ int MPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_EXSCAN);
/* Validate parameters, especially handles needing to be converted */
......@@ -421,7 +421,7 @@ int MPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_EXSCAN);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -619,7 +619,7 @@ int MPI_Gather(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_GATHER);
/* Validate parameters, especially handles needing to be converted */
......@@ -747,7 +747,7 @@ int MPI_Gather(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_GATHER);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -211,7 +211,7 @@ int MPI_Gatherv(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_GATHERV);
/* Validate parameters, especially handles needing to be converted */
......@@ -347,7 +347,7 @@ int MPI_Gatherv(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_GATHERV);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -92,7 +92,7 @@ int MPI_Op_create(MPI_User_function *function, int commute, MPI_Op *op)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_OP_CREATE);
/* ... body of routine ... */
......@@ -118,7 +118,7 @@ int MPI_Op_create(MPI_User_function *function, int commute, MPI_Op *op)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_OP_CREATE);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -62,7 +62,7 @@ int MPI_Op_free(MPI_Op *op)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_OP_FREE);
MPID_Op_get_ptr( *op, op_ptr );
......@@ -98,7 +98,7 @@ int MPI_Op_free(MPI_Op *op)
fn_exit:
#endif
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_OP_FREE);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
/* --BEGIN ERROR HANDLING-- */
......
......@@ -1093,7 +1093,7 @@ int MPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcnts,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_REDUCE_SCATTER);
/* Validate parameters, especially handles needing to be converted */
......@@ -1197,7 +1197,7 @@ int MPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcnts,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_REDUCE_SCATTER);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -719,7 +719,7 @@ int MPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_REDUCE);
/* Validate parameters, especially handles needing to be converted */
......@@ -848,7 +848,7 @@ int MPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_REDUCE);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -314,7 +314,7 @@ int MPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_SCAN);
/* Validate parameters, especially handles needing to be converted */
......@@ -399,7 +399,7 @@ int MPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_SCAN);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -629,7 +629,7 @@ int MPI_Scatter(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_SCATTER);
/* Validate parameters, especially handles needing to be converted */
......@@ -755,7 +755,7 @@ int MPI_Scatter(void *sendbuf, int sendcnt, MPI_Datatype sendtype,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_SCATTER);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -211,7 +211,7 @@ int MPI_Scatterv( void *sendbuf, int *sendcnts, int *displs,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("coll");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_COLL_FUNC_ENTER(MPID_STATE_MPI_SCATTERV);
/* Validate parameters, especially handles needing to be converted */
......@@ -349,7 +349,7 @@ int MPI_Scatterv( void *sendbuf, int *sendcnts, int *displs,
fn_exit:
MPID_MPI_COLL_FUNC_EXIT(MPID_STATE_MPI_SCATTERV);
MPIU_THREAD_SINGLE_CS_EXIT("coll");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -66,7 +66,7 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("comm");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_COMM_CREATE);
MPIU_THREADPRIV_GET;
......@@ -338,7 +338,7 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm)
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_COMM_CREATE);
MPIU_THREAD_SINGLE_CS_EXIT("comm");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
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