event/TimeoutMonitor: wrapper for g_timeout_source_new()

3 files changed, 133 insertions, 10 deletions

diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx
index 9c139e08e..31ef1613c 100644
--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -64,22 +64,20 @@ public:
 		return id;
 	}
 
-	guint AddTimeout(guint interval_ms,
-			 GSourceFunc function, gpointer data) {
+	GSource *AddTimeout(guint interval_ms,
+			    GSourceFunc function, gpointer data) {
 		GSource *source = g_timeout_source_new(interval_ms);
 		g_source_set_callback(source, function, data, nullptr);
-		guint id = g_source_attach(source, GetContext());
-		g_source_unref(source);
-		return id;
+		g_source_attach(source, GetContext());
+		return source;
 	}
 
-	guint AddTimeoutSeconds(guint interval_s,
-				GSourceFunc function, gpointer data) {
+	GSource *AddTimeoutSeconds(guint interval_s,
+				   GSourceFunc function, gpointer data) {
 		GSource *source = g_timeout_source_new_seconds(interval_s);
 		g_source_set_callback(source, function, data, nullptr);
-		guint id = g_source_attach(source, GetContext());
-		g_source_unref(source);
-		return id;
+		g_source_attach(source, GetContext());
+		return source;
 	}
 };
 
diff --git a/src/event/TimeoutMonitor.cxx b/src/event/TimeoutMonitor.cxx
new file mode 100644
index 000000000..e0bf997a0
--- /dev/null
+++ b/src/event/TimeoutMonitor.cxx
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2003-2013 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 "TimeoutMonitor.hxx"
+#include "Loop.hxx"
+
+void
+TimeoutMonitor::Cancel()
+{
+	if (source != nullptr) {
+		g_source_destroy(source);
+		g_source_unref(source);
+		source = nullptr;
+	}
+}
+
+void
+TimeoutMonitor::Schedule(unsigned ms)
+{
+	Cancel();
+	source = loop.AddTimeout(ms, Callback, this);
+}
+
+void
+TimeoutMonitor::ScheduleSeconds(unsigned s)
+{
+	Cancel();
+	source = loop.AddTimeoutSeconds(s, Callback, this);
+}
+
+bool
+TimeoutMonitor::Run()
+{
+	bool result = OnTimeout();
+	if (!result && source != nullptr) {
+		g_source_unref(source);
+		source = nullptr;
+	}
+
+	return result;
+}
+
+gboolean
+TimeoutMonitor::Callback(gpointer data)
+{
+	TimeoutMonitor &monitor = *(TimeoutMonitor *)data;
+	return monitor.Run();
+}
diff --git a/src/event/TimeoutMonitor.hxx b/src/event/TimeoutMonitor.hxx
new file mode 100644
index 000000000..6914bcb61
--- /dev/null
+++ b/src/event/TimeoutMonitor.hxx
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2003-2013 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_SOCKET_TIMEOUT_MONITOR_HXX
+#define MPD_SOCKET_TIMEOUT_MONITOR_HXX
+
+#include "check.h"
+
+#include <glib.h>
+
+class EventLoop;
+
+class TimeoutMonitor {
+	EventLoop &loop;
+	GSource *source;
+
+public:
+	TimeoutMonitor(EventLoop &_loop)
+		:loop(_loop), source(nullptr) {}
+
+	~TimeoutMonitor() {
+		Cancel();
+	}
+
+	bool IsActive() const {
+		return source != nullptr;
+	}
+
+	void Schedule(unsigned ms);
+	void ScheduleSeconds(unsigned s);
+	void Cancel();
+
+protected:
+	/**
+	 * @return true reschedules the timeout again
+	 */
+	virtual bool OnTimeout() = 0;
+
+private:
+	bool Run();
+	static gboolean Callback(gpointer data);
+};
+
+#endif /* MAIN_NOTIFY_H */