mpid/thread: Fix thread unsafe recursive lock check

We need to read the mutex owner value after we acquire the lock or else
the read may conflict with an update whichever thread holds the
lock. Race detected by ThreadSanitizer.

Author: raffenet

src/mpid/common/thread/mpidu_thread_fallback.h

@@ -139,21 +139,18 @@ M*/
         if (MPIR_ThreadInfo.isThreaded) {                               \
             int equal_ = 0;                                             \
             MPL_thread_id_t self_, owner_;                              \
+            int err_ = 0;                                               \
+            MPL_DBG_MSG_P(MPIR_DBG_THREAD,VERBOSE,"enter MPIDU_Thread_mutex_lock %p", &mutex); \
+            MPIDU_Thread_mutex_lock(&mutex, &err_, MPL_THREAD_PRIO_HIGH); \
+            MPL_DBG_MSG_P(MPIR_DBG_THREAD,VERBOSE,"exit MPIDU_Thread_mutex_lock %p", &mutex); \
             MPL_thread_self(&self_);                                    \
             owner_ = mutex.owner;                                       \
             MPL_thread_same(&self_, &owner_, &equal_);                  \
-            if (!equal_) {                                              \
-                int err_ = 0;                                           \
-                MPL_DBG_MSG_P(MPIR_DBG_THREAD,VERBOSE,"enter MPIDU_Thread_mutex_lock %p", &mutex); \
-                MPIDU_Thread_mutex_lock(&mutex, &err_, MPL_THREAD_PRIO_HIGH);\
-                MPL_DBG_MSG_P(MPIR_DBG_THREAD,VERBOSE,"exit MPIDU_Thread_mutex_lock %p", &mutex); \
-                MPIR_Assert(err_ == 0);                                 \
-                MPIR_Assert(mutex.count == 0);                          \
-                MPL_thread_self(&mutex.owner);                          \
-            } else {                                                    \
-                /* assert all recursive usage */                        \
-                MPIR_Assert(0);                                         \
-            }                                                           \
+            MPIR_Assert(err_ == 0);                                     \
+            /* FIXME: owner and count checks are the same? */           \
+            MPIR_Assert(!equal_);                                       \
+            MPIR_Assert(mutex.count == 0);                              \
+            MPL_thread_self(&mutex.owner);                              \
             mutex.count++;                                              \
         }                                                               \
     } while (0)