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

use the pthread API in notify.c

Browse Source 
This patch rewrites notify.c to use the pthread API, namely
pthread_mutex and pthread_cond.  This is a lot cheaper and easier than
the pipe() hack.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7280 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann
2008-04-12 04:14:25 +00:00
committed by Eric Wong
parent 38e0dafc4c
commit 0146fbe3ce
2 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/notify.c
View File

@@ -17,32 +17,52 @@
*/
#include "notify.h"
#include "os_compat.h"
#include "log.h"
#include "utils.h"
void notifyInit(Notify *notify)
int notifyInit(Notify *notify)
{
if (pipe(notify->fds) < 0)
FATAL("Couldn't open pipe: %s", strerror(errno));
if (set_nonblocking(notify->fds[1]) < 0)
FATAL("Couldn't set non-blocking on notify fd: %s",
strerror(errno));
int ret;
ret = pthread_mutex_init(&notify->mutex, NULL);
if (ret != 0)
return ret;
ret = pthread_cond_init(&notify->cond, NULL);
if (ret != 0) {
pthread_mutex_destroy(&notify->mutex);
return ret;
}
notify->pending = 0;
return 0;
}
void notifyEnter(Notify *notify)
{
pthread_mutex_lock(&notify->mutex);
}
void notifyLeave(Notify *notify)
{
pthread_mutex_unlock(&notify->mutex);
}
void notifyWait(Notify *notify)
{
char buffer[64];
if (read(notify->fds[0], buffer, sizeof(buffer)) < 0)
FATAL("error reading from pipe: %s\n", strerror(errno));
if (!notify->pending)
pthread_cond_wait(&notify->cond, &notify->mutex);
notify->pending = 0;
}
void notifySignal(Notify *notify)
{
char buffer = 0;
if (write(notify->fds[1], &buffer, sizeof(buffer)) < 0 &&
errno != EAGAIN && errno != EINTR)
FATAL("error writing to pipe: %s\n", strerror(errno));
notify->pending = 1;
pthread_cond_signal(&notify->cond);
}
void notifySignalSync(Notify *notify)
{
pthread_mutex_lock(&notify->mutex);
notifySignal(notify);
pthread_mutex_unlock(&notify->mutex);
}