diff options
| -rw-r--r-- | src/main.c | 3 | ||||
| -rw-r--r-- | src/songvec.c | 46 | ||||
| -rw-r--r-- | src/songvec.h | 4 |
3 files changed, 36 insertions, 17 deletions
diff --git a/src/main.c b/src/main.c index 1e7f0ac19..8b5438011 100644 --- a/src/main.c +++ b/src/main.c @@ -51,6 +51,7 @@ #include "main_notify.h" #include "os_compat.h" #include "dirvec.h" +#include "songvec.h" #ifdef ENABLE_ARCHIVE #include "archive_list.h" @@ -271,6 +272,7 @@ int main(int argc, char *argv[]) idle_init(); dirvec_init(); + songvec_init(); initConf(); parseOptions(argc, argv, &options); @@ -385,6 +387,7 @@ int main(int argc, char *argv[]) music_pipe_free(); cleanUpPidFile(); finishConf(); + songvec_deinit(); dirvec_deinit(); idle_deinit(); diff --git a/src/songvec.c b/src/songvec.c index 64db4cd4c..0e2adb7e5 100644 --- a/src/songvec.c +++ b/src/songvec.c @@ -3,10 +3,9 @@ #include "utils.h" #include <assert.h> -#include <pthread.h> #include <string.h> -static pthread_mutex_t nr_lock = PTHREAD_MUTEX_INITIALIZER; +static GMutex *nr_lock = NULL; /* Only used for sorting/searchin a songvec, not general purpose compares */ static int songvec_cmp(const void *s1, const void *s2) @@ -21,11 +20,24 @@ static size_t sv_size(const struct songvec *sv) return sv->nr * sizeof(struct song *); } +void songvec_init(void) +{ + g_assert(nr_lock == NULL); + nr_lock = g_mutex_new(); +} + +void songvec_deinit(void) +{ + g_assert(nr_lock != NULL); + g_mutex_free(nr_lock); + nr_lock = NULL; +} + void songvec_sort(struct songvec *sv) { - pthread_mutex_lock(&nr_lock); + g_mutex_lock(nr_lock); qsort(sv->base, sv->nr, sizeof(struct song *), songvec_cmp); - pthread_mutex_unlock(&nr_lock); + g_mutex_unlock(nr_lock); } struct song * @@ -34,14 +46,14 @@ songvec_find(const struct songvec *sv, const char *url) int i; struct song *ret = NULL; - pthread_mutex_lock(&nr_lock); + g_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); + g_mutex_unlock(nr_lock); return ret; } @@ -50,7 +62,7 @@ songvec_delete(struct songvec *sv, const struct song *del) { size_t i; - pthread_mutex_lock(&nr_lock); + g_mutex_lock(nr_lock); for (i = 0; i < sv->nr; ++i) { if (sv->base[i] != del) continue; @@ -63,10 +75,10 @@ songvec_delete(struct songvec *sv, const struct song *del) (sv->nr - i) * sizeof(struct song *)); sv->base = xrealloc(sv->base, sv_size(sv)); } - pthread_mutex_unlock(&nr_lock); + g_mutex_unlock(nr_lock); return i; } - pthread_mutex_unlock(&nr_lock); + g_mutex_unlock(nr_lock); return -1; /* not found */ } @@ -74,18 +86,18 @@ songvec_delete(struct songvec *sv, const struct song *del) void songvec_add(struct songvec *sv, struct song *add) { - pthread_mutex_lock(&nr_lock); + g_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); + g_mutex_unlock(nr_lock); } void songvec_destroy(struct songvec *sv) { - pthread_mutex_lock(&nr_lock); + g_mutex_lock(nr_lock); sv->nr = 0; - pthread_mutex_unlock(&nr_lock); + g_mutex_unlock(nr_lock); if (sv->base) { free(sv->base); sv->base = NULL; @@ -99,7 +111,7 @@ songvec_for_each(const struct songvec *sv, size_t i; size_t prev_nr; - pthread_mutex_lock(&nr_lock); + g_mutex_lock(nr_lock); for (i = 0; i < sv->nr; ) { struct song *song = sv->base[i]; @@ -107,14 +119,14 @@ songvec_for_each(const struct songvec *sv, assert(*song->url); prev_nr = sv->nr; - pthread_mutex_unlock(&nr_lock); /* fn() may block */ + g_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() */ + g_mutex_lock(nr_lock); /* sv->nr may change in fn() */ if (prev_nr == sv->nr) ++i; } - pthread_mutex_unlock(&nr_lock); + g_mutex_unlock(nr_lock); return 0; } diff --git a/src/songvec.h b/src/songvec.h index d78b50a6e..aee6d704f 100644 --- a/src/songvec.h +++ b/src/songvec.h @@ -8,6 +8,10 @@ struct songvec { size_t nr; }; +void songvec_init(void); + +void songvec_deinit(void); + void songvec_sort(struct songvec *sv); struct song * |