oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

thread/Posix{Mutex,Cond}: use "constexpr" only with glibc 

Apparently all other C libraries are not compatible with "constexpr".
Those which are not will get a performance penalty, but at least they
work at all.
This commit is contained in:
Max Kellermann 2015-08-25 12:46:12 +02:00
parent e9a544fa98
commit d2dd6f7c70
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,4 +1,5 @@
ver 0.19.14 (not yet released) ver 0.19.14 (not yet released)
* fix build failures on non-glibc builds due to constexpr Mutex
ver 0.19.13 (2016/02/23) ver 0.19.13 (2016/02/23)
* tags * tags

14
src/thread/PosixCond.hxx
View File

@ -41,9 +41,13 @@ class PosixCond {
pthread_cond_t cond; pthread_cond_t cond;
public: public:
#if defined(__NetBSD__) || defined(__BIONIC__) #ifdef __GLIBC__
/* NetBSD's PTHREAD_COND_INITIALIZER is not compatible with /* optimized constexpr constructor for pthread implementations
"constexpr" */ that support it */
constexpr PosixCond():cond(PTHREAD_COND_INITIALIZER) {}
#else
/* slow fallback for pthread implementations that are not
compatible with "constexpr" */
PosixCond() { PosixCond() {
pthread_cond_init(&cond, nullptr); pthread_cond_init(&cond, nullptr);
} }
@ -51,10 +55,6 @@ public:
~PosixCond() { ~PosixCond() {
pthread_cond_destroy(&cond); pthread_cond_destroy(&cond);
} }
#else
/* optimized constexpr constructor for sane POSIX
implementations */
constexpr PosixCond():cond(PTHREAD_COND_INITIALIZER) {}
#endif #endif
PosixCond(const PosixCond &other) = delete; PosixCond(const PosixCond &other) = delete;

14
src/thread/PosixMutex.hxx
View File

@ -41,9 +41,13 @@ class PosixMutex {
pthread_mutex_t mutex; pthread_mutex_t mutex;
public: public:
#if defined(__NetBSD__) || defined(__BIONIC__) #ifdef __GLIBC__
/* NetBSD's PTHREAD_MUTEX_INITIALIZER is not compatible with /* optimized constexpr constructor for pthread implementations
"constexpr" */ that support it */
constexpr PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
#else
/* slow fallback for pthread implementations that are not
compatible with "constexpr" */
PosixMutex() { PosixMutex() {
pthread_mutex_init(&mutex, nullptr); pthread_mutex_init(&mutex, nullptr);
} }
@ -51,10 +55,6 @@ public:
~PosixMutex() { ~PosixMutex() {
pthread_mutex_destroy(&mutex); pthread_mutex_destroy(&mutex);
} }
#else
/* optimized constexpr constructor for sane POSIX
implementations */
constexpr PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
#endif #endif
PosixMutex(const PosixMutex &other) = delete; PosixMutex(const PosixMutex &other) = delete;