d52437d43f
{song,dir}vec_for_each each failed to gracefully handle deleted
files when iterating through. While we were thread-safe, we
were not safe within the calling thread. If a callback we
passed caused sv->nr to shring, our index would still increment;
causing files to stay in the database.
A way to test this is to remove 10 or so contiguous songs from a
>10 song directory.
120 lines
2.4 KiB
C
120 lines
2.4 KiB
C
#include "songvec.h"
|
|
#include "song.h"
|
|
#include "utils.h"
|
|
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
static pthread_mutex_t nr_lock = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
/* Only used for sorting/searchin a songvec, not general purpose compares */
|
|
static int songvec_cmp(const void *s1, const void *s2)
|
|
{
|
|
const struct song *a = ((const struct song * const *)s1)[0];
|
|
const struct song *b = ((const struct song * const *)s2)[0];
|
|
return strcmp(a->url, b->url);
|
|
}
|
|
|
|
static size_t sv_size(const struct songvec *sv)
|
|
{
|
|
return sv->nr * sizeof(struct song *);
|
|
}
|
|
|
|
void songvec_sort(struct songvec *sv)
|
|
{
|
|
pthread_mutex_lock(&nr_lock);
|
|
qsort(sv->base, sv->nr, sizeof(struct song *), songvec_cmp);
|
|
pthread_mutex_unlock(&nr_lock);
|
|
}
|
|
|
|
struct song *
|
|
songvec_find(const struct songvec *sv, const char *url)
|
|
{
|
|
int i;
|
|
struct song *ret = NULL;
|
|
|
|
pthread_mutex_lock(&nr_lock);
|
|
for (i = sv->nr; --i >= 0; ) {
|
|
if (strcmp(sv->base[i]->url, url))
|
|
continue;
|
|
ret = sv->base[i];
|
|
break;
|
|
}
|
|
pthread_mutex_unlock(&nr_lock);
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
songvec_delete(struct songvec *sv, const struct song *del)
|
|
{
|
|
size_t i;
|
|
|
|
pthread_mutex_lock(&nr_lock);
|
|
for (i = 0; i < sv->nr; ++i) {
|
|
if (sv->base[i] != del)
|
|
continue;
|
|
/* we _don't_ call song_free() here */
|
|
if (!--sv->nr) {
|
|
free(sv->base);
|
|
sv->base = NULL;
|
|
} else {
|
|
memmove(&sv->base[i], &sv->base[i + 1],
|
|
(sv->nr - i) * sizeof(struct song *));
|
|
sv->base = xrealloc(sv->base, sv_size(sv));
|
|
}
|
|
pthread_mutex_unlock(&nr_lock);
|
|
return i;
|
|
}
|
|
pthread_mutex_unlock(&nr_lock);
|
|
|
|
return -1; /* not found */
|
|
}
|
|
|
|
void
|
|
songvec_add(struct songvec *sv, struct song *add)
|
|
{
|
|
pthread_mutex_lock(&nr_lock);
|
|
++sv->nr;
|
|
sv->base = xrealloc(sv->base, sv_size(sv));
|
|
sv->base[sv->nr - 1] = add;
|
|
pthread_mutex_unlock(&nr_lock);
|
|
}
|
|
|
|
void songvec_destroy(struct songvec *sv)
|
|
{
|
|
pthread_mutex_lock(&nr_lock);
|
|
sv->nr = 0;
|
|
pthread_mutex_unlock(&nr_lock);
|
|
if (sv->base) {
|
|
free(sv->base);
|
|
sv->base = NULL;
|
|
}
|
|
}
|
|
|
|
int
|
|
songvec_for_each(const struct songvec *sv,
|
|
int (*fn)(struct song *, void *), void *arg)
|
|
{
|
|
size_t i;
|
|
size_t prev_nr;
|
|
|
|
pthread_mutex_lock(&nr_lock);
|
|
for (i = 0; i < sv->nr; ) {
|
|
struct song *song = sv->base[i];
|
|
|
|
assert(song);
|
|
assert(*song->url);
|
|
|
|
prev_nr = sv->nr;
|
|
pthread_mutex_unlock(&nr_lock); /* fn() may block */
|
|
if (fn(song, arg) < 0)
|
|
return -1;
|
|
pthread_mutex_lock(&nr_lock); /* sv->nr may change in fn() */
|
|
if (prev_nr == sv->nr)
|
|
++i;
|
|
}
|
|
pthread_mutex_unlock(&nr_lock);
|
|
|
|
return 0;
|
|
}
|