aboutsummaryrefslogtreecommitdiffstats
path: root/src/thread
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-07-02 20:09:05 +0200
committerMax Kellermann <max@duempel.org>2014-07-02 20:09:39 +0200
commit80a45c91f9097571b291f3b73d78dad21d6043e4 (patch)
tree102f8116df5201a7a56d74fbb08dd1bbb47990ad /src/thread
parent3f695fdfaff58856bd9ca7fa94a84d45930212ba (diff)
downloadmpd-80a45c91f9097571b291f3b73d78dad21d6043e4.tar.gz
mpd-80a45c91f9097571b291f3b73d78dad21d6043e4.tar.xz
mpd-80a45c91f9097571b291f3b73d78dad21d6043e4.zip
thread/GLib{Mutex,Cond}: remove obsolete classes
Diffstat (limited to 'src/thread')
-rw-r--r--src/thread/GLibCond.hxx88
-rw-r--r--src/thread/GLibMutex.hxx90
2 files changed, 0 insertions, 178 deletions
diff --git a/src/thread/GLibCond.hxx b/src/thread/GLibCond.hxx
deleted file mode 100644
index 9ab08e9fd..000000000
--- a/src/thread/GLibCond.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2013 Max Kellermann <max@duempel.org>
- *
- * 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_COND_HXX
-#define MPD_THREAD_GLIB_COND_HXX
-
-#include "GLibMutex.hxx"
-
-/**
- * A wrapper for GCond.
- */
-class GLibCond {
-#if GLIB_CHECK_VERSION(2,32,0)
- GCond cond;
-#else
- GCond *cond;
-#endif
-
-public:
- GLibCond() {
-#if GLIB_CHECK_VERSION(2,32,0)
- g_cond_init(&cond);
-#else
- cond = g_cond_new();
-#endif
- }
-
- ~GLibCond() {
-#if GLIB_CHECK_VERSION(2,32,0)
- g_cond_clear(&cond);
-#else
- g_cond_free(cond);
-#endif
- }
-
- GLibCond(const GLibCond &other) = delete;
- GLibCond &operator=(const GLibCond &other) = delete;
-
-private:
- GCond *GetNative() {
-#if GLIB_CHECK_VERSION(2,32,0)
- return &cond;
-#else
- return cond;
-#endif
- }
-
-public:
- void signal() {
- g_cond_signal(GetNative());
- }
-
- void broadcast() {
- g_cond_broadcast(GetNative());
- }
-
- void wait(GLibMutex &mutex) {
- g_cond_wait(GetNative(), mutex.GetNative());
- }
-};
-
-#endif
diff --git a/src/thread/GLibMutex.hxx b/src/thread/GLibMutex.hxx
deleted file mode 100644
index 2c666c1ea..000000000
--- a/src/thread/GLibMutex.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2013 Max Kellermann <max@duempel.org>
- *
- * 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 <glib.h>
-
-/**
- * A wrapper for GMutex.
- */
-class GLibMutex {
- friend class GLibCond;
-
-#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