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

db/update/Walk: move UpdateConfig initialization to class UpdateService

Browse Source
This commit is contained in:
Max Kellermann
2018-07-17 22:39:52 +02:00
parent c3aa53cc97
commit 338a6f2a96
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/update/Service.cxx
View File

@@ -151,7 +151,7 @@ UpdateService::StartThread(UpdateQueueItem &&i)
modified = false; modified = false;
next = std::move(i); next = std::move(i);
walk = new UpdateWalk(GetEventLoop(), listener, *next.storage); walk = new UpdateWalk(config, GetEventLoop(), listener, *next.storage);
update_thread.Start(); update_thread.Start();

3
src/db/update/Service.hxx
View File

@@ -21,6 +21,7 @@
#define MPD_UPDATE_SERVICE_HXX #define MPD_UPDATE_SERVICE_HXX
#include "check.h" #include "check.h"
#include "Config.hxx"
#include "Queue.hxx" #include "Queue.hxx"
#include "event/DeferEvent.hxx" #include "event/DeferEvent.hxx"
#include "thread/Thread.hxx" #include "thread/Thread.hxx"
@@ -35,6 +36,8 @@ class CompositeStorage;
* This class manages the update queue and runs the update thread. * This class manages the update queue and runs the update thread.
*/ */
class UpdateService final { class UpdateService final {
const UpdateConfig config;
DeferEvent defer; DeferEvent defer;
SimpleDatabase &db; SimpleDatabase &db;

5
src/db/update/Walk.cxx
View File

@@ -49,9 +49,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
UpdateWalk::UpdateWalk(EventLoop &_loop, DatabaseListener &_listener, UpdateWalk::UpdateWalk(const UpdateConfig &_config,
EventLoop &_loop, DatabaseListener &_listener,
Storage &_storage) noexcept Storage &_storage) noexcept
:cancel(false), :config(_config), cancel(false),
storage(_storage), storage(_storage),
editor(_loop, _listener) editor(_loop, _listener)
{ {

3
src/db/update/Walk.hxx
View File

@@ -56,7 +56,8 @@ class UpdateWalk final {
DatabaseEditor editor; DatabaseEditor editor;
public: public:
UpdateWalk(EventLoop &_loop, DatabaseListener &_listener, UpdateWalk(const UpdateConfig &_config,
EventLoop &_loop, DatabaseListener &_listener,
Storage &_storage) noexcept; Storage &_storage) noexcept;
/** /**