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

test/run_neighbor_explorer: allocate ConfigData on the stack

Browse Source
This commit is contained in:
Max Kellermann 2018-08-19 22:41:58 +02:00
parent 80839b5372
commit 4accc1f159
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/run_neighbor_explorer.cxx
View File

@ -18,7 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "config/Global.hxx" #include "config/File.hxx"
#include "config/Migrate.hxx"
#include "config/Data.hxx"
#include "neighbor/Listener.hxx" #include "neighbor/Listener.hxx"
#include "neighbor/Info.hxx" #include "neighbor/Info.hxx"
#include "neighbor/Glue.hxx" #include "neighbor/Glue.hxx"
@ -30,17 +32,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
class GlobalInit {
public:
GlobalInit() {
config_global_init();
}
~GlobalInit() {
config_global_finish();
}
};
class MyNeighborListener final : public NeighborListener { class MyNeighborListener final : public NeighborListener {
public: public:
/* virtual methods from class NeighborListener */ /* virtual methods from class NeighborListener */
@ -67,19 +58,20 @@ try {
/* initialize the core */ /* initialize the core */
const GlobalInit init; ConfigData config;
EventLoop loop; EventLoop loop;
const ShutdownHandler shutdown_handler(loop); const ShutdownHandler shutdown_handler(loop);
/* read configuration file (mpd.conf) */ /* read configuration file (mpd.conf) */
ReadConfigFile(config_path); ReadConfigFile(config, config_path);
Migrate(config);
/* initialize neighbor plugins */ /* initialize neighbor plugins */
MyNeighborListener listener; MyNeighborListener listener;
NeighborGlue neighbor; NeighborGlue neighbor;
neighbor.Init(GetGlobalConfig(), loop, listener); neighbor.Init(config, loop, listener);
neighbor.Open(); neighbor.Open();
/* dump initial list */ /* dump initial list */