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

db/simple: use class ScopeDatabaseLock

Browse Source
This commit is contained in:
Max Kellermann
2015-12-15 23:27:05 +01:00
parent 7dd3b72a8c
commit e31f0b8b0c
8 changed files with 100 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/db/update/Container.cxx
View File

@@ -78,16 +78,16 @@ UpdateWalk::UpdateContainerFile(Directory &directory,
return false;
const DecoderPlugin &plugin = *_plugin;
db_lock();
Directory *contdir = MakeDirectoryIfModified(directory, name, info);
if (contdir == nullptr) {
/* not modified */
db_unlock();
return true;
}
Directory *contdir;
{
const ScopeDatabaseLock protect;
contdir = MakeDirectoryIfModified(directory, name, info);
if (contdir == nullptr)
/* not modified */
return true;
contdir->device = DEVICE_CONTAINER;
db_unlock();
contdir->device = DEVICE_CONTAINER;
}
const auto pathname = storage.MapFS(contdir->GetPath());
if (pathname.IsNull()) {
@@ -116,9 +116,10 @@ UpdateWalk::UpdateContainerFile(Directory &directory,
tag_builder.Commit(song->tag);
db_lock();
contdir->AddSong(song);
db_unlock();
{
const ScopeDatabaseLock protect;
contdir->AddSong(song);
}
modified = true;