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

8
src/db/plugins/simple/DatabaseSave.cxx
View File

@@ -72,7 +72,6 @@ db_load_internal(TextFile &file, Directory &music_root, Error &error)
char *line;
unsigned format = 0;
bool found_charset = false, found_version = false;
bool success;
bool tags[TAG_NUM_OF_ITEM_TYPES];
/* get initial info */
@@ -152,9 +151,6 @@ db_load_internal(TextFile &file, Directory &music_root, Error &error)
LogDebug(db_domain, "reading DB");
db_lock();
success = directory_load(file, music_root, error);
db_unlock();
return success;
const ScopeDatabaseLock protect;
return directory_load(file, music_root, error);
}

22
src/db/plugins/simple/SimpleDatabasePlugin.cxx
View File

@@ -240,13 +240,13 @@ SimpleDatabase::GetSong(const char *uri, Error &error) const
assert(prefixed_light_song == nullptr);
assert(borrowed_song_count == 0);
db_lock();
ScopeDatabaseLock protect;
auto r = root->LookupDirectory(uri);
if (r.directory->IsMount()) {
/* pass the request to the mounted database */
db_unlock();
protect.unlock();
const LightSong *song =
r.directory->mounted_database->GetSong(r.uri, error);
@@ -260,7 +260,6 @@ SimpleDatabase::GetSong(const char *uri, Error &error) const
if (r.uri == nullptr) {
/* it's a directory */
db_unlock();
error.Format(db_domain, DB_NOT_FOUND,
"No such song: %s", uri);
return nullptr;
@@ -268,14 +267,13 @@ SimpleDatabase::GetSong(const char *uri, Error &error) const
if (strchr(r.uri, '/') != nullptr) {
/* refers to a URI "below" the actual song */
db_unlock();
error.Format(db_domain, DB_NOT_FOUND,
"No such song: %s", uri);
return nullptr;
}
const Song *song = r.directory->FindSong(r.uri);
db_unlock();
protect.unlock();
if (song == nullptr) {
error.Format(db_domain, DB_NOT_FOUND,
"No such song: %s", uri);
@@ -367,15 +365,15 @@ SimpleDatabase::GetStats(const DatabaseSelection &selection,
bool
SimpleDatabase::Save(Error &error)
{
db_lock();
{
const ScopeDatabaseLock protect;
LogDebug(simple_db_domain, "removing empty directories from DB");
root->PruneEmpty();
LogDebug(simple_db_domain, "removing empty directories from DB");
root->PruneEmpty();
LogDebug(simple_db_domain, "sorting DB");
root->Sort();
db_unlock();
LogDebug(simple_db_domain, "sorting DB");
root->Sort();
}
LogDebug(simple_db_domain, "writing DB");