[mpich2-commits] r6700 - mpich2/trunk/src/mpid/common/thread

[goodell at mcs.anl.gov]

Author: goodell
Date: 2010-05-20 22:34:48 -0500 (Thu, 20 May 2010)
New Revision: 6700

Modified:
   mpich2/trunk/src/mpid/common/thread/mpe_funcs.i
Log:
improve assertion messages in MPID_Thread_*

No reviewer.

Modified: mpich2/trunk/src/mpid/common/thread/mpe_funcs.i
===================================================================
--- mpich2/trunk/src/mpid/common/thread/mpe_funcs.i	2010-05-21 03:34:46 UTC (rev 6699)
+++ mpich2/trunk/src/mpid/common/thread/mpe_funcs.i	2010-05-21 03:34:48 UTC (rev 6700)
@@ -59,7 +59,8 @@
 do {                                               \
     int err_;					\
     MPIU_Thread_mutex_lock((mutex_), &err_);	\
-    MPIU_Assert(err_ == MPIU_THREAD_SUCCESS);    \
+    MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,                                   \
+                        ("mutex_lock failed, err_=%d (%s)",err_,MPIU_Strerror(err_))); \
 } while (0)
 #endif
 
@@ -73,7 +74,8 @@
 do {                                               \
     int err_;					\
     MPIU_Thread_mutex_unlock((mutex_), &err_);	\
-    MPIU_Assert(err_ == MPIU_THREAD_SUCCESS);	\
+    MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,                                     \
+                        ("mutex_unlock failed, err_=%d (%s)",err_,MPIU_Strerror(err_))); \
 } while (0)
 #endif
 
@@ -87,7 +89,8 @@
 do {                                                               \
     int err_;							\
     MPIU_Thread_mutex_trylock((mutex_), (flag_), &err_);	\
-    MPIU_Assert(err_ == MPIU_THREAD_SUCCESS);			\
+    MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,                                      \
+                        ("mutex_trylock failed, err_=%d (%s)",err_,MPIU_Strerror(err_))); \
 } while (0)
 #endif
 
@@ -116,7 +119,8 @@
 do {                                                       \
     int err_;						\
     MPIU_Thread_cond_wait((cond_), (mutex_), &err_);	\
-    MPIU_Assert(err_ == MPIU_THREAD_SUCCESS);		\
+    MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,                                  \
+                        ("cond_wait failed, err_=%d (%s)",err_,MPIU_Strerror(err_))); \
 } while (0)
 #endif
 
@@ -130,7 +134,8 @@
 do {                                               \
     int err_;					\
     MPIU_Thread_cond_broadcast((cond_), &err_);	\
-    MPIU_Assert(err_ == MPIU_THREAD_SUCCESS);	\
+    MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,                                       \
+                        ("cond_broadcast failed, err_=%d (%s)",err_,MPIU_Strerror(err_))); \
 } while (0)
 #endif
 
@@ -144,7 +149,8 @@
 do {                                               \
     int err_;					\
     MPIU_Thread_cond_signal((cond_), &err_);	\
-    MPIU_Assert(err_ == MPIU_THREAD_SUCCESS);	\
+    MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,                                    \
+                        ("cond_signal failed, err_=%d (%s)",err_,MPIU_Strerror(err_))); \
 } while (0)
 #endif
 
@@ -173,7 +179,8 @@
 do {                                                       \
     int err_;						\
     MPIU_Thread_tls_set((tls_), (value_), &err_);	\
-    MPIU_Assert(err_ == MPIU_THREAD_SUCCESS);		\
+    MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,                                \
+                        ("tls_set failed, err_=%d (%s)",err_,MPIU_Strerror(err_))); \
 } while (0)
 #endif
 
@@ -188,7 +195,8 @@
     int err_;						\
 							\
     MPIU_Thread_tls_get((tls_), (value_), &err_);	\
-    MPIU_Assert(err_ == MPIU_THREAD_SUCCESS);		\
+    /* can't strerror here, possible endless recursion in strerror */ \
+    MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,("tls_get failed, err_=%d",err_)); \
 } while (0)
 #endif