Commit fbdc809d authored by David Goodell's avatar David Goodell
Browse files

[svn-r7374] various minor bugfixes reported by IBM

No reviewer.
parent 6f304b2c
......@@ -458,7 +458,7 @@ M*/
} \
MPIU_THREAD_CS_EXIT(INITFLAG,)
#elif !defined(MPICH_IS_THREADED)
#elif !defined(MPID_DEVICE_DEFINES_THREAD_CS) /* && !defined(MPICH_IS_THREADED) */
/* These provide a uniform way to perform a first-use initialization
in a thread-safe way. See the web page or mpidtime.c for the generic
......@@ -475,7 +475,7 @@ M*/
#define MPIU_THREADSAFE_INIT_CLEAR(_var) _var=0
#define MPIU_THREADSAFE_INIT_BLOCK_END(_var)
#endif /* MPICH_IS_THREADED */
#endif
/* Helper definitions for the default macro definitions */
#if defined(MPICH_IS_THREADED) && !defined(MPID_DEVICE_DEFINES_THREAD_CS)
......@@ -887,7 +887,7 @@ enum MPIU_Nest_mutexes {
#error Unrecognized thread granularity
#endif
#elif !defined(MPICH_IS_THREAED)
#elif !defined(MPID_DEVICE_DEFINES_THREAD_CS) /* && !defined(MPICH_IS_THREADED) */
#define MPIU_THREAD_CS_INIT
#define MPIU_THREAD_CS_FINALIZE
#define MPIU_THREAD_CS_ENTER(_name,_context)
......@@ -928,6 +928,8 @@ do { \
# elif MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_PER_OBJECT
#include "opa_primitives.h"
typedef OPA_int_t MPID_cc_t;
/* implies no barrier, since this routine should only be used for request
......
......@@ -365,7 +365,7 @@ void MPIR_Sendq_remember( MPID_Request *req,
p->context_id = context_id;
p->next = MPIR_Sendq_head;
MPIR_Sendq_head = p;
MPIU_THREAD_CS_EXIT(HANDLE,req)
MPIU_THREAD_CS_EXIT(HANDLE,req);
}
void MPIR_Sendq_forget( MPID_Request *req )
......
......@@ -10,6 +10,9 @@
#ifdef HAVE_CRTDBG_H
#include <crtdbg.h>
#endif
#ifdef HAVE_USLEEP
#include <unistd.h>
#endif
/* -- Begin Profiling Symbol Block for routine MPI_Init_thread */
#if defined(HAVE_PRAGMA_WEAK)
......
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