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

db/update/Service: wrap UpdateWalk in std::unique_ptr<>

Browse Source
This commit is contained in:
Max Kellermann 2019-04-26 14:53:54 +02:00
parent afdaaba045
commit 2b4e9cc635
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,8 +56,6 @@ UpdateService::~UpdateService()
if (update_thread.IsDefined()) if (update_thread.IsDefined())
update_thread.Join(); update_thread.Join();
delete walk;
} }
void void
@ -151,7 +149,8 @@ UpdateService::StartThread(UpdateQueueItem &&i)
modified = false; modified = false;
next = std::move(i); next = std::move(i);
walk = new UpdateWalk(config, GetEventLoop(), listener, *next.storage); walk = std::make_unique<UpdateWalk>(config, GetEventLoop(), listener,
*next.storage);
update_thread.Start(); update_thread.Start();
@ -248,8 +247,7 @@ UpdateService::RunDeferred() noexcept
if (update_thread.IsDefined()) if (update_thread.IsDefined())
update_thread.Join(); update_thread.Join();
delete walk; walk.reset();
walk = nullptr;
next.Clear(); next.Clear();

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

@ -26,6 +26,8 @@
#include "thread/Thread.hxx" #include "thread/Thread.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <memory>
class SimpleDatabase; class SimpleDatabase;
class DatabaseListener; class DatabaseListener;
class UpdateWalk; class UpdateWalk;
@ -56,7 +58,7 @@ class UpdateService final {
UpdateQueueItem next; UpdateQueueItem next;
UpdateWalk *walk = nullptr; std::unique_ptr<UpdateWalk> walk;
public: public:
UpdateService(const ConfigData &_config, UpdateService(const ConfigData &_config,