1 files changed, 7 insertions, 48 deletions
diff --git a/src/event/DeferredMonitor.hxx b/src/event/DeferredMonitor.hxx
index 2ac832a0a..3d3ab22b7 100644
--- a/src/event/DeferredMonitor.hxx
+++ b/src/event/DeferredMonitor.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,64 +23,31 @@
 #include "check.h"
 #include "Compiler.h"
 
-#ifdef USE_EPOLL
-#include "SocketMonitor.hxx"
-#include "WakeFD.hxx"
-#else
-#include "thread/Mutex.hxx"
-#include <glib.h>
-#endif
-
 #include <atomic>
 
 class EventLoop;
 
 /**
  * Defer execution of an event into an #EventLoop.
+ *
+ * This class is thread-safe.
  */
-class DeferredMonitor
-#ifdef USE_EPOLL
-	: private SocketMonitor
-#endif
-{
-#ifdef USE_EPOLL
-	std::atomic_bool pending;
-	WakeFD fd;
-#else
+class DeferredMonitor {
 	EventLoop &loop;
 
-	Mutex mutex;
-
-	guint source_id;
-#endif
+	friend class EventLoop;
+	bool pending;
 
 public:
-#ifdef USE_EPOLL
 	DeferredMonitor(EventLoop &_loop)
-		:SocketMonitor(_loop), pending(false) {
-		SocketMonitor::Open(fd.Get());
-		SocketMonitor::Schedule(SocketMonitor::READ);
-	}
-#else
-	DeferredMonitor(EventLoop &_loop)
-		:loop(_loop), source_id(0) {}
-#endif
+		:loop(_loop), pending(false) {}
 
 	~DeferredMonitor() {
-#ifdef USE_EPOLL
-		/* avoid closing the WakeFD twice */
-		SocketMonitor::Steal();
-#else
 		Cancel();
-#endif
 	}
 
 	EventLoop &GetEventLoop() {
-#ifdef USE_EPOLL
-		return SocketMonitor::GetEventLoop();
-#else
 		return loop;
-#endif
 	}
 
 	void Schedule();
@@ -88,14 +55,6 @@ public:
 
 protected:
 	virtual void RunDeferred() = 0;
-
-private:
-#ifdef USE_EPOLL
-	virtual bool OnSocketReady(unsigned flags) override final;
-#else
-	void Run();
-	static gboolean Callback(gpointer data);
-#endif
 };
 
 #endif /* MAIN_NOTIFY_H */