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

archive/List: add RAII class

Browse Source
This commit is contained in:
Max Kellermann
2019-02-05 21:40:07 +01:00
parent c0e9246a66
commit c9ba4f3f9c
5 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Main.cxx
View File

@@ -529,7 +529,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
initPermissions(raw_config); initPermissions(raw_config);
spl_global_init(raw_config); spl_global_init(raw_config);
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
archive_plugin_init_all(); const ScopeArchivePluginsInit archive_plugins_init;
#endif #endif
pcm_convert_global_init(raw_config); pcm_convert_global_init(raw_config);
@@ -671,9 +671,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
instance->FinishShutdownPartitions(); instance->FinishShutdownPartitions();
command_finish(); command_finish();
decoder_plugin_deinit_all(); decoder_plugin_deinit_all();
#ifdef ENABLE_ARCHIVE
archive_plugin_deinit_all();
#endif
instance->rtio_thread.Stop(); instance->rtio_thread.Stop();
instance->io_thread.Stop(); instance->io_thread.Stop();

11
src/archive/ArchiveList.hxx
View File

@@ -46,4 +46,15 @@ archive_plugin_init_all();
void void
archive_plugin_deinit_all() noexcept; archive_plugin_deinit_all() noexcept;
class ScopeArchivePluginsInit {
public:
ScopeArchivePluginsInit() {
archive_plugin_init_all();
}
~ScopeArchivePluginsInit() noexcept {
archive_plugin_deinit_all();
}
};
#endif #endif

10
test/dump_text_file.cxx
View File

@@ -38,21 +38,19 @@
class GlobalInit { class GlobalInit {
EventThread io_thread; EventThread io_thread;
#ifdef ENABLE_ARCHIVE
const ScopeArchivePluginsInit archive_plugins_init;
#endif
public: public:
GlobalInit() { GlobalInit() {
io_thread.Start(); io_thread.Start();
#ifdef ENABLE_ARCHIVE
archive_plugin_init_all();
#endif
input_stream_global_init(ConfigData(), input_stream_global_init(ConfigData(),
io_thread.GetEventLoop()); io_thread.GetEventLoop());
} }
~GlobalInit() { ~GlobalInit() {
input_stream_global_finish(); input_stream_global_finish();
#ifdef ENABLE_ARCHIVE
archive_plugin_deinit_all();
#endif
} }
}; };

10
test/run_input.cxx
View File

@@ -106,6 +106,10 @@ class GlobalInit {
ConfigData config; ConfigData config;
EventThread io_thread; EventThread io_thread;
#ifdef ENABLE_ARCHIVE
const ScopeArchivePluginsInit archive_plugins_init;
#endif
public: public:
GlobalInit(Path config_path, bool verbose) { GlobalInit(Path config_path, bool verbose) {
SetLogThreshold(verbose ? LogLevel::DEBUG : LogLevel::INFO); SetLogThreshold(verbose ? LogLevel::DEBUG : LogLevel::INFO);
@@ -117,18 +121,12 @@ public:
io_thread.Start(); io_thread.Start();
#ifdef ENABLE_ARCHIVE
archive_plugin_init_all();
#endif
input_stream_global_init(config, input_stream_global_init(config,
io_thread.GetEventLoop()); io_thread.GetEventLoop());
} }
~GlobalInit() { ~GlobalInit() {
input_stream_global_finish(); input_stream_global_finish();
#ifdef ENABLE_ARCHIVE
archive_plugin_deinit_all();
#endif
} }
}; };

10
test/visit_archive.cxx
View File

@@ -38,21 +38,19 @@
class GlobalInit { class GlobalInit {
EventThread io_thread; EventThread io_thread;
#ifdef ENABLE_ARCHIVE
const ScopeArchivePluginsInit archive_plugins_init;
#endif
public: public:
GlobalInit() { GlobalInit() {
io_thread.Start(); io_thread.Start();
#ifdef ENABLE_ARCHIVE
archive_plugin_init_all();
#endif
input_stream_global_init(ConfigData(), input_stream_global_init(ConfigData(),
io_thread.GetEventLoop()); io_thread.GetEventLoop());
} }
~GlobalInit() { ~GlobalInit() {
input_stream_global_finish(); input_stream_global_finish();
#ifdef ENABLE_ARCHIVE
archive_plugin_deinit_all();
#endif
} }
}; };