listenbrainz: added a listens synchronizer. fixes #142

src/libs/utils/impl/ChildProcessManager.cpp

@@ -25,42 +25,14 @@
 
 
 std::unique_ptr<IChildProcessManager>
-createChildProcessManager()
+createChildProcessManager(boost::asio::io_context& ioContext)
 {
-	return std::make_unique<ChildProcessManager>();
+	return std::make_unique<ChildProcessManager>(ioContext);
 }
 
-ChildProcessManager::ChildProcessManager()
-: _work {boost::asio::make_work_guard(_ioContext)}
+ChildProcessManager::ChildProcessManager(boost::asio::io_context& ioContext)
+: _ioContext {ioContext}
 {
-	start();
-}
-
-ChildProcessManager::~ChildProcessManager()
-{
-	stop();
-}
-
-void
-ChildProcessManager::start()
-{
-	LMS_LOG(CHILDPROCESS, INFO) << "Starting child process manager...";
-
-	_thread = std::make_unique<std::thread>([&]()
-	{
-		_ioContext.run();
-	});
-
-	LMS_LOG(CHILDPROCESS, INFO) << "Child process manager started!";
-}
-
-void
-ChildProcessManager::stop()
-{
-	LMS_LOG(CHILDPROCESS, INFO) << "Stopping child process manager";
-	_work.reset();
-	_thread->join();
-	LMS_LOG(CHILDPROCESS, INFO) << "Stopped child process manager";
 }
 
 std::unique_ptr<IChildProcess>

src/libs/utils/impl/ChildProcessManager.hpp

@@ -23,15 +23,14 @@
 #include <thread>
 
 #include <boost/asio/io_context.hpp>
-#include <boost/asio/executor_work_guard.hpp>
 
 #include "utils/IChildProcessManager.hpp"
 
 class ChildProcessManager : public IChildProcessManager
 {
 	public:
-		ChildProcessManager();
-		~ChildProcessManager();
+		ChildProcessManager(boost::asio::io_context& ioContext);
+		~ChildProcessManager() = default;
 
 		ChildProcessManager(const ChildProcessManager&) = delete;
 		ChildProcessManager(ChildProcessManager&&) = delete;
@@ -41,12 +40,7 @@ class ChildProcessManager : public IChildProcessManager
 	private:
 		std::unique_ptr<IChildProcess> spawnChildProcess(const std::filesystem::path& path, const IChildProcess::Args& args) override;
 
-		void start();
-		void stop();
-
-		boost::asio::io_context	_ioContext;
-		std::unique_ptr<std::thread> _thread;
-		boost::asio::executor_work_guard<boost::asio::io_context::executor_type> _work;
+		boost::asio::io_context&	_ioContext;
 };
 
 

src/libs/utils/impl/IOContextRunner.cpp

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS 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 LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/Logger.hpp"
+#include "utils/IOContextRunner.hpp"
+
+IOContextRunner::IOContextRunner(boost::asio::io_service& ioService, std::size_t threadCount)
+: _ioService {ioService}
+, _work {ioService}
+{
+	LMS_LOG(UTILS, INFO) << "Starting IO Context with " << threadCount << " threads...";
+	for (std::size_t i {}; i < threadCount; ++i)
+		_threads.emplace_back([&] { _ioService.run(); });
+}
+
+void
+IOContextRunner::stop()
+{
+	LMS_LOG(UTILS, INFO) << "Stopping IO Context";
+	_work.reset();
+	_ioService.stop();
+	LMS_LOG(UTILS, INFO) << "Stopped IO Context";
+}
+
+IOContextRunner::~IOContextRunner()
+{
+
+	stop();
+
+	for (std::thread& t : _threads)
+		t.join();
+
+}