From e0a97a030fc4c6f978b2855c32f5da98b3e7fb78 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Jan 2013 10:33:20 +0100 Subject: io_thread: convert to C++ --- Makefile.am | 14 +-- src/IOThread.cxx | 197 +++++++++++++++++++++++++++++++++++++++++ src/IOThread.hxx | 79 +++++++++++++++++ src/Main.cxx | 2 +- src/input/CurlInputPlugin.cxx | 2 +- src/input/SoupInputPlugin.cxx | 2 +- src/io_thread.c | 199 ------------------------------------------ src/io_thread.h | 80 ----------------- test/dump_playlist.cxx | 2 +- test/dump_text_file.cxx | 2 +- test/read_tags.cxx | 2 +- test/run_decoder.cxx | 2 +- test/run_input.cxx | 3 +- test/run_output.cxx | 2 +- 14 files changed, 292 insertions(+), 296 deletions(-) create mode 100644 src/IOThread.cxx create mode 100644 src/IOThread.hxx delete mode 100644 src/io_thread.c delete mode 100644 src/io_thread.h diff --git a/Makefile.am b/Makefile.am index cb4def83..14617006 100644 --- a/Makefile.am +++ b/Makefile.am @@ -242,7 +242,7 @@ src_mpd_SOURCES = \ src/Log.cxx src/Log.hxx \ src/ls.cxx \ src/io_error.h \ - src/io_thread.c src/io_thread.h \ + src/IOThread.cxx src/IOThread.hxx \ src/Main.cxx src/Main.hxx \ src/Win32Main.cxx \ src/GlobalEvents.cxx src/GlobalEvents.hxx \ @@ -1065,7 +1065,7 @@ test_run_input_LDADD = \ $(GLIB_LIBS) test_run_input_SOURCES = test/run_input.c \ test/stdbin.h \ - src/io_thread.c src/io_thread.h \ + src/IOThread.cxx \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c\ src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \ src/uri.c \ @@ -1077,7 +1077,7 @@ test_dump_text_file_LDADD = \ $(GLIB_LIBS) test_dump_text_file_SOURCES = test/dump_text_file.cxx \ test/stdbin.h \ - src/io_thread.c src/io_thread.h \ + src/IOThread.cxx \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c\ src/Tag.cxx src/TagNames.c src/TagPool.cxx \ src/text_input_stream.c src/fifo_buffer.c \ @@ -1095,7 +1095,7 @@ test_dump_playlist_LDADD = \ $(GLIB_LIBS) test_dump_playlist_SOURCES = test/dump_playlist.cxx \ $(DECODER_SRC) \ - src/io_thread.c src/io_thread.h \ + src/IOThread.cxx \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c\ src/uri.c \ src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \ @@ -1121,7 +1121,7 @@ test_run_decoder_LDADD = \ $(GLIB_LIBS) test_run_decoder_SOURCES = test/run_decoder.cxx \ test/stdbin.h \ - src/io_thread.c src/io_thread.h \ + src/IOThread.cxx \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c \ src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \ src/ReplayGainInfo.cxx \ @@ -1143,7 +1143,7 @@ test_read_tags_LDADD = \ libutil.a \ $(GLIB_LIBS) test_read_tags_SOURCES = test/read_tags.cxx \ - src/io_thread.c src/io_thread.h \ + src/IOThread.cxx \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c \ src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \ src/ReplayGainInfo.cxx \ @@ -1268,7 +1268,7 @@ test_run_output_SOURCES = test/run_output.cxx \ test/FakeReplayGainConfig.cxx \ test/stdbin.h \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c \ - src/io_thread.c src/io_thread.h \ + src/IOThread.cxx \ src/audio_check.c \ src/audio_format.c \ src/audio_parser.c \ diff --git a/src/IOThread.cxx b/src/IOThread.cxx new file mode 100644 index 00000000..2ab2fe91 --- /dev/null +++ b/src/IOThread.cxx @@ -0,0 +1,197 @@ +/* + * 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 "IOThread.hxx" +#include "thread/Mutex.hxx" +#include "thread/Cond.hxx" + +#include + +static struct { + Mutex mutex; + Cond cond; + + GMainContext *context; + GMainLoop *loop; + GThread *thread; +} io; + +void +io_thread_run(void) +{ + assert(io_thread_inside()); + assert(io.context != NULL); + assert(io.loop != NULL); + + g_main_loop_run(io.loop); +} + +static gpointer +io_thread_func(G_GNUC_UNUSED gpointer arg) +{ + /* lock+unlock to synchronize with io_thread_start(), to be + sure that io.thread is set */ + io.mutex.lock(); + io.mutex.unlock(); + + io_thread_run(); + return NULL; +} + +void +io_thread_init(void) +{ + assert(io.context == NULL); + assert(io.loop == NULL); + assert(io.thread == NULL); + + io.context = g_main_context_new(); + io.loop = g_main_loop_new(io.context, false); +} + +bool +io_thread_start(GError **error_r) +{ + assert(io.context != NULL); + assert(io.loop != NULL); + assert(io.thread == NULL); + + io.mutex.lock(); + io.thread = g_thread_create(io_thread_func, NULL, true, error_r); + io.mutex.unlock(); + if (io.thread == NULL) + return false; + + return true; +} + +void +io_thread_quit(void) +{ + assert(io.loop != NULL); + + g_main_loop_quit(io.loop); +} + +void +io_thread_deinit(void) +{ + if (io.thread != NULL) { + io_thread_quit(); + + g_thread_join(io.thread); + } + + if (io.loop != NULL) + g_main_loop_unref(io.loop); + + if (io.context != NULL) + g_main_context_unref(io.context); +} + +GMainContext * +io_thread_context(void) +{ + return io.context; +} + +bool +io_thread_inside(void) +{ + return io.thread != NULL && g_thread_self() == io.thread; +} + +guint +io_thread_idle_add(GSourceFunc function, gpointer data) +{ + GSource *source = g_idle_source_new(); + g_source_set_callback(source, function, data, NULL); + guint id = g_source_attach(source, io.context); + g_source_unref(source); + return id; +} + +GSource * +io_thread_timeout_add(guint interval_ms, GSourceFunc function, gpointer data) +{ + GSource *source = g_timeout_source_new(interval_ms); + g_source_set_callback(source, function, data, NULL); + g_source_attach(source, io.context); + return source; +} + +GSource * +io_thread_timeout_add_seconds(guint interval, + GSourceFunc function, gpointer data) +{ + GSource *source = g_timeout_source_new_seconds(interval); + g_source_set_callback(source, function, data, NULL); + g_source_attach(source, io.context); + return source; +} + +struct call_data { + GThreadFunc function; + gpointer data; + bool done; + gpointer result; +}; + +static gboolean +io_thread_call_func(gpointer _data) +{ + struct call_data *data = (struct call_data *)_data; + + gpointer result = data->function(data->data); + + io.mutex.lock(); + data->done = true; + data->result = result; + io.cond.broadcast(); + io.mutex.unlock(); + + return false; +} + +gpointer +io_thread_call(GThreadFunc function, gpointer _data) +{ + assert(io.thread != NULL); + + if (io_thread_inside()) + /* we're already in the I/O thread - no + synchronization needed */ + return function(_data); + + struct call_data data = { + function, + _data, + false, + nullptr, + }; + + io_thread_idle_add(io_thread_call_func, &data); + + io.mutex.lock(); + while (!data.done) + io.cond.wait(io.mutex); + io.mutex.unlock(); + + return data.result; +} diff --git a/src/IOThread.hxx b/src/IOThread.hxx new file mode 100644 index 00000000..8b0e687a --- /dev/null +++ b/src/IOThread.hxx @@ -0,0 +1,79 @@ +/* + * 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_IO_THREAD_HXX +#define MPD_IO_THREAD_HXX + +#include + +void +io_thread_init(void); + +bool +io_thread_start(GError **error_r); + +/** + * Run the I/O event loop synchronously in the current thread. This + * can be called instead of io_thread_start(). For testing purposes + * only. + */ +void +io_thread_run(void); + +/** + * Ask the I/O thread to quit, but does not wait for it. Usually, you + * don't need to call this function, because io_thread_deinit() + * includes this. + */ +void +io_thread_quit(void); + +void +io_thread_deinit(void); + +G_GNUC_PURE +GMainContext * +io_thread_context(void); + +/** + * Is the current thread the I/O thread? + */ +G_GNUC_PURE +bool +io_thread_inside(void); + +guint +io_thread_idle_add(GSourceFunc function, gpointer data); + +G_GNUC_MALLOC +GSource * +io_thread_timeout_add(guint interval_ms, GSourceFunc function, gpointer data); + +G_GNUC_MALLOC +GSource * +io_thread_timeout_add_seconds(guint interval, + GSourceFunc function, gpointer data); + +/** + * Call a function synchronously in the I/O thread. + */ +gpointer +io_thread_call(GThreadFunc function, gpointer data); + +#endif diff --git a/src/Main.cxx b/src/Main.cxx index d091b964..1c58e0e4 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -45,10 +45,10 @@ #include "Log.hxx" #include "GlobalEvents.hxx" #include "InputInit.hxx" +#include "IOThread.hxx" extern "C" { #include "daemon.h" -#include "io_thread.h" #include "path.h" #include "stats.h" #include "audio_config.h" diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx index e2b3f11d..8210a843 100644 --- a/src/input/CurlInputPlugin.cxx +++ b/src/input/CurlInputPlugin.cxx @@ -26,9 +26,9 @@ extern "C" { #include "input_internal.h" #include "icy_metadata.h" -#include "io_thread.h" } +#include "IOThread.hxx" #include "glib_compat.h" #include diff --git a/src/input/SoupInputPlugin.cxx b/src/input/SoupInputPlugin.cxx index f3422d24..a591a292 100644 --- a/src/input/SoupInputPlugin.cxx +++ b/src/input/SoupInputPlugin.cxx @@ -23,9 +23,9 @@ extern "C" { #include "input_internal.h" -#include "io_thread.h" } +#include "IOThread.hxx" #include "conf.h" extern "C" { diff --git a/src/io_thread.c b/src/io_thread.c deleted file mode 100644 index 7c080adc..00000000 --- a/src/io_thread.c +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (C) 2003-2011 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 "io_thread.h" - -#include - -static struct { - GMutex *mutex; - GCond *cond; - - GMainContext *context; - GMainLoop *loop; - GThread *thread; -} io; - -void -io_thread_run(void) -{ - assert(io_thread_inside()); - assert(io.context != NULL); - assert(io.loop != NULL); - - g_main_loop_run(io.loop); -} - -static gpointer -io_thread_func(G_GNUC_UNUSED gpointer arg) -{ - /* lock+unlock to synchronize with io_thread_start(), to be - sure that io.thread is set */ - g_mutex_lock(io.mutex); - g_mutex_unlock(io.mutex); - - io_thread_run(); - return NULL; -} - -void -io_thread_init(void) -{ - assert(io.context == NULL); - assert(io.loop == NULL); - assert(io.thread == NULL); - - io.mutex = g_mutex_new(); - io.cond = g_cond_new(); - io.context = g_main_context_new(); - io.loop = g_main_loop_new(io.context, false); -} - -bool -io_thread_start(GError **error_r) -{ - assert(io.context != NULL); - assert(io.loop != NULL); - assert(io.thread == NULL); - - g_mutex_lock(io.mutex); - io.thread = g_thread_create(io_thread_func, NULL, true, error_r); - g_mutex_unlock(io.mutex); - if (io.thread == NULL) - return false; - - return true; -} - -void -io_thread_quit(void) -{ - assert(io.loop != NULL); - - g_main_loop_quit(io.loop); -} - -void -io_thread_deinit(void) -{ - if (io.thread != NULL) { - io_thread_quit(); - - g_thread_join(io.thread); - } - - if (io.loop != NULL) - g_main_loop_unref(io.loop); - - if (io.context != NULL) - g_main_context_unref(io.context); - - g_cond_free(io.cond); - g_mutex_free(io.mutex); -} - -GMainContext * -io_thread_context(void) -{ - return io.context; -} - -bool -io_thread_inside(void) -{ - return io.thread != NULL && g_thread_self() == io.thread; -} - -guint -io_thread_idle_add(GSourceFunc function, gpointer data) -{ - GSource *source = g_idle_source_new(); - g_source_set_callback(source, function, data, NULL); - guint id = g_source_attach(source, io.context); - g_source_unref(source); - return id; -} - -GSource * -io_thread_timeout_add(guint interval_ms, GSourceFunc function, gpointer data) -{ - GSource *source = g_timeout_source_new(interval_ms); - g_source_set_callback(source, function, data, NULL); - g_source_attach(source, io.context); - return source; -} - -GSource * -io_thread_timeout_add_seconds(guint interval, - GSourceFunc function, gpointer data) -{ - GSource *source = g_timeout_source_new_seconds(interval); - g_source_set_callback(source, function, data, NULL); - g_source_attach(source, io.context); - return source; -} - -struct call_data { - GThreadFunc function; - gpointer data; - bool done; - gpointer result; -}; - -static gboolean -io_thread_call_func(gpointer _data) -{ - struct call_data *data = _data; - - gpointer result = data->function(data->data); - - g_mutex_lock(io.mutex); - data->done = true; - data->result = result; - g_cond_broadcast(io.cond); - g_mutex_unlock(io.mutex); - - return false; -} - -gpointer -io_thread_call(GThreadFunc function, gpointer _data) -{ - assert(io.thread != NULL); - - if (io_thread_inside()) - /* we're already in the I/O thread - no - synchronization needed */ - return function(_data); - - struct call_data data = { - .function = function, - .data = _data, - .done = false, - }; - - io_thread_idle_add(io_thread_call_func, &data); - - g_mutex_lock(io.mutex); - while (!data.done) - g_cond_wait(io.cond, io.mutex); - g_mutex_unlock(io.mutex); - - return data.result; -} diff --git a/src/io_thread.h b/src/io_thread.h deleted file mode 100644 index 8ff5a71e..00000000 --- a/src/io_thread.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2003-2011 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_IO_THREAD_H -#define MPD_IO_THREAD_H - -#include -#include - -void -io_thread_init(void); - -bool -io_thread_start(GError **error_r); - -/** - * Run the I/O event loop synchronously in the current thread. This - * can be called instead of io_thread_start(). For testing purposes - * only. - */ -void -io_thread_run(void); - -/** - * Ask the I/O thread to quit, but does not wait for it. Usually, you - * don't need to call this function, because io_thread_deinit() - * includes this. - */ -void -io_thread_quit(void); - -void -io_thread_deinit(void); - -G_GNUC_PURE -GMainContext * -io_thread_context(void); - -/** - * Is the current thread the I/O thread? - */ -G_GNUC_PURE -bool -io_thread_inside(void); - -guint -io_thread_idle_add(GSourceFunc function, gpointer data); - -G_GNUC_MALLOC -GSource * -io_thread_timeout_add(guint interval_ms, GSourceFunc function, gpointer data); - -G_GNUC_MALLOC -GSource * -io_thread_timeout_add_seconds(guint interval, - GSourceFunc function, gpointer data); - -/** - * Call a function synchronously in the I/O thread. - */ -gpointer -io_thread_call(GThreadFunc function, gpointer data); - -#endif diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index b3d03a85..c95d4376 100644 --- a/test/dump_playlist.cxx +++ b/test/dump_playlist.cxx @@ -25,9 +25,9 @@ #include "conf.h" #include "decoder_api.h" #include "InputInit.hxx" +#include "IOThread.hxx" extern "C" { -#include "io_thread.h" #include "decoder_list.h" #include "playlist_list.h" #include "playlist_plugin.h" diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx index c0f1c86f..60da1c31 100644 --- a/test/dump_text_file.cxx +++ b/test/dump_text_file.cxx @@ -18,13 +18,13 @@ */ #include "config.h" +#include "IOThread.hxx" #include "InputInit.hxx" #include "input_stream.h" #include "conf.h" #include "stdbin.h" extern "C" { -#include "io_thread.h" #include "text_input_stream.h" #ifdef ENABLE_ARCHIVE diff --git a/test/read_tags.cxx b/test/read_tags.cxx index 9fabddc6..f971c5ce 100644 --- a/test/read_tags.cxx +++ b/test/read_tags.cxx @@ -18,8 +18,8 @@ */ #include "config.h" +#include "IOThread.hxx" extern "C" { -#include "io_thread.h" #include "decoder_list.h" } #include "decoder_api.h" diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx index 776c11e8..b3e90844 100644 --- a/test/run_decoder.cxx +++ b/test/run_decoder.cxx @@ -18,8 +18,8 @@ */ #include "config.h" +#include "IOThread.hxx" extern "C" { -#include "io_thread.h" #include "decoder_list.h" } #include "decoder_api.h" diff --git a/test/run_input.cxx b/test/run_input.cxx index adf380f0..1508d0d9 100644 --- a/test/run_input.cxx +++ b/test/run_input.cxx @@ -24,10 +24,9 @@ #include "conf.h" #include "input_stream.h" #include "InputInit.hxx" +#include "IOThread.hxx" extern "C" { -#include "io_thread.h" - #ifdef ENABLE_ARCHIVE #include "archive_list.h" #endif diff --git a/test/run_output.cxx b/test/run_output.cxx index 9964e47e..29fb6462 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -22,11 +22,11 @@ #include "conf.h" #include "Idle.hxx" #include "GlobalEvents.hxx" +#include "IOThread.hxx" extern "C" { #include "output_plugin.h" #include "output_internal.h" -#include "io_thread.h" #include "audio_parser.h" #include "filter_registry.h" #include "pcm_convert.h" -- cgit v1.2.3