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
......@@ -84,7 +84,7 @@ int MPI_Comm_dup(MPI_Comm comm, 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_DUP);
/* Validate parameters, especially handles needing to be converted */
......@@ -156,7 +156,7 @@ int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_COMM_DUP);
MPIU_THREAD_SINGLE_CS_EXIT("comm");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -72,7 +72,7 @@ int MPI_Comm_free(MPI_Comm *comm)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("comm");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_COMM_FREE);
/* Validate parameters, especially handles needing to be converted */
......@@ -123,7 +123,7 @@ int MPI_Comm_free(MPI_Comm *comm)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_COMM_FREE);
MPIU_THREAD_SINGLE_CS_EXIT("comm");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -62,7 +62,7 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("comm");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_COMM_GROUP);
/* Validate parameters, especially handles needing to be converted */
......@@ -138,7 +138,7 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_COMM_GROUP);
MPIU_THREAD_SINGLE_CS_EXIT("comm");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -64,7 +64,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("comm");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_COMM_REMOTE_GROUP);
/* Validate parameters, especially handles needing to be converted */
......@@ -131,7 +131,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_COMM_REMOTE_GROUP);
MPIU_THREAD_SINGLE_CS_EXIT("comm");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -110,7 +110,7 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, 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_SPLIT);
/* Validate parameters, especially handles needing to be converted */
......@@ -395,7 +395,7 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm)
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_COMM_SPLIT);
MPIU_THREAD_SINGLE_CS_EXIT("comm");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -241,7 +241,7 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("comm");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_INTERCOMM_CREATE);
MPIU_THREADPRIV_GET;
......@@ -570,7 +570,7 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_INTERCOMM_CREATE);
MPIU_THREAD_SINGLE_CS_EXIT("comm");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -80,7 +80,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("comm");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_INTERCOMM_MERGE);
MPIU_THREADPRIV_GET;
......@@ -274,7 +274,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_INTERCOMM_MERGE);
MPIU_THREAD_SINGLE_CS_EXIT("comm");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -59,7 +59,7 @@ int MPI_Register_datarep(char *datarep,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_REGISTER_DATAREP);
/* Validate parameters and objects (post conversion) */
......@@ -84,7 +84,7 @@ int MPI_Register_datarep(char *datarep,
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_REGISTER_DATAREP);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -59,7 +59,7 @@ int MPI_Type_contiguous(int count,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_CONTIGUOUS);
# ifdef HAVE_ERROR_CHECKING
......@@ -109,7 +109,7 @@ int MPI_Type_contiguous(int count,
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_CONTIGUOUS);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -386,7 +386,7 @@ int MPI_Type_create_darray(int size,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_CREATE_DARRAY);
MPIU_THREADPRIV_GET;
......@@ -727,7 +727,7 @@ int MPI_Type_create_darray(int size,
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_CREATE_DARRAY);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -66,7 +66,7 @@ int MPI_Type_create_hindexed(int count,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_CREATE_HINDEXED);
# ifdef HAVE_ERROR_CHECKING
......@@ -135,7 +135,7 @@ int MPI_Type_create_hindexed(int count,
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_CREATE_HINDEXED);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -64,7 +64,7 @@ int MPI_Type_create_hvector(int count,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_CREATE_HVECTOR);
# ifdef HAVE_ERROR_CHECKING
......@@ -114,7 +114,7 @@ int MPI_Type_create_hvector(int count,
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_CREATE_HVECTOR);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -87,7 +87,7 @@ int MPI_Type_create_indexed_block(int count,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_CREATE_INDEXED_BLOCK);
/* Validate parameters and objects */
......@@ -155,7 +155,7 @@ int MPI_Type_create_indexed_block(int count,
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_CREATE_INDEXED_BLOCK);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -61,7 +61,7 @@ int MPI_Type_create_resized(MPI_Datatype oldtype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_CREATE_RESIZED);
/* Get handles to MPI objects. */
......@@ -111,7 +111,7 @@ int MPI_Type_create_resized(MPI_Datatype oldtype,
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_CREATE_RESIZED);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -67,7 +67,7 @@ int MPI_Type_create_struct(int count,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_CREATE_STRUCT);
# ifdef HAVE_ERROR_CHECKING
......@@ -142,7 +142,7 @@ int MPI_Type_create_struct(int count,
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_CREATE_STRUCT);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -86,7 +86,7 @@ int MPI_Type_create_subarray(int ndims,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_CREATE_SUBARRAY);
MPIU_THREADPRIV_GET;
......@@ -326,7 +326,7 @@ int MPI_Type_create_subarray(int ndims,
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_CREATE_SUBARRAY);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -55,7 +55,7 @@ int MPI_Type_dup(MPI_Datatype datatype, MPI_Datatype *newtype)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_DUP);
/* Validate parameters, especially handles needing to be converted */
......@@ -133,7 +133,7 @@ int MPI_Type_dup(MPI_Datatype datatype, MPI_Datatype *newtype)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_DUP);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -64,7 +64,7 @@ int MPI_Type_free(MPI_Datatype *datatype)
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_FREE);
/* Validate parameters, especially handles needing to be converted */
......@@ -134,7 +134,7 @@ int MPI_Type_free(MPI_Datatype *datatype)
fn_exit:
#endif
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_FREE);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
/* --BEGIN ERROR HANDLING-- */
......
......@@ -62,7 +62,7 @@ int MPI_Type_get_contents(MPI_Datatype datatype,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_GET_CONTENTS);
/* Validate parameters, especially handles needing to be converted */
......@@ -136,7 +136,7 @@ int MPI_Type_get_contents(MPI_Datatype datatype,
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_GET_CONTENTS);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
fn_fail:
......
......@@ -91,7 +91,7 @@ int MPI_Type_hindexed(int count,
MPIR_ERRTEST_INITIALIZED_ORDIE();
MPIU_THREAD_SINGLE_CS_ENTER("datatype");
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_TYPE_HINDEXED);
# ifdef HAVE_ERROR_CHECKING
......@@ -159,7 +159,7 @@ int MPI_Type_hindexed(int count,
fn_exit:
MPIU_CHKLMEM_FREEALL();
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_TYPE_HINDEXED);
MPIU_THREAD_SINGLE_CS_EXIT("datatype");
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