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

io_thread: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-10 10:33:20 +01:00
parent 33ba288622
commit e0a97a030f
12 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -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 \

44
src/io_thread.c → src/IOThread.cxx
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* 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
@ -17,13 +17,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "io_thread.h"
#include "IOThread.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include <assert.h>
static struct {
GMutex *mutex;
GCond *cond;
Mutex mutex;
Cond cond;
GMainContext *context;
GMainLoop *loop;
@ -45,8 +47,8 @@ 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.mutex.lock();
io.mutex.unlock();
io_thread_run();
return NULL;
@ -59,8 +61,6 @@ io_thread_init(void)
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);
}
@ -72,9 +72,9 @@ io_thread_start(GError **error_r)
assert(io.loop != NULL);
assert(io.thread == NULL);
g_mutex_lock(io.mutex);
io.mutex.lock();
io.thread = g_thread_create(io_thread_func, NULL, true, error_r);
g_mutex_unlock(io.mutex);
io.mutex.unlock();
if (io.thread == NULL)
return false;
@ -103,9 +103,6 @@ io_thread_deinit(void)
if (io.context != NULL)
g_main_context_unref(io.context);
g_cond_free(io.cond);
g_mutex_free(io.mutex);
}
GMainContext *
@ -159,15 +156,15 @@ struct call_data {
static gboolean
io_thread_call_func(gpointer _data)
{
struct call_data *data = _data;
struct call_data *data = (struct call_data *)_data;
gpointer result = data->function(data->data);
g_mutex_lock(io.mutex);
io.mutex.lock();
data->done = true;
data->result = result;
g_cond_broadcast(io.cond);
g_mutex_unlock(io.mutex);
io.cond.broadcast();
io.mutex.unlock();
return false;
}
@ -183,17 +180,18 @@ io_thread_call(GThreadFunc function, gpointer _data)
return function(_data);
struct call_data data = {
.function = function,
.data = _data,
.done = false,
function,
_data,
false,
nullptr,
};
io_thread_idle_add(io_thread_call_func, &data);
g_mutex_lock(io.mutex);
io.mutex.lock();
while (!data.done)
g_cond_wait(io.cond, io.mutex);
g_mutex_unlock(io.mutex);
io.cond.wait(io.mutex);
io.mutex.unlock();
return data.result;
}

7
src/io_thread.h → src/IOThread.hxx
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* 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
@ -17,11 +17,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_IO_THREAD_H
#define MPD_IO_THREAD_H
#ifndef MPD_IO_THREAD_HXX
#define MPD_IO_THREAD_HXX
#include <glib.h>
#include <stdbool.h>
void
io_thread_init(void);

2
src/Main.cxx
View File

@ -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"

2
src/input/CurlInputPlugin.cxx
View File

@ -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 <assert.h>

2
src/input/SoupInputPlugin.cxx
View File

@ -23,9 +23,9 @@
extern "C" {
#include "input_internal.h"
#include "io_thread.h"
}
#include "IOThread.hxx"
#include "conf.h"
extern "C" {

2
test/dump_playlist.cxx
View File

@ -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"

2
test/dump_text_file.cxx
View File

@ -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

2
test/read_tags.cxx
View File

@ -18,8 +18,8 @@
*/
#include "config.h"
#include "IOThread.hxx"
extern "C" {
#include "io_thread.h"
#include "decoder_list.h"
}
#include "decoder_api.h"

2
test/run_decoder.cxx
View File

@ -18,8 +18,8 @@
*/
#include "config.h"
#include "IOThread.hxx"
extern "C" {
#include "io_thread.h"
#include "decoder_list.h"
}
#include "decoder_api.h"

3
test/run_input.cxx
View File

@ -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

2
test/run_output.cxx
View File

@ -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"