thread/{Mutex,Cond}: new backend for WIN32

Use CRITICAL_SECTION and CONDITION_VARIABLE.  This requires Windows
Vista or newer.  It fixes problems with GLib threading objects that
were implicitly created by static constructors before g_thread_init().

5 files changed, 137 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index fe922a6af..170e74dc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,9 +158,11 @@ src_mpd_SOURCES = \
 	$(MIXER_API_SRC) \
 	src/thread/Mutex.hxx \
 	src/thread/PosixMutex.hxx \
+	src/thread/CriticalSection.hxx \
 	src/thread/GLibMutex.hxx \
 	src/thread/Cond.hxx \
 	src/thread/PosixCond.hxx \
+	src/thread/WindowsCond.hxx \
 	src/thread/GLibCond.hxx \
 	src/glib_socket.h \
 	src/clock.c src/clock.h \
diff --git a/src/thread/Cond.hxx b/src/thread/Cond.hxx
index e971fa591..bbaabddc2 100644
--- a/src/thread/Cond.hxx
+++ b/src/thread/Cond.hxx
@@ -24,8 +24,8 @@
 
 /* mingw-w64 4.6.3 lacks a std::cond implementation */
 
-#include "GLibCond.hxx"
-typedef GLibCond Cond;
+#include "WindowsCond.hxx"
+typedef WindowsCond Cond;
 
 #else
 
diff --git a/src/thread/CriticalSection.hxx b/src/thread/CriticalSection.hxx
new file mode 100644
index 000000000..8bc05b8f5
--- /dev/null
+++ b/src/thread/CriticalSection.hxx
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2009-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_CRITICAL_SECTION_HXX
+#define MPD_THREAD_CRITICAL_SECTION_HXX
+
+#include <windows.h>
+
+/**
+ * Wrapper for a CRITICAL_SECTION, backend for the Mutex class.
+ */
+class CriticalSection {
+	friend class WindowsCond;
+
+	CRITICAL_SECTION critical_section;
+
+public:
+	CriticalSection() {
+		::InitializeCriticalSection(&critical_section);
+	}
+
+	~CriticalSection() {
+		::DeleteCriticalSection(&critical_section);
+	}
+
+	CriticalSection(const CriticalSection &other) = delete;
+	CriticalSection &operator=(const CriticalSection &other) = delete;
+
+	void lock() {
+		::EnterCriticalSection(&critical_section);
+	};
+
+	bool try_lock() {
+		return ::TryEnterCriticalSection(&critical_section) != 0;
+	};
+
+	void unlock() {
+		::LeaveCriticalSection(&critical_section);
+	}
+};
+
+#endif
diff --git a/src/thread/Mutex.hxx b/src/thread/Mutex.hxx
index d2ebf4d1c..675af74b1 100644
--- a/src/thread/Mutex.hxx
+++ b/src/thread/Mutex.hxx
@@ -24,8 +24,8 @@
 
 /* mingw-w64 4.6.3 lacks a std::mutex implementation */
 
-#include "GLibMutex.hxx"
-typedef GLibMutex Mutex;
+#include "CriticalSection.hxx"
+typedef CriticalSection Mutex;
 
 #else
 
diff --git a/src/thread/WindowsCond.hxx b/src/thread/WindowsCond.hxx
new file mode 100644
index 000000000..f4e909c72
--- /dev/null
+++ b/src/thread/WindowsCond.hxx
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2009-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_WINDOWS_COND_HXX
+#define MPD_THREAD_WINDOWS_COND_HXX
+
+#include "CriticalSection.hxx"
+
+/**
+ * Wrapper for a CONDITION_VARIABLE, backend for the Cond class.
+ */
+class WindowsCond {
+	CONDITION_VARIABLE cond;
+
+public:
+	WindowsCond() {
+		InitializeConditionVariable(&cond);
+	}
+
+	WindowsCond(const WindowsCond &other) = delete;
+	WindowsCond &operator=(const WindowsCond &other) = delete;
+
+	void signal() {
+		WakeConditionVariable(&cond);
+	}
+
+	void broadcast() {
+		WakeAllConditionVariable(&cond);
+	}
+
+	void wait(CriticalSection &mutex) {
+		SleepConditionVariableCS(&cond, &mutex.critical_section,
+					 INFINITE);
+	}
+};
+
+#endif