From 018f4155eb7b476b96a7b401377be78e00ca7dd2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 7 Aug 2013 22:42:45 +0200 Subject: event: add function BlockingCall() Replaces io_thread_call(). This approach is more generic and easier to use due to std::function. --- src/event/Call.cxx | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 src/event/Call.cxx (limited to 'src/event/Call.cxx') diff --git a/src/event/Call.cxx b/src/event/Call.cxx new file mode 100644 index 000000000..e8343f606 --- /dev/null +++ b/src/event/Call.cxx @@ -0,0 +1,72 @@ +/* + * 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 "Call.hxx" +#include "Loop.hxx" +#include "DeferredMonitor.hxx" +#include "thread/Mutex.hxx" +#include "thread/Cond.hxx" +#include "gcc.h" + +#include + +class BlockingCallMonitor final : DeferredMonitor { + const std::function f; + + Mutex mutex; + Cond cond; + + bool done; + +public: + BlockingCallMonitor(EventLoop &_loop, std::function &&_f) + :DeferredMonitor(_loop), f(std::move(_f)), done(false) {} + + void Run() { + assert(!done); + + Schedule(); + + mutex.lock(); + while (!done) + cond.wait(mutex); + mutex.unlock(); + } + +private: + virtual void RunDeferred() override { + f(); + } +}; + +void +BlockingCall(EventLoop &loop, std::function &&f) +{ + if (loop.IsInside()) { + /* we're already inside the loop - we can simply call + the function */ + f(); + } else { + /* outside the EventLoop's thread - defer execution to + the EventLoop, wait for completion */ + BlockingCallMonitor m(loop, std::move(f)); + m.Run(); + } +} -- cgit v1.2.3