1 files changed, 4 insertions, 97 deletions

diff --git a/src/event/SocketMonitor.cxx b/src/event/SocketMonitor.cxx
index 2b97059f7..69207287d 100644
--- a/src/event/SocketMonitor.cxx
+++ b/src/event/SocketMonitor.cxx
@@ -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
@@ -28,12 +28,9 @@
 #ifdef WIN32
 #include <winsock2.h>
 #else
-#include <sys/types.h>
 #include <sys/socket.h>
 #endif
 
-#ifdef USE_EPOLL
-
 void
 SocketMonitor::Dispatch(unsigned flags)
 {
@@ -43,93 +40,19 @@ SocketMonitor::Dispatch(unsigned flags)
 		Cancel();
 }
 
-#else
-
-/*
- * GSource methods
- *
- */
-
-gboolean
-SocketMonitor::Prepare(gcc_unused GSource *source, gcc_unused gint *timeout_r)
-{
-	return false;
-}
-
-gboolean
-SocketMonitor::Check(GSource *_source)
-{
-	const Source &source = *(const Source *)_source;
-	const SocketMonitor &monitor = *source.monitor;
-	assert(_source == &monitor.source->base);
-
-	return monitor.Check();
-}
-
-gboolean
-SocketMonitor::Dispatch(GSource *_source,
-			gcc_unused GSourceFunc callback,
-			gcc_unused gpointer user_data)
-{
-	Source &source = *(Source *)_source;
-	SocketMonitor &monitor = *source.monitor;
-	assert(_source == &monitor.source->base);
-
-	monitor.Dispatch();
-	return true;
-}
-
-/**
- * The vtable for our GSource implementation.  Unfortunately, we
- * cannot declare it "const", because g_source_new() takes a non-const
- * pointer, for whatever reason.
- */
-static GSourceFuncs socket_monitor_source_funcs = {
-	SocketMonitor::Prepare,
-	SocketMonitor::Check,
-	SocketMonitor::Dispatch,
-	nullptr,
-	nullptr,
-	nullptr,
-};
-
-SocketMonitor::SocketMonitor(int _fd, EventLoop &_loop)
-	:fd(-1), loop(_loop),
-	 source(nullptr) {
-	assert(_fd >= 0);
-
-	Open(_fd);
-}
-
-#endif
-
 SocketMonitor::~SocketMonitor()
 {
 	if (IsDefined())
-		Close();
+		Cancel();
 }
 
 void
 SocketMonitor::Open(int _fd)
 {
 	assert(fd < 0);
-#ifndef USE_EPOLL
-	assert(source == nullptr);
-#endif
 	assert(_fd >= 0);
 
 	fd = _fd;
-
-#ifndef USE_EPOLL
-	poll = {fd, 0, 0};
-
-	source = (Source *)g_source_new(&socket_monitor_source_funcs,
-					sizeof(*source));
-	source->monitor = this;
-
-	g_source_attach(&source->base, loop.GetContext());
-	g_source_add_poll(&source->base, &poll);
-#endif
 }
 
 int
@@ -142,12 +65,6 @@ SocketMonitor::Steal()
 	int result = fd;
 	fd = -1;
 
-#ifndef USE_EPOLL
-	g_source_destroy(&source->base);
-	g_source_unref(&source->base);
-	source = nullptr;
-#endif
-
 	return result;
 }
 
@@ -156,12 +73,9 @@ SocketMonitor::Abandon()
 {
 	assert(IsDefined());
 
-#ifdef USE_EPOLL
+	int old_fd = fd;
 	fd = -1;
-	loop.Abandon(*this);
-#else
-	Steal();
-#endif
+	loop.Abandon(old_fd, *this);
 }
 
 void
@@ -178,7 +92,6 @@ SocketMonitor::Schedule(unsigned flags)
 	if (flags == GetScheduledFlags())
 		return;
 
-#ifdef USE_EPOLL
 	if (scheduled_flags == 0)
 		loop.AddFD(fd, flags, *this);
 	else if (flags == 0)
@@ -187,12 +100,6 @@ SocketMonitor::Schedule(unsigned flags)
 		loop.ModifyFD(fd, flags, *this);
 
 	scheduled_flags = flags;
-#else
-	poll.events = flags;
-	poll.revents &= flags;
-
-	loop.WakeUp();
-#endif
 }
 
 SocketMonitor::ssize_t