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

test/DumpDatabase: start an EventThread

Browse Source 
Our local EventLoop instance was never run; it was not usable.
This commit is contained in:
Max Kellermann 2017-08-18 14:20:03 +02:00
parent 9033f07724
commit cd0e92878f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -1766,6 +1766,7 @@ test_DumpDatabase_LDADD = \
$(TAG_LIBS) \
libconf.a \
libevent.a \
libthread.a \
$(FS_LIBS) \
libsystem.a \
$(ICU_LDADD) \

13
test/DumpDatabase.cxx
View File

@ -31,7 +31,7 @@
#include "config/Block.hxx"
#include "tag/Config.hxx"
#include "fs/Path.hxx"
#include "event/Loop.hxx"
#include "event/Thread.hxx"
#include "Log.hxx"
#include "util/ScopeExit.hxx"
@ -44,14 +44,21 @@ using std::endl;
#include <stdlib.h>
class GlobalInit {
EventThread io_thread;
public:
GlobalInit() {
io_thread.Start();
config_global_init();
}
~GlobalInit() {
config_global_finish();
}
EventLoop &GetEventLoop() {
return io_thread.GetEventLoop();
}
};
#ifdef ENABLE_UPNP
@ -121,7 +128,6 @@ try {
TagLoadConfig();
EventLoop event_loop;
MyDatabaseListener database_listener;
/* do it */
@ -131,7 +137,8 @@ try {
if (path != nullptr)
block.AddBlockParam("path", path->value.c_str(), path->line);
Database *db = plugin->create(event_loop, database_listener, block);
Database *db = plugin->create(init.GetEventLoop(),
database_listener, block);
AtScopeExit(db) { delete db; };