diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/condition.c | 62 | ||||
| -rw-r--r-- | src/condition.h | 60 |
3 files changed, 0 insertions, 124 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e89905bf2..d876ad6e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,6 @@ mpd_headers = \ buffer2array.h \ command.h \ idle.h \ - condition.h \ cmdline.h \ conf.h \ crossfade.h \ @@ -102,7 +101,6 @@ mpd_SOURCES = \ buffer2array.c \ command.c \ idle.c \ - condition.c \ cmdline.c \ conf.c \ crossfade.c \ diff --git a/src/condition.c b/src/condition.c deleted file mode 100644 index 2e594597e..000000000 --- a/src/condition.c +++ /dev/null @@ -1,62 +0,0 @@ -/* the Music Player Daemon (MPD) - * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) - * Copyright (C) 2008 Max Kellermann <max@duempel.org> - * This project's homepage is: http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "condition.h" -#include "utils.h" -#include "log.h" - -#include <sys/time.h> -#include <string.h> - -void cond_init(struct condition *cond) -{ - cond->mutex = g_mutex_new(); - if (cond->mutex == NULL) - FATAL("g_mutex_new failed"); - - cond->cond = g_cond_new(); - if (cond->cond == NULL) - FATAL("g_cond_new() failed"); -} - -void cond_enter(struct condition *cond) -{ - g_mutex_lock(cond->mutex); -} - -void cond_leave(struct condition *cond) -{ - g_mutex_unlock(cond->mutex); -} - -void cond_wait(struct condition *cond) -{ - g_cond_wait(cond->cond, cond->mutex); -} - -void cond_signal_sync(struct condition *cond) -{ - g_cond_signal(cond->cond); -} - -void cond_destroy(struct condition *cond) -{ - g_mutex_free(cond->mutex); - g_cond_free(cond->cond); -} diff --git a/src/condition.h b/src/condition.h deleted file mode 100644 index 3bfba1981..000000000 --- a/src/condition.h +++ /dev/null @@ -1,60 +0,0 @@ -/* the Music Player Daemon (MPD) - * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) - * Copyright (C) 2008 Max Kellermann <max@duempel.org> - * This project's homepage is: http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef MPD_CONDITION_H -#define MPD_CONDITION_H - -#include <glib.h> - -struct condition { - GMutex *mutex; - GCond *cond; -}; - -void cond_init(struct condition *cond); - -/** - * The thread which shall be notified by this object must call this - * function before any cond_wait() invocation. It locks the mutex. - */ -void cond_enter(struct condition *cond); - -/** - * Neutralize cond_leave(). - */ -void cond_leave(struct condition *cond); - -/** - * Wait for a conditio. Return immediately if we have already - * been notified since we last returned from cond_wait(). - */ -void cond_wait(struct condition *cond); - -/** - * Notify the thread synchronously, i.e. wait until it can deliver - * the notification. - */ -void cond_signal_sync(struct condition *cond); - -/** - * cond_destroy - destroy the cond and internal structures - */ -void cond_destroy(struct condition *cond); - -#endif /* CONDITION_H */ |