oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

IOThread: use FatalError() on g_thread_create() error 

New GLib versions don't fail.
This commit is contained in:
Max Kellermann 2013-09-03 11:28:47 +02:00
parent bbd7115564
commit 4db119c01b
10 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/IOThread.cxx
View File

@ -23,6 +23,8 @@
#include "thread/Cond.hxx"
#include "event/Loop.hxx"
#include <glib.h>
#include <assert.h>
static struct {
@ -63,8 +65,8 @@ io_thread_init(void)
io.loop = new EventLoop();
}
bool
io_thread_start(gcc_unused GError **error_r)
void
io_thread_start()
{
assert(io.loop != NULL);
assert(io.thread == NULL);
@ -76,10 +78,8 @@ io_thread_start(gcc_unused GError **error_r)
#else
io.thread = g_thread_create(io_thread_func, NULL, true, error_r);
if (io.thread == NULL)
return false;
FatalError();
#endif
return true;
}
void

6
src/IOThread.hxx
View File

@ -22,15 +22,13 @@
#include "gcc.h"
#include <glib.h>
class EventLoop;
void
io_thread_init(void);
bool
io_thread_start(GError **error_r);
void
io_thread_start();
/**
* Run the I/O event loop synchronously in the current thread. This

6
src/Main.cxx
View File

@ -480,11 +480,7 @@ int mpd_main(int argc, char *argv[])
SignalHandlersInit(*main_loop);
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
io_thread_start();
ZeroconfInit(*main_loop);

6
test/dump_playlist.cxx
View File

@ -169,11 +169,7 @@ int main(int argc, char **argv)
}
io_thread_init();
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
io_thread_start();
if (!input_stream_global_init(&error)) {
g_warning("%s", error->message);

6
test/dump_text_file.cxx
View File

@ -116,11 +116,7 @@ int main(int argc, char **argv)
config_global_init();
io_thread_init();
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
io_thread_start();
#ifdef ENABLE_ARCHIVE
archive_plugin_init_all();

6
test/read_tags.cxx
View File

@ -162,11 +162,7 @@ int main(int argc, char **argv)
#endif
io_thread_init();
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
io_thread_start();
if (!input_stream_global_init(&error)) {
g_warning("%s", error->message);

6
test/run_decoder.cxx
View File

@ -163,11 +163,7 @@ int main(int argc, char **argv)
g_log_set_default_handler(my_log_func, NULL);
io_thread_init();
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
io_thread_start();
if (!input_stream_global_init(&error)) {
g_warning("%s", error->message);

6
test/run_input.cxx
View File

@ -134,11 +134,7 @@ int main(int argc, char **argv)
config_global_init();
io_thread_init();
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
io_thread_start();
#ifdef ENABLE_ARCHIVE
archive_plugin_init_all();

6
test/run_output.cxx
View File

@ -210,11 +210,7 @@ int main(int argc, char **argv)
main_loop = new EventLoop(EventLoop::Default());
io_thread_init();
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
io_thread_start();
/* initialize the audio output */

6
test/visit_archive.cxx
View File

@ -77,11 +77,7 @@ main(int argc, char **argv)
config_global_init();
io_thread_init();
if (!io_thread_start(&error)) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
io_thread_start();
archive_plugin_init_all();