aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-10-21 01:34:36 +0200
committerMax Kellermann <max@duempel.org>2008-10-21 01:34:36 +0200
commit9aeacdef5631d5bab67e055a3aa56ba1390c2ea0 (patch)
treea9db489d36eee14394cb8d04b1b87864d3b70dfa
parent686a6df3a564400bc2f0d339e548e2a76677b1f5 (diff)
downloadmpd-9aeacdef5631d5bab67e055a3aa56ba1390c2ea0.tar.gz
mpd-9aeacdef5631d5bab67e055a3aa56ba1390c2ea0.tar.xz
mpd-9aeacdef5631d5bab67e055a3aa56ba1390c2ea0.zip
dirvec: introduce locking for all iterators
Like the songvec nr_lock, only one lock is used for all traversals since they're rarely changed. This only projects traversals, but not the individual structures themselves.
-rw-r--r--src/dirvec.c31
1 files changed, 25 insertions, 6 deletions
diff --git a/src/dirvec.c b/src/dirvec.c
index 8f8bcd0c8..22ff8d4c2 100644
--- a/src/dirvec.c
+++ b/src/dirvec.c
@@ -6,6 +6,8 @@
#include <string.h>
#include <glib.h>
+static pthread_mutex_t nr_lock = PTHREAD_MUTEX_INITIALIZER;
+
static size_t dv_size(const struct dirvec *dv)
{
return dv->nr * sizeof(struct directory *);
@@ -21,62 +23,75 @@ static int dirvec_cmp(const void *d1, const void *d2)
void dirvec_sort(struct dirvec *dv)
{
+ pthread_mutex_lock(&nr_lock);
qsort(dv->base, dv->nr, sizeof(struct directory *), dirvec_cmp);
+ pthread_mutex_unlock(&nr_lock);
}
struct directory *dirvec_find(const struct dirvec *dv, const char *path)
{
char *basename;
int i;
+ struct directory *ret = NULL;
basename = g_path_get_basename(path);
+ pthread_mutex_lock(&nr_lock);
for (i = dv->nr; --i >= 0; )
if (!strcmp(directory_get_name(dv->base[i]), basename)) {
- g_free(basename);
- return dv->base[i];
+ ret = dv->base[i];
+ break;
}
+ pthread_mutex_unlock(&nr_lock);
g_free(basename);
- return NULL;
+ return ret;
}
int dirvec_delete(struct dirvec *dv, struct directory *del)
{
size_t i;
+ pthread_mutex_lock(&nr_lock);
for (i = 0; i < dv->nr; ++i) {
if (dv->base[i] != del)
continue;
/* we _don't_ call directory_free() here */
if (!--dv->nr) {
+ pthread_mutex_unlock(&nr_lock);
free(dv->base);
dv->base = NULL;
+ return i;
} else {
memmove(&dv->base[i], &dv->base[i + 1],
(dv->nr - i) * sizeof(struct directory *));
dv->base = xrealloc(dv->base, dv_size(dv));
}
- return i;
+ break;
}
+ pthread_mutex_unlock(&nr_lock);
- return -1; /* not found */
+ return i;
}
void dirvec_add(struct dirvec *dv, struct directory *add)
{
+ pthread_mutex_lock(&nr_lock);
++dv->nr;
dv->base = xrealloc(dv->base, dv_size(dv));
dv->base[dv->nr - 1] = add;
+ pthread_mutex_unlock(&nr_lock);
}
void dirvec_destroy(struct dirvec *dv)
{
+ pthread_mutex_lock(&nr_lock);
+ dv->nr = 0;
+ pthread_mutex_unlock(&nr_lock);
if (dv->base) {
free(dv->base);
dv->base = NULL;
}
- dv->nr = 0;
}
int dirvec_for_each(const struct dirvec *dv,
@@ -84,13 +99,17 @@ int dirvec_for_each(const struct dirvec *dv,
{
size_t i;
+ pthread_mutex_lock(&nr_lock);
for (i = 0; i < dv->nr; ++i) {
struct directory *dir = dv->base[i];
assert(dir);
+ pthread_mutex_unlock(&nr_lock);
if (fn(dir, arg) < 0)
return -1;
+ pthread_mutex_lock(&nr_lock); /* dv->nr may change in fn() */
}
+ pthread_mutex_unlock(&nr_lock);
return 0;
}