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

playlist_vector: require database lock for all functions

Browse Source
This commit is contained in:
Max Kellermann 2012-02-13 19:25:03 +01:00
parent dd26fa67f2
commit 5ee3a9a9ca
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/playlist_vector.c
View File

@ -19,6 +19,7 @@
#include "config.h"
#include "playlist_vector.h"
#include "db_lock.h"
#include <assert.h>
#include <string.h>
@ -58,6 +59,7 @@ playlist_vector_deinit(struct list_head *pv)
struct playlist_metadata *
playlist_vector_find(struct list_head *pv, const char *name)
{
assert(holding_db_lock());
assert(pv != NULL);
assert(name != NULL);
@ -73,6 +75,8 @@ void
playlist_vector_add(struct list_head *pv,
const char *name, time_t mtime)
{
assert(holding_db_lock());
struct playlist_metadata *pm = playlist_metadata_new(name, mtime);
list_add_tail(&pm->siblings, pv);
}
@ -81,6 +85,8 @@ bool
playlist_vector_update_or_add(struct list_head *pv,
const char *name, time_t mtime)
{
assert(holding_db_lock());
struct playlist_metadata *pm = playlist_vector_find(pv, name);
if (pm != NULL) {
if (mtime == pm->mtime)
@ -96,6 +102,8 @@ playlist_vector_update_or_add(struct list_head *pv,
bool
playlist_vector_remove(struct list_head *pv, const char *name)
{
assert(holding_db_lock());
struct playlist_metadata *pm = playlist_vector_find(pv, name);
if (pm == NULL)
return false;

11
src/playlist_vector.h
View File

@ -49,20 +49,31 @@ struct playlist_metadata {
void
playlist_vector_deinit(struct list_head *pv);
/**
* Caller must lock the #db_mutex.
*/
struct playlist_metadata *
playlist_vector_find(struct list_head *pv, const char *name);
/**
* Caller must lock the #db_mutex.
*/
void
playlist_vector_add(struct list_head *pv,
const char *name, time_t mtime);
/**
* Caller must lock the #db_mutex.
*
* @return true if the vector or one of its items was modified
*/
bool
playlist_vector_update_or_add(struct list_head *pv,
const char *name, time_t mtime);
/**
* Caller must lock the #db_mutex.
*/
bool
playlist_vector_remove(struct list_head *pv, const char *name);

4
src/update_db.c
View File

@ -96,9 +96,9 @@ delete_name_in(struct directory *parent, const char *name)
modified = true;
}
db_unlock();
playlist_vector_remove(&parent->playlists, name);
db_unlock();
return modified;
}

7
src/update_walk.c
View File

@ -162,8 +162,11 @@ removeDeletedFromDirectory(struct directory *directory)
struct playlist_metadata *pm, *np;
directory_for_each_playlist_safe(pm, np, directory) {
if (!directory_child_is_regular(directory, pm->name))
if (!directory_child_is_regular(directory, pm->name)) {
db_lock();
playlist_vector_remove(&directory->playlists, pm->name);
db_unlock();
}
}
}
@ -467,9 +470,11 @@ update_regular_file(struct directory *directory,
#endif
} else if (playlist_suffix_supported(suffix)) {
db_lock();
if (playlist_vector_update_or_add(&directory->playlists, name,
st->st_mtime))
modified = true;
db_unlock();
}
}