From 483ba5ea1ccebd4741fbcc5d92648ac6854c60fe Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Jan 2013 09:16:22 +0100 Subject: thread/GLibMutex: new Mutex implementation Switch WIN32 to this implementation to be able to use condition variables, which is impossible with CriticalSection. --- src/thread/CriticalSection.hxx | 63 ------------------------------ src/thread/GLibMutex.hxx | 88 ++++++++++++++++++++++++++++++++++++++++++ src/thread/Mutex.hxx | 4 +- 3 files changed, 90 insertions(+), 65 deletions(-) delete mode 100644 src/thread/CriticalSection.hxx create mode 100644 src/thread/GLibMutex.hxx (limited to 'src/thread') diff --git a/src/thread/CriticalSection.hxx b/src/thread/CriticalSection.hxx deleted file mode 100644 index f3faee943..000000000 --- a/src/thread/CriticalSection.hxx +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2009-2013 Max Kellermann - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef MPD_THREAD_CRITICAL_SECTION_HXX -#define MPD_THREAD_CRITICAL_SECTION_HXX - -#include - -class CriticalSection { - CRITICAL_SECTION critical_section; - -public: - CriticalSection() { - ::InitializeCriticalSection(&critical_section); - } - - ~CriticalSection() { - ::DeleteCriticalSection(&critical_section); - } - - CriticalSection(const CriticalSection &other) = delete; - CriticalSection &operator=(const CriticalSection &other) = delete; - - void lock() { - ::EnterCriticalSection(&critical_section); - }; - - bool try_lock() { - return ::TryEnterCriticalSection(&critical_section) != 0; - }; - - void unlock() { - ::LeaveCriticalSection(&critical_section); - } -}; - -#endif diff --git a/src/thread/GLibMutex.hxx b/src/thread/GLibMutex.hxx new file mode 100644 index 000000000..f9bb5b4e9 --- /dev/null +++ b/src/thread/GLibMutex.hxx @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2013 Max Kellermann + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef MPD_THREAD_GLIB_MUTEX_HXX +#define MPD_THREAD_GLIB_MUTEX_HXX + +#include + +/** + * A wrapper for GMutex. + */ +class GLibMutex { +#if GLIB_CHECK_VERSION(2,32,0) + GMutex mutex; +#else + GMutex *mutex; +#endif + +public: + GLibMutex() { +#if GLIB_CHECK_VERSION(2,32,0) + g_mutex_init(&mutex); +#else + mutex = g_mutex_new(); +#endif + } + + ~GLibMutex() { +#if GLIB_CHECK_VERSION(2,32,0) + g_mutex_clear(&mutex); +#else + g_mutex_free(mutex); +#endif + } + + GLibMutex(const GLibMutex &other) = delete; + GLibMutex &operator=(const GLibMutex &other) = delete; + +private: + GMutex *GetNative() { +#if GLIB_CHECK_VERSION(2,32,0) + return &mutex; +#else + return mutex; +#endif + } + +public: + void lock() { + g_mutex_lock(GetNative()); + } + + bool try_lock() { + return g_mutex_trylock(GetNative()); + } + + void unlock() { + g_mutex_lock(GetNative()); + } +}; + +#endif diff --git a/src/thread/Mutex.hxx b/src/thread/Mutex.hxx index 675af74b1..d2ebf4d1c 100644 --- a/src/thread/Mutex.hxx +++ b/src/thread/Mutex.hxx @@ -24,8 +24,8 @@ /* mingw-w64 4.6.3 lacks a std::mutex implementation */ -#include "CriticalSection.hxx" -typedef CriticalSection Mutex; +#include "GLibMutex.hxx" +typedef GLibMutex Mutex; #else -- cgit v1.2.3