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

DatabaseLock: use the Mutex class instead of GLib's GMutex

Browse Source
This commit is contained in:
Max Kellermann 2013-01-02 21:01:01 +01:00
parent a68302e50b
commit 48025c2279
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DatabaseLock.cxx
View File

@ -26,7 +26,7 @@
#pragma GCC diagnostic ignored "-Wmissing-field-initializers" #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif #endif
GStaticMutex db_mutex = G_STATIC_MUTEX_INIT; Mutex db_mutex;
#ifndef NDEBUG #ifndef NDEBUG
GThread *db_mutex_holder; GThread *db_mutex_holder;

7
src/DatabaseLock.hxx
View File

@ -27,11 +27,12 @@
#define MPD_DB_LOCK_HXX #define MPD_DB_LOCK_HXX
#include "check.h" #include "check.h"
#include "thread/Mutex.hxx"
#include <glib.h> #include <glib.h>
#include <assert.h> #include <assert.h>
extern GStaticMutex db_mutex; extern Mutex db_mutex;
#ifndef NDEBUG #ifndef NDEBUG
@ -58,7 +59,7 @@ db_lock(void)
{ {
assert(!holding_db_lock()); assert(!holding_db_lock());
g_static_mutex_lock(&db_mutex); db_mutex.lock();
assert(db_mutex_holder == NULL); assert(db_mutex_holder == NULL);
#ifndef NDEBUG #ifndef NDEBUG
@ -77,7 +78,7 @@ db_unlock(void)
db_mutex_holder = NULL; db_mutex_holder = NULL;
#endif #endif
g_static_mutex_unlock(&db_mutex); db_mutex.unlock();
} }
#ifdef __cplusplus #ifdef __cplusplus