IOThread: move code to class EventThread

Makefile.am

@@ -517,6 +517,7 @@ libevent_a_SOURCES = \
 	src/event/MultiSocketMonitor.cxx src/event/MultiSocketMonitor.hxx \
 	src/event/ServerSocket.cxx src/event/ServerSocket.hxx \
 	src/event/Call.hxx src/event/Call.cxx \
+	src/event/Thread.cxx src/event/Thread.hxx \
 	src/event/Loop.cxx src/event/Loop.hxx
 
 # UTF-8 library

src/IOThread.cxx

@@ -19,84 +19,43 @@
 
 #include "config.h"
 #include "IOThread.hxx"
-#include "thread/Mutex.hxx"
+#include "event/Thread.hxx"
-#include "thread/Thread.hxx"
-#include "thread/Name.hxx"
-#include "event/Loop.hxx"
 
 #include <assert.h>
 
-static struct {
+static EventThread *io_thread;
-	Mutex mutex;
-
-	EventLoop *loop;
-	Thread thread;
-} io;
-
-static void
-io_thread_run(void)
-{
-	assert(io_thread_inside());
-	assert(io.loop != nullptr);
-
-	io.loop->Run();
-}
-
-static void
-io_thread_func(gcc_unused void *arg)
-{
-	SetThreadName("io");
-
-	/* lock+unlock to synchronize with io_thread_start(), to be
-	   sure that io.thread is set */
-	io.mutex.lock();
-	io.mutex.unlock();
-
-	io_thread_run();
-}
 
 void
 io_thread_init(void)
 {
-	assert(io.loop == nullptr);
+	assert(io_thread == nullptr);
-	assert(!io.thread.IsDefined());
 
-	io.loop = new EventLoop();
+	io_thread = new EventThread();
 }
 
 void
 io_thread_start()
 {
-	assert(io.loop != nullptr);
+	assert(io_thread != nullptr);
-	assert(!io.thread.IsDefined());
 
-	const std::lock_guard<Mutex> protect(io.mutex);
+	io_thread->Start();
-	io.thread.Start(io_thread_func, nullptr);
-}
-
-void
-io_thread_quit(void)
-{
-	assert(io.loop != nullptr);
-
-	io.loop->Break();
 }
 
 void
 io_thread_deinit(void)
 {
-	if (io.thread.IsDefined()) {
+	if (io_thread == nullptr)
-		io_thread_quit();
+		return;
-		io.thread.Join();
-	}
 
-	delete io.loop;
+	io_thread->Stop();
+	delete io_thread;
+	io_thread = nullptr;
 }
 
 EventLoop &
 io_thread_get()
 {
-	assert(io.loop != nullptr);
+	assert(io_thread != nullptr);
 
-	return *io.loop;
+	return io_thread->GetEventLoop();
 }

src/IOThread.hxx

@@ -30,14 +30,6 @@ io_thread_init();
 void
 io_thread_start();
 
-/**
- * Ask the I/O thread to quit, but does not wait for it.  Usually, you
- * don't need to call this function, because io_thread_deinit()
- * includes this.
- */
-void
-io_thread_quit();
-
 void
 io_thread_deinit();
 

src/event/Thread.cxx

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "Thread.hxx"
+#include "thread/Name.hxx"
+
+void
+EventThread::Start()
+{
+	assert(!thread.IsDefined());
+
+	const std::lock_guard<Mutex> protect(mutex);
+	thread.Start(ThreadFunc, this);
+}
+
+void
+EventThread::Stop()
+{
+	if (thread.IsDefined()) {
+		event_loop.Break();
+		thread.Join();
+	}
+}
+
+void
+EventThread::ThreadFunc()
+{
+	SetThreadName("io");
+
+	/* lock+unlock to synchronize with io_thread_start(), to be
+	   sure that io.thread is set */
+	mutex.lock();
+	mutex.unlock();
+
+	event_loop.Run();
+};
+
+void
+EventThread::ThreadFunc(void *arg)
+{
+	auto &et = *(EventThread *)arg;
+
+	et.ThreadFunc();
+};

src/event/Thread.hxx

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2003-2017 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_EVENT_THREAD_HXX
+#define MPD_EVENT_THREAD_HXX
+
+#include "check.h"
+#include "Loop.hxx"
+#include "thread/Thread.hxx"
+#include "thread/Mutex.hxx"
+
+/**
+ * A thread which runs an #EventLoop.
+ */
+class EventThread final {
+	Mutex mutex;
+
+	EventLoop event_loop;
+
+	Thread thread;
+
+public:
+	EventLoop &GetEventLoop() {
+		return event_loop;
+	}
+
+	void Start();
+
+	/**
+	 * Ask the thread to stop, but does not wait for it.  Usually,
+	 * you don't need to call this function, because Stop()
+	 * includes this.
+	 */
+	void StopAsync() {
+		event_loop.Break();
+	}
+
+	void Stop();
+
+private:
+	void ThreadFunc();
+	static void ThreadFunc(void *arg);
+};
+
+#endif /* MAIN_NOTIFY_H */