[svn-r1245] Use threadpriv macros

src/mpi/coll/opband.c

@@ -164,9 +164,9 @@ void MPIR_BAND (
     }
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_BAND" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_BAND" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opbor.c

@@ -163,9 +163,9 @@ void MPIR_BOR (
     }
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_BOR" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_BOR" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opbxor.c

@@ -164,9 +164,9 @@ void MPIR_BXOR (
     }
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_BXOR" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_BXOR" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opland.c

@@ -227,9 +227,9 @@ void MPIR_LAND (
 #endif
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_LAND" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_LAND" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/oplor.c

@@ -226,9 +226,9 @@ void MPIR_LOR (
 #endif
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_LOR" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_LOR" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/oplxor.c

@@ -227,9 +227,9 @@ void MPIR_LXOR (
 #endif
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_LXOR" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_LXOR" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opmax.c

@@ -214,9 +214,9 @@ void MPIR_MAXF(
 #endif
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_MAX" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_MAX" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opmaxloc.c

@@ -179,9 +179,9 @@ void MPIR_MAXLOC(
 #endif
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_MAXLOC" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_MAXLOC" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opmin.c

@@ -214,9 +214,9 @@ void MPIR_MINF (
 #endif
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_MIN" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_MIN" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opminloc.c

@@ -177,9 +177,9 @@ void MPIR_MINLOC(
 #endif
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_MINLOC" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_MINLOC" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opprod.c

@@ -296,9 +296,9 @@ void MPIR_PROD (
 
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_PROD" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_PROD" );
         break;
     }
 	/* --END ERROR HANDLING-- */

src/mpi/coll/opsum.c

@@ -292,9 +292,9 @@ void MPIR_SUM (
 #endif /* HAVE_CXX_BINDING */
 	/* --BEGIN ERROR HANDLING-- */
     default: {
-        MPICH_PerThread_t *p;
-        MPIR_GetPerThread(&p);
-        p->op_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_SUM" );
+	MPIU_THREADPRIV_DECL;
+	MPIU_THREADPRIV_GET;
+        MPIU_THREADPRIV_FIELD(op_errno) = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**opundefined","**opundefined %s", "MPI_SUM" );
         break;
     }
 	/* --END ERROR HANDLING-- */