notify: use GLib locking

Use GLib locking (GMutex, GCond) instead of pthread because GLib is
more portable, e.g. on mingw32.
This commit is contained in:
Max Kellermann 2008-12-27 20:56:06 +01:00
parent e8c44782d0
commit ed9668f638
3 changed files with 15 additions and 27 deletions

View File

@ -17,42 +17,33 @@
*/
#include "notify.h"
#include "log.h"
void notify_init(struct notify *notify)
{
int ret;
ret = pthread_mutex_init(&notify->mutex, NULL);
if (ret != 0)
FATAL("pthread_mutex_init() failed");
ret = pthread_cond_init(&notify->cond, NULL);
if (ret != 0)
FATAL("pthread_mutex_init() failed");
notify->mutex = g_mutex_new();
notify->cond = g_cond_new();
notify->pending = false;
}
void notify_deinit(struct notify *notify)
{
pthread_mutex_destroy(&notify->mutex);
pthread_cond_destroy(&notify->cond);
g_mutex_free(notify->mutex);
g_cond_free(notify->cond);
}
void notify_wait(struct notify *notify)
{
pthread_mutex_lock(&notify->mutex);
g_mutex_lock(notify->mutex);
while (!notify->pending)
pthread_cond_wait(&notify->cond, &notify->mutex);
g_cond_wait(notify->cond, notify->mutex);
notify->pending = false;
pthread_mutex_unlock(&notify->mutex);
g_mutex_unlock(notify->mutex);
}
void notify_signal(struct notify *notify)
{
pthread_mutex_lock(&notify->mutex);
g_mutex_lock(notify->mutex);
notify->pending = true;
pthread_cond_signal(&notify->cond);
pthread_mutex_unlock(&notify->mutex);
g_cond_signal(notify->cond);
g_mutex_unlock(notify->mutex);
}

View File

@ -19,20 +19,16 @@
#ifndef MPD_NOTIFY_H
#define MPD_NOTIFY_H
#include <glib.h>
#include <stdbool.h>
#include <pthread.h>
struct notify {
pthread_mutex_t mutex;
pthread_cond_t cond;
GMutex *mutex;
GCond *cond;
bool pending;
};
#define NOTIFY_INITIALIZER { \
.mutex = PTHREAD_MUTEX_INITIALIZER, \
.cond = PTHREAD_COND_INITIALIZER, \
}
void notify_init(struct notify *notify);
void notify_deinit(struct notify *notify);

View File

@ -23,6 +23,7 @@
#include "pcm_utils.h"
#include "notify.h"
#include <pthread.h>
#include <time.h>
struct audio_output {