In TsSharedMutex.h, make error reporting thread-safe.

apache · Jan 31, 2022 · 72209a9 · 72209a9
1 parent d7b1154
commit 72209a9
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/include/tscpp/util/TsSharedMutex.h b/include/tscpp/util/TsSharedMutex.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <pthread.h>
+#include <string.h>
 
 #if __has_include(<ts/ts.h>)
 #include <ts/ts.h>
@@ -51,8 +52,13 @@
 
 #endif
 
-namespace ts
-{
+#if F
+#error "F preprocessor symbol defined"
+#endif
+
+#define F(FUNC_NAME, PTR, ENUM) \
+  TSFatal("%s(%p) failed: %s (%s) (%d)", (FUNC_NAME), (PTR), strerrordesc_np(ENUM), strerrorname_np(ENUM), (ENUM));
+
 // A class with the same interface as std::shared_mutex, but which is not prone to writer starvation.
 //
 class shared_mutex
@@ -70,7 +76,7 @@ class shared_mutex
   {
     int error = pthread_rwlock_wrlock(&_lock);
     if (error != 0) {
-      TSFatal("pthread_rwlock_wrlock(%p) failed: %s (%d)", &_lock, strerror(error), error);
+      F("pthread_rwlock_wrlock", &_lock, error);
     }
     X(_exclusive = true;)
   }
@@ -83,7 +89,7 @@ class shared_mutex
       return false;
     }
     if (error != 0) {
-      TSFatal("pthread_rwlock_trywrlock(%p) failed: %s (%d)", &_lock, strerror(error), error);
+      F("pthread_rwlock_trywrlock", &_lock, error);
     }
     X(_exclusive = true;)
 
@@ -104,7 +110,7 @@ class shared_mutex
   {
     int error = pthread_rwlock_rdlock(&_lock);
     if (error != 0) {
-      TSFatal("pthread_rwlock_rdlock(%p) failed: %s (%d)", &_lock, strerror(error), error);
+      F("pthread_rwlock_rdlock", &_lock, error);
     }
     X(++_shared;)
   }
@@ -117,7 +123,7 @@ class shared_mutex
       return false;
     }
     if (error != 0) {
-      TSFatal("pthread_rwlock_tryrdlock(%p) failed: %s (%d)", &_lock, strerror(error), error);
+      F("pthread_rwlock_tryrdlock", &_lock, error);
     }
 
     X(++_shared;)
@@ -139,7 +145,7 @@ class shared_mutex
   {
     int error = pthread_rwlock_destroy(&_lock);
     if (error != 0) {
-      TSFatal("pthread_rwlock_destory(%p) failed: %s (%d)", &_lock, strerror(error), error);
+      F("pthread_rwlock_destroy", &_lock, error);
     }
   }
 
@@ -157,7 +163,7 @@ class shared_mutex
   {
     int error = pthread_rwlock_unlock(&_lock);
     if (error != 0) {
-      TSFatal("pthread_rwlock_unlock(%p) failed: %s (%d)", &_lock, strerror(error), error);
+      F("pthread_rwlock_unlock", &_lock, error);
     }
   }
 
@@ -184,3 +190,4 @@ class shared_mutex
 } // end namespace ts
 
 #undef X
+#undef F