event/Thread: start the thread in the constructor

This is the proper fix for the e309941 regression; see commit abc8420
MusicPlayerDaemon · Jan 30, 2025 · b49cfe9 · b49cfe9
1 parent ae112fe
commit b49cfe9
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 22 deletions.
diff --git a/src/Main.cxx b/src/Main.cxx
@@ -329,9 +329,6 @@ MainConfigured(const CommandLineOptions &options,
 	Instance instance;
 	global_instance = &instance;
 
-	instance.io_thread.Start();
-	instance.rtio_thread.Start();
-
 #ifdef ENABLE_NEIGHBOR_PLUGINS
 	instance.neighbors = std::make_unique<NeighborGlue>();
 	instance.neighbors->Init(raw_config,

diff --git a/src/event/Thread.hxx b/src/event/Thread.hxx
@@ -20,7 +20,9 @@ class EventThread final {
 public:
 	explicit EventThread(bool _realtime=false)
 		:event_loop(ThreadId::Null()), thread(BIND_THIS_METHOD(Run)),
-		 realtime(_realtime) {}
+		 realtime(_realtime) {
+		Start();
+	}
 
 	~EventThread() noexcept {
 		Stop();
@@ -30,11 +32,11 @@ public:
 		return event_loop;
 	}
 
+private:
 	void Start();
 
 	void Stop() noexcept;
 
-private:
 	void Run() noexcept;
 };
 

diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx
@@ -28,12 +28,6 @@ class GlobalInit {
 	EventThread io_thread;
 
 public:
-	GlobalInit() {
-		io_thread.Start();
-	}
-
-	~GlobalInit() = default;
-
 	EventLoop &GetEventLoop() {
 		return io_thread.GetEventLoop();
 	}

diff --git a/test/DumpOgg.cxx b/test/DumpOgg.cxx
@@ -24,7 +24,6 @@ try {
 	const char *path = argv[1];
 
 	EventThread io_thread;
-	io_thread.Start();
 
 	const ScopeInputPluginsInit input_plugins_init(ConfigData(),
 						       io_thread.GetEventLoop());

diff --git a/test/RunChromaprint.cxx b/test/RunChromaprint.cxx
@@ -84,8 +84,6 @@ class GlobalInit {
 		 input_plugins_init(config, io_thread.GetEventLoop()),
 		 decoder_plugins_init(config)
 	{
-		io_thread.Start();
-
 		pcm_convert_global_init(config);
 	}
 };

diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
@@ -47,7 +47,6 @@ try {
 	const auto config = AutoLoadConfigFile(config_path);
 
 	EventThread io_thread;
-	io_thread.Start();
 
 	const ScopeInputPluginsInit input_plugins_init(config, io_thread.GetEventLoop());
 	const ScopePlaylistPluginsInit playlist_plugins_init(config);

diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx
@@ -34,7 +34,6 @@ class GlobalInit {
 	explicit GlobalInit(Path config_path)
 		:config(AutoLoadConfigFile(config_path))
 	{
-		io_thread.Start();
 	}
 };
 

diff --git a/test/read_tags.cxx b/test/read_tags.cxx
@@ -86,7 +86,6 @@ try {
 	const char *path = argv[2];
 
 	EventThread io_thread;
-	io_thread.Start();
 
 	const ScopeInputPluginsInit input_plugins_init(ConfigData(),
 						       io_thread.GetEventLoop());

diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
@@ -91,7 +91,6 @@ class GlobalInit {
 		 input_plugins_init(config, io_thread.GetEventLoop()),
 		 decoder_plugins_init(config)
 	{
-		io_thread.Start();
 	}
 };
 

diff --git a/test/run_input.cxx b/test/run_input.cxx
@@ -130,7 +130,6 @@ class GlobalInit {
 	explicit GlobalInit(Path config_path)
 		:config(AutoLoadConfigFile(config_path))
 	{
-		io_thread.Start();
 	}
 };
 

diff --git a/test/run_output.cxx b/test/run_output.cxx
@@ -158,7 +158,6 @@ try {
 	const auto config = AutoLoadConfigFile(c.config_path);
 
 	EventThread io_thread;
-	io_thread.Start();
 
 	/* initialize the audio output */
 

diff --git a/test/run_storage.cxx b/test/run_storage.cxx
@@ -114,7 +114,6 @@ class GlobalInit {
 	GlobalInit(Path config_path)
 		:config(AutoLoadConfigFile(config_path))
 	{
-		io_thread.Start();
 	}
 
 	EventLoop &GetEventLoop() noexcept {

diff --git a/test/visit_archive.cxx b/test/visit_archive.cxx
@@ -35,7 +35,6 @@ class GlobalInit {
 	explicit GlobalInit(Path config_path)
 		:config(AutoLoadConfigFile(config_path))
 	{
-		io_thread.Start();
 	}
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,6 @@ class GlobalInit { @@
     	explicit GlobalInit(Path config_path)
     		:config(AutoLoadConfigFile(config_path))
     	{
-    		io_thread.Start();
     	}
     };
@@ Expand Down @@