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

db/simple: use class boost::intrusive::list

Browse Source 
Remove the C list_head library and use type-safe C++ instead.
This commit is contained in:
Max Kellermann
2014-06-10 21:15:40 +02:00
parent 52594e64d0
commit 3ca0a39a35
12 changed files with 151 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/db/plugins/simple/Directory.cxx
View File

@@ -33,10 +33,6 @@
#include "util/Alloc.hxx"
#include "util/Error.hxx"
extern "C" {
#include "util/list_sort.h"
}
#include <assert.h>
#include <string.h>
#include <stdlib.h>
@@ -47,21 +43,14 @@ Directory::Directory(std::string &&_path_utf8, Directory *_parent)
path(std::move(_path_utf8)),
mounted_database(nullptr)
{
INIT_LIST_HEAD(&children);
INIT_LIST_HEAD(&songs);
}
Directory::~Directory()
{
delete mounted_database;
Song *song, *ns;
directory_for_each_song_safe(song, ns, *this)
song->Free();
Directory *child, *n;
directory_for_each_child_safe(child, n, *this)
delete child;
songs.clear_and_dispose(Song::Disposer());
children.clear_and_dispose(Disposer());
}
void
@@ -70,8 +59,8 @@ Directory::Delete()
assert(holding_db_lock());
assert(parent != nullptr);
list_del(&siblings);
delete this;
parent->children.erase_and_dispose(parent->children.iterator_to(*this),
Disposer());
}
const char *
@@ -94,7 +83,7 @@ Directory::CreateChild(const char *name_utf8)
: PathTraitsUTF8::Build(GetPath(), name_utf8);
Directory *child = new Directory(std::move(path_utf8), this);
list_add_tail(&child->siblings, &children);
children.push_back(*child);
return child;
}
@@ -103,10 +92,9 @@ Directory::FindChild(const char *name) const
{
assert(holding_db_lock());
const Directory *child;
directory_for_each_child(child, *this)
if (strcmp(child->GetName(), name) == 0)
return child;
for (const auto &child : children)
if (strcmp(child.GetName(), name) == 0)
return &child;
return nullptr;
}
@@ -116,17 +104,14 @@ Directory::PruneEmpty()
{
assert(holding_db_lock());
Directory *child, *n;
directory_for_each_child_safe(child, n, *this) {
if (child->IsMount())
/* never prune mount points; they're always
empty by definition, but that's ok */
continue;
for (auto child = children.begin(), end = children.end();
child != end;) {
child->PruneEmpty();
if (child->IsEmpty())
child->Delete();
child = children.erase_and_dispose(child, Disposer());
else
++child;
}
}
@@ -182,7 +167,7 @@ Directory::AddSong(Song *song)
assert(song != nullptr);
assert(song->parent == this);
list_add_tail(&song->siblings, &songs);
songs.push_back(*song);
}
void
@@ -192,7 +177,7 @@ Directory::RemoveSong(Song *song)
assert(song != nullptr);
assert(song->parent == this);
list_del(&song->siblings);
songs.erase(songs.iterator_to(*song));
}
const Song *
@@ -201,25 +186,21 @@ Directory::FindSong(const char *name_utf8) const
assert(holding_db_lock());
assert(name_utf8 != nullptr);
Song *song;
directory_for_each_song(song, *this) {
assert(song->parent == this);
for (auto &song : songs) {
assert(song.parent == this);
if (strcmp(song->uri, name_utf8) == 0)
return song;
if (strcmp(song.uri, name_utf8) == 0)
return &song;
}
return nullptr;
}
static int
directory_cmp(gcc_unused void *priv,
struct list_head *_a, struct list_head *_b)
gcc_pure
static bool
directory_cmp(const Directory &a, const Directory &b)
{
const Directory *a = (const Directory *)_a;
const Directory *b = (const Directory *)_b;
return IcuCollate(a->path.c_str(), b->path.c_str());
return IcuCollate(a.path.c_str(), b.path.c_str()) < 0;
}
void
@@ -227,12 +208,11 @@ Directory::Sort()
{
assert(holding_db_lock());
list_sort(nullptr, &children, directory_cmp);
song_list_sort(&songs);
children.sort(directory_cmp);
song_list_sort(songs);
Directory *child;
directory_for_each_child(child, *this)
child->Sort();
for (auto &child : children)
child.Sort();
}
bool
@@ -260,9 +240,8 @@ Directory::Walk(bool recursive, const SongFilter *filter,
}
if (visit_song) {
Song *song;
directory_for_each_song(song, *this) {
const LightSong song2 = song->Export();
for (auto &song : songs){
const LightSong song2 = song.Export();
if ((filter == nullptr || filter->Match(song2)) &&
!visit_song(song2, error))
return false;
@@ -275,16 +254,15 @@ Directory::Walk(bool recursive, const SongFilter *filter,
return false;
}
Directory *child;
directory_for_each_child(child, *this) {
for (auto &child : children) {
if (visit_directory &&
!visit_directory(child->Export(), error))
!visit_directory(child.Export(), error))
return false;
if (recursive &&
!child->Walk(recursive, filter,
visit_directory, visit_song, visit_playlist,
error))
!child.Walk(recursive, filter,
visit_directory, visit_song, visit_playlist,
error))
return false;
}

60
src/db/plugins/simple/Directory.hxx
View File

@@ -21,10 +21,12 @@
#define MPD_DIRECTORY_HXX
#include "check.h"
#include "util/list.h"
#include "Compiler.h"
#include "db/Visitor.hxx"
#include "db/PlaylistVector.hxx"
#include "Song.hxx"
#include <boost/intrusive/list.hpp>
#include <string>
@@ -41,25 +43,22 @@ static constexpr unsigned DEVICE_INARCHIVE = -1;
*/
static constexpr unsigned DEVICE_CONTAINER = -2;
#define directory_for_each_child(pos, directory) \
list_for_each_entry(pos, &(directory).children, siblings)
#define directory_for_each_child_safe(pos, n, directory) \
list_for_each_entry_safe(pos, n, &(directory).children, siblings)
#define directory_for_each_song(pos, directory) \
list_for_each_entry(pos, &(directory).songs, siblings)
#define directory_for_each_song_safe(pos, n, directory) \
list_for_each_entry_safe(pos, n, &(directory).songs, siblings)
struct Song;
struct db_visitor;
class SongFilter;
class Error;
class Database;
struct Directory {
static constexpr auto link_mode = boost::intrusive::normal_link;
typedef boost::intrusive::link_mode<link_mode> LinkMode;
typedef boost::intrusive::list_member_hook<LinkMode> Hook;
struct Disposer {
void operator()(Directory *directory) const {
delete directory;
}
};
/**
* Pointers to the siblings of this directory within the
* parent directory. It is unused (undefined) in the root
@@ -68,7 +67,12 @@ struct Directory {
* This attribute is protected with the global #db_mutex.
* Read access in the update thread does not need protection.
*/
struct list_head siblings;
Hook siblings;
typedef boost::intrusive::member_hook<Directory, Hook,
&Directory::siblings> SiblingsHook;
typedef boost::intrusive::list<Directory, SiblingsHook,
boost::intrusive::constant_time_size<false>> List;
/**
* A doubly linked list of child directories.
@@ -76,7 +80,7 @@ struct Directory {
* This attribute is protected with the global #db_mutex.
* Read access in the update thread does not need protection.
*/
struct list_head children;
List children;
/**
* A doubly linked list of songs within this directory.
@@ -84,7 +88,7 @@ struct Directory {
* This attribute is protected with the global #db_mutex.
* Read access in the update thread does not need protection.
*/
struct list_head songs;
SongList songs;
PlaylistVector playlists;
@@ -186,8 +190,8 @@ public:
gcc_pure
bool IsEmpty() const {
return list_empty(&children) &&
list_empty(&songs) &&
return children.empty() &&
songs.empty() &&
playlists.empty();
}
@@ -210,6 +214,24 @@ public:
return parent == nullptr;
}
template<typename T>
void ForEachChildSafe(T &&t) {
const auto end = children.end();
for (auto i = children.begin(), next = i; i != end; i = next) {
next = std::next(i);
t(*i);
}
}
template<typename T>
void ForEachSongSafe(T &&t) {
const auto end = songs.end();
for (auto i = songs.begin(), next = i; i != end; i = next) {
next = std::next(i);
t(*i);
}
}
/**
* Look up a song in this directory by its name.
*

14
src/db/plugins/simple/DirectorySave.cxx
View File

@@ -84,20 +84,18 @@ directory_save(FILE *fp, const Directory &directory)
fprintf(fp, "%s%s\n", DIRECTORY_BEGIN, directory.GetPath());
}
Directory *cur;
directory_for_each_child(cur, directory) {
fprintf(fp, DIRECTORY_DIR "%s\n", cur->GetName());
for (const auto &child : directory.children) {
fprintf(fp, DIRECTORY_DIR "%s\n", child.GetName());
if (!cur->IsMount())
directory_save(fp, *cur);
if (!child.IsMount())
directory_save(fp, child);
if (ferror(fp))
return;
}
Song *song;
directory_for_each_song(song, directory)
song_save(fp, *song);
for (const auto &song : directory.songs)
song_save(fp, song);
playlist_vector_save(fp, directory.playlists);

20
src/db/plugins/simple/Song.hxx
View File

@@ -20,10 +20,11 @@
#ifndef MPD_SONG_HXX
#define MPD_SONG_HXX
#include "util/list.h"
#include "tag/Tag.hxx"
#include "Compiler.h"
#include <boost/intrusive/list.hpp>
#include <string>
#include <assert.h>
@@ -39,6 +40,16 @@ class Storage;
* #SimpleDatabase class.
*/
struct Song {
static constexpr auto link_mode = boost::intrusive::normal_link;
typedef boost::intrusive::link_mode<link_mode> LinkMode;
typedef boost::intrusive::list_member_hook<LinkMode> Hook;
struct Disposer {
void operator()(Song *song) const {
song->Free();
}
};
/**
* Pointers to the siblings of this directory within the
* parent directory. It is unused (undefined) if this song is
@@ -47,7 +58,7 @@ struct Song {
* This attribute is protected with the global #db_mutex.
* Read access in the update thread does not need protection.
*/
struct list_head siblings;
Hook siblings;
Tag tag;
@@ -110,4 +121,9 @@ struct Song {
LightSong Export() const;
};
typedef boost::intrusive::list<Song,
boost::intrusive::member_hook<Song, Song::Hook,
&Song::siblings>,
boost::intrusive::constant_time_size<false>> SongList;
#endif

29
src/db/plugins/simple/SongSort.cxx
View File

@@ -23,10 +23,6 @@
#include "tag/Tag.hxx"
#include "lib/icu/Collate.hxx"
extern "C" {
#include "util/list_sort.h"
}
#include <stdlib.h>
static int
@@ -80,34 +76,33 @@ compare_tag_item(const Tag &a, const Tag &b, TagType type)
}
/* Only used for sorting/searchin a songvec, not general purpose compares */
static int
song_cmp(gcc_unused void *priv, struct list_head *_a, struct list_head *_b)
gcc_pure
static bool
song_cmp(const Song &a, const Song &b)
{
const Song *a = (const Song *)_a;
const Song *b = (const Song *)_b;
int ret;
/* first sort by album */
ret = compare_string_tag_item(a->tag, b->tag, TAG_ALBUM);
ret = compare_string_tag_item(a.tag, b.tag, TAG_ALBUM);
if (ret != 0)
return ret;
return ret < 0;
/* then sort by disc */
ret = compare_tag_item(a->tag, b->tag, TAG_DISC);
ret = compare_tag_item(a.tag, b.tag, TAG_DISC);
if (ret != 0)
return ret;
return ret < 0;
/* then by track number */
ret = compare_tag_item(a->tag, b->tag, TAG_TRACK);
ret = compare_tag_item(a.tag, b.tag, TAG_TRACK);
if (ret != 0)
return ret;
return ret < 0;
/* still no difference? compare file name */
return IcuCollate(a->uri, b->uri);
return IcuCollate(a.uri, b.uri) < 0;
}
void
song_list_sort(struct list_head *songs)
song_list_sort(SongList &songs)
{
list_sort(nullptr, songs, song_cmp);
songs.sort(song_cmp);
}

4
src/db/plugins/simple/SongSort.hxx
View File

@@ -20,9 +20,11 @@
#ifndef MPD_SONG_SORT_HXX
#define MPD_SONG_SORT_HXX
#include "Song.hxx"
struct list_head;
void
song_list_sort(list_head *songs);
song_list_sort(SongList &songs);
#endif

15
src/db/update/Editor.cxx
View File

@@ -64,15 +64,14 @@ DatabaseEditor::LockDeleteSong(Directory &parent, Song *song)
inline void
DatabaseEditor::ClearDirectory(Directory &directory)
{
Directory *child, *n;
directory_for_each_child_safe(child, n, directory)
DeleteDirectory(child);
directory.ForEachChildSafe([this](Directory &child){
DeleteDirectory(&child);
});
Song *song, *ns;
directory_for_each_song_safe(song, ns, directory) {
assert(song->parent == &directory);
DeleteSong(directory, song);
}
directory.ForEachSongSafe([this, &directory](Song &song){
assert(song.parent == &directory);
DeleteSong(directory, &song);
});
}
void

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

@@ -80,26 +80,25 @@ UpdateWalk::RemoveExcludedFromDirectory(Directory &directory,
{
db_lock();
Directory *child, *n;
directory_for_each_child_safe(child, n, directory) {
const auto name_fs = AllocatedPath::FromUTF8(child->GetName());
directory.ForEachChildSafe([&](Directory &child){
const auto name_fs =
AllocatedPath::FromUTF8(child.GetName());
if (name_fs.IsNull() || exclude_list.Check(name_fs)) {
editor.DeleteDirectory(child);
modified = true;
}
}
if (name_fs.IsNull() || exclude_list.Check(name_fs)) {
editor.DeleteDirectory(&child);
modified = true;
}
});
Song *song, *ns;
directory_for_each_song_safe(song, ns, directory) {
assert(song->parent == &directory);
directory.ForEachSongSafe([&](Song &song){
assert(song.parent == &directory);
const auto name_fs = AllocatedPath::FromUTF8(song->uri);
if (name_fs.IsNull() || exclude_list.Check(name_fs)) {
editor.DeleteSong(directory, song);
modified = true;
}
}
const auto name_fs = AllocatedPath::FromUTF8(song.uri);
if (name_fs.IsNull() || exclude_list.Check(name_fs)) {
editor.DeleteSong(directory, &song);
modified = true;
}
});
db_unlock();
}
@@ -107,25 +106,23 @@ UpdateWalk::RemoveExcludedFromDirectory(Directory &directory,
inline void
UpdateWalk::PurgeDeletedFromDirectory(Directory &directory)
{
Directory *child, *n;
directory_for_each_child_safe(child, n, directory) {
if (DirectoryExists(storage, *child))
continue;
directory.ForEachChildSafe([&](Directory &child){
if (DirectoryExists(storage, child))
return;
editor.LockDeleteDirectory(child);
modified = true;
}
Song *song, *ns;
directory_for_each_song_safe(song, ns, directory) {
if (!directory_child_is_regular(storage, directory,
song->uri)) {
editor.LockDeleteSong(directory, song);
editor.LockDeleteDirectory(&child);
modified = true;
}
}
});
directory.ForEachSongSafe([&](Song &song){
if (!directory_child_is_regular(storage, directory,
song.uri)) {
editor.LockDeleteSong(directory, &song);
modified = true;
}
});
for (auto i = directory.playlists.begin(),
end = directory.playlists.end();