1 files changed, 33 insertions, 27 deletions

diff --git a/src/songvec.c b/src/songvec.c
index 579ac7033..cf0991029 100644
--- a/src/songvec.c
+++ b/src/songvec.c
@@ -2,6 +2,8 @@
 #include "myfprintf.h"
 #include "utils.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)
 {
@@ -17,23 +19,32 @@ static size_t sv_size(struct songvec *sv)
 
 void songvec_sort(struct songvec *sv)
 {
+	pthread_mutex_lock(&nr_lock);
 	qsort(sv->base, sv->nr, sizeof(Song *), songvec_cmp);
+	pthread_mutex_unlock(&nr_lock);
 }
 
 Song *songvec_find(struct songvec *sv, const char *url)
 {
 	int i;
+	Song *ret = NULL;
 
-	for (i = sv->nr; --i >= 0; )
-		if (!strcmp(sv->base[i]->url, url))
-			return sv->base[i];
-	return 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 Song *del)
 {
 	int i;
 
+	pthread_mutex_lock(&nr_lock);
 	for (i = sv->nr; --i >= 0; ) {
 		if (sv->base[i] != del)
 			continue;
@@ -46,55 +57,50 @@ int songvec_delete(struct songvec *sv, const Song *del)
 				(sv->nr - i + 1) * sizeof(Song *));
 			sv->base = xrealloc(sv->base, sv_size(sv));
 		}
-		return i;
+		break;
 	}
+	pthread_mutex_unlock(&nr_lock);
 
-	return -1; /* not found */
+	return i;
 }
 
 void songvec_add(struct songvec *sv, 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);
 	if (sv->base) {
 		free(sv->base);
 		sv->base = NULL;
 	}
 	sv->nr = 0;
+	pthread_mutex_unlock(&nr_lock);
 }
 
-int songvec_write(struct songvec *sv, int fd, int extra)
+int songvec_for_each(struct songvec *sv, int (*fn)(Song *, void *), void *arg)
 {
-	int i;
-	Song **sp = sv->base;
+	size_t i;
 
-	if (extra) {
-		if (fdprintf(fd, SONG_BEGIN "\n") < 0)
-			return -1;
+	pthread_mutex_lock(&nr_lock);
+	for (i = 0; i < sv->nr; ++i) {
+		Song *song = sv->base[i];
 
-		for (i = sv->nr; --i >= 0; ) {
-			Song *song = *sp++;
-			if (fdprintf(fd, SONG_KEY "%s\n", song->url) < 0)
-				return -1;
-			if (printSongInfo(fd, song) < 0)
-				return -1;
-			if (fdprintf(fd,
-			            SONG_MTIME "%li\n", (long)song->mtime) < 0)
-				return -1;
-		}
+		assert(song);
+		assert(*song->url);
 
-		if (fdprintf(fd, SONG_END "\n") < 0)
+		pthread_mutex_unlock(&nr_lock); /* fn() may block */
+		if (fn(song, arg) < 0)
 			return -1;
-	} else {
-		for (i = sv->nr; --i >= 0;)
-			if (printSongInfo(fd, *sp++) < 0)
-				return -1;
+		pthread_mutex_lock(&nr_lock); /* sv->nr may change in fn() */
 	}
+	pthread_mutex_unlock(&nr_lock);
 
 	return 0;
 }