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

test/run_input, ...: add struct ScopeIOThread

Browse Source 
Auto-stop the IO thread in all error handlers.
This commit is contained in:
Max Kellermann
2014-10-07 20:02:13 +02:00
parent e5ff85b63c
commit 1aac0b10c9
9 changed files with 57 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/ScopeIOThread.hxx Normal file
View File

@@ -0,0 +1,36 @@
/*
* Copyright (C) 2003-2014 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_SCOPE_IO_THREAD_HXX
#define MPD_SCOPE_IO_THREAD_HXX
#include "IOThread.hxx"
struct ScopeIOThread {
ScopeIOThread() {
io_thread_init();
io_thread_start();
}
~ScopeIOThread() {
io_thread_deinit();
}
};
#endif

6
test/dump_playlist.cxx
View File

@@ -25,7 +25,7 @@
#include "config/ConfigGlobal.hxx"
#include "decoder/DecoderList.hxx"
#include "input/Init.hxx"
#include "IOThread.hxx"
#include "ScopeIOThread.hxx"
#include "playlist/PlaylistRegistry.hxx"
#include "playlist/PlaylistPlugin.hxx"
#include "fs/Path.hxx"
@@ -82,8 +82,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
io_thread_init();
io_thread_start();
const ScopeIOThread io_thread;
if (!input_stream_global_init(error)) {
LogError(error);
@@ -155,7 +154,6 @@ int main(int argc, char **argv)
decoder_plugin_deinit_all();
playlist_list_global_finish();
input_stream_global_finish();
io_thread_deinit();
config_global_finish();
return 0;

7
test/dump_text_file.cxx
View File

@@ -18,7 +18,7 @@
*/
#include "config.h"
#include "IOThread.hxx"
#include "ScopeIOThread.hxx"
#include "input/Init.hxx"
#include "input/InputStream.hxx"
#include "input/TextInputStream.hxx"
@@ -91,8 +91,7 @@ int main(int argc, char **argv)
config_global_init();
io_thread_init();
io_thread_start();
const ScopeIOThread io_thread;
#ifdef ENABLE_ARCHIVE
archive_plugin_init_all();
@@ -129,8 +128,6 @@ int main(int argc, char **argv)
archive_plugin_deinit_all();
#endif
io_thread_deinit();
config_global_finish();
return ret;

6
test/read_tags.cxx
View File

@@ -18,7 +18,7 @@
*/
#include "config.h"
#include "IOThread.hxx"
#include "ScopeIOThread.hxx"
#include "decoder/DecoderList.hxx"
#include "decoder/DecoderPlugin.hxx"
#include "input/Init.hxx"
@@ -96,8 +96,7 @@ int main(int argc, char **argv)
#endif
#endif
io_thread_init();
io_thread_start();
const ScopeIOThread io_thread;
Error error;
if (!input_stream_global_init(error)) {
@@ -132,7 +131,6 @@ int main(int argc, char **argv)
decoder_plugin_deinit_all();
input_stream_global_finish();
io_thread_deinit();
if (!success) {
fprintf(stderr, "Failed to read tags\n");

6
test/run_decoder.cxx
View File

@@ -18,7 +18,7 @@
*/
#include "config.h"
#include "IOThread.hxx"
#include "ScopeIOThread.hxx"
#include "decoder/DecoderList.hxx"
#include "decoder/DecoderPlugin.hxx"
#include "FakeDecoderAPI.hxx"
@@ -56,8 +56,7 @@ int main(int argc, char **argv)
#endif
#endif
io_thread_init();
io_thread_start();
const ScopeIOThread io_thread;
Error error;
if (!input_stream_global_init(error)) {
@@ -98,7 +97,6 @@ int main(int argc, char **argv)
decoder_plugin_deinit_all();
input_stream_global_finish();
io_thread_deinit();
if (!decoder.initialized) {
fprintf(stderr, "Decoding failed\n");

7
test/run_input.cxx
View File

@@ -24,7 +24,7 @@
#include "config/ConfigGlobal.hxx"
#include "input/InputStream.hxx"
#include "input/Init.hxx"
#include "IOThread.hxx"
#include "ScopeIOThread.hxx"
#include "util/Error.hxx"
#include "thread/Cond.hxx"
#include "Log.hxx"
@@ -123,8 +123,7 @@ int main(int argc, char **argv)
config_global_init();
io_thread_init();
io_thread_start();
const ScopeIOThread io_thread;
#ifdef ENABLE_ARCHIVE
archive_plugin_init_all();
@@ -160,8 +159,6 @@ int main(int argc, char **argv)
archive_plugin_deinit_all();
#endif
io_thread_deinit();
config_global_finish();
return ret;

7
test/run_output.cxx
View File

@@ -26,7 +26,7 @@
#include "Idle.hxx"
#include "Main.hxx"
#include "event/Loop.hxx"
#include "IOThread.hxx"
#include "ScopeIOThread.hxx"
#include "fs/Path.hxx"
#include "AudioParser.hxx"
#include "pcm/PcmConvert.hxx"
@@ -179,8 +179,7 @@ int main(int argc, char **argv)
EventLoop event_loop;
io_thread_init();
io_thread_start();
const ScopeIOThread io_thread;
/* initialize the audio output */
@@ -205,8 +204,6 @@ int main(int argc, char **argv)
audio_output_free(ao);
io_thread_deinit();
config_global_finish();
return success ? EXIT_SUCCESS : EXIT_FAILURE;

7
test/visit_archive.cxx
View File

@@ -21,7 +21,7 @@
#include "stdbin.h"
#include "tag/Tag.hxx"
#include "config/ConfigGlobal.hxx"
#include "IOThread.hxx"
#include "ScopeIOThread.hxx"
#include "input/Init.hxx"
#include "archive/ArchiveList.hxx"
#include "archive/ArchivePlugin.hxx"
@@ -65,8 +65,7 @@ main(int argc, char **argv)
config_global_init();
io_thread_init();
io_thread_start();
const ScopeIOThread io_thread;
archive_plugin_init_all();
@@ -101,8 +100,6 @@ main(int argc, char **argv)
archive_plugin_deinit_all();
io_thread_deinit();
config_global_finish();
return result;