10 files changed, 119 insertions, 10 deletions
diff --git a/src/tests/channelmap-test.c b/src/tests/channelmap-test.c
index 9c234602..12b39f10 100644
--- a/src/tests/channelmap-test.c
+++ b/src/tests/channelmap-test.c
@@ -4,7 +4,7 @@
 #include <pulse/channelmap.h>
 #include <pulse/gccmacro.h>
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+int main(int argc, char *argv[]) {
     char cm[PA_CHANNEL_MAP_SNPRINT_MAX];
     pa_channel_map map, map2;
 
diff --git a/src/tests/cpulimit-test.c b/src/tests/cpulimit-test.c
index b7145e8a..fdc0162e 100644
--- a/src/tests/cpulimit-test.c
+++ b/src/tests/cpulimit-test.c
@@ -42,7 +42,7 @@ static time_t start;
 
 #ifdef TEST2
 
-static void func(pa_mainloop_api *m, PA_GCC_UNUSED pa_signal_event *e, PA_GCC_UNUSED int sig, PA_GCC_UNUSED void *userdata) {
+static void func(pa_mainloop_api *m, pa_signal_event *e, int sig, void *userdata) {
     time_t now;
     time(&now);
 
@@ -55,7 +55,7 @@ static void func(pa_mainloop_api *m, PA_GCC_UNUSED pa_signal_event *e, PA_GCC_UN
 
 #endif
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+int main(int argc, char *argv[]) {
     pa_mainloop *m;
 
     m = pa_mainloop_new();
diff --git a/src/tests/lock-autospawn-test.c b/src/tests/lock-autospawn-test.c
new file mode 100644
index 00000000..cb3dc87c
--- /dev/null
+++ b/src/tests/lock-autospawn-test.c
@@ -0,0 +1,109 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2008 Lennart Poettering
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/poll.h>
+#include <string.h>
+
+#include <pulsecore/macro.h>
+#include <pulsecore/thread.h>
+#include <pulse/lock-autospawn.h>
+#include <pulse/util.h>
+
+static void thread_func(void*k) {
+    pa_assert_se(pa_autospawn_lock_init() >= 0);
+
+    pa_log("%i, Trying to acquire lock.", PA_PTR_TO_INT(k));
+
+    pa_assert_se(pa_autospawn_lock_acquire(TRUE) > 0);
+
+    pa_log("%i, Got the lock!, Sleeping for 5s", PA_PTR_TO_INT(k));
+
+    pa_msleep(5000);
+
+    pa_log("%i, Releasing", PA_PTR_TO_INT(k));
+
+    pa_autospawn_lock_release();
+
+    pa_autospawn_lock_done(FALSE);
+}
+
+static void thread_func2(void *k) {
+    int fd;
+
+    pa_assert_se((fd = pa_autospawn_lock_init()) >= 0);
+
+    pa_log("%i, Trying to acquire lock.", PA_PTR_TO_INT(k));
+
+    for (;;) {
+        struct pollfd pollfd;
+        int j;
+
+        if ((j = pa_autospawn_lock_acquire(FALSE)) > 0)
+            break;
+
+        pa_assert(j == 0);
+
+        memset(&pollfd, 0, sizeof(pollfd));
+        pollfd.fd = fd;
+        pollfd.events = POLLIN;
+
+        pa_assert_se(poll(&pollfd, 1, -1) == 1);
+
+        pa_log("%i, woke up", PA_PTR_TO_INT(k));
+    }
+
+    pa_log("%i, Got the lock!, Sleeping for 5s", PA_PTR_TO_INT(k));
+
+    pa_msleep(5000);
+
+    pa_log("%i, Releasing", PA_PTR_TO_INT(k));
+
+    pa_autospawn_lock_release();
+
+    pa_autospawn_lock_done(FALSE);
+}
+
+int main(int argc, char**argv) {
+    pa_thread *a, *b, *c, *d;
+
+    pa_assert_se((a = pa_thread_new(thread_func, PA_INT_TO_PTR(1))));
+    pa_assert_se((b = pa_thread_new(thread_func2, PA_INT_TO_PTR(2))));
+    pa_assert_se((c = pa_thread_new(thread_func2, PA_INT_TO_PTR(3))));
+    pa_assert_se((d = pa_thread_new(thread_func, PA_INT_TO_PTR(4))));
+
+    pa_thread_join(a);
+    pa_thread_join(b);
+    pa_thread_join(c);
+    pa_thread_join(d);
+
+    pa_thread_free(a);
+    pa_thread_free(b);
+    pa_thread_free(c);
+    pa_thread_free(d);
+
+    pa_log("End");
+
+    return 0;
+}
diff --git a/src/tests/mainloop-test.c b/src/tests/mainloop-test.c
index 9fa2e466..2580fa72 100644
--- a/src/tests/mainloop-test.c
+++ b/src/tests/mainloop-test.c
@@ -66,7 +66,7 @@ static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, v
 #endif
 }
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+int main(int argc, char *argv[]) {
     pa_mainloop_api *a;
     pa_io_event *ioe;
     pa_time_event *te;
diff --git a/src/tests/mcalign-test.c b/src/tests/mcalign-test.c
index 9e358359..e23f098c 100644
--- a/src/tests/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -36,7 +36,7 @@
 
 /* A simple program for testing pa_mcalign */
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+int main(int argc, char *argv[]) {
     pa_mempool *p;
     pa_mcalign *a;
     pa_memchunk c;
diff --git a/src/tests/pacat-simple.c b/src/tests/pacat-simple.c
index b26e4b68..ed54f57d 100644
--- a/src/tests/pacat-simple.c
+++ b/src/tests/pacat-simple.c
@@ -33,7 +33,7 @@
 
 #define BUFSIZE 1024
 
-int main(PA_GCC_UNUSED int argc, char*argv[]) {
+int main(int argc, char*argv[]) {
 
     /* The Sample format to use */
     static const pa_sample_spec ss = {
diff --git a/src/tests/parec-simple.c b/src/tests/parec-simple.c
index 6c0d529b..ea34a075 100644
--- a/src/tests/parec-simple.c
+++ b/src/tests/parec-simple.c
@@ -53,7 +53,7 @@ static ssize_t loop_write(int fd, const void*data, size_t size) {
     return ret;
 }
 
-int main(PA_GCC_UNUSED int argc, char*argv[]) {
+int main(int argc, char*argv[]) {
     /* The sample type to use */
     static const pa_sample_spec ss = {
         .format = PA_SAMPLE_S16LE,
diff --git a/src/tests/strlist-test.c b/src/tests/strlist-test.c
index 2bd1645c..10f370c2 100644
--- a/src/tests/strlist-test.c
+++ b/src/tests/strlist-test.c
@@ -5,7 +5,7 @@
 
 #include <pulsecore/strlist.h>
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char* argv[]) {
+int main(int argc, char* argv[]) {
     char *t, *u;
     pa_strlist *l = NULL;
 
diff --git a/src/tests/thread-mainloop-test.c b/src/tests/thread-mainloop-test.c
index 7a62f85a..263cd57d 100644
--- a/src/tests/thread-mainloop-test.c
+++ b/src/tests/thread-mainloop-test.c
@@ -39,7 +39,7 @@ static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, v
     fprintf(stderr, "TIME EVENT END\n");
 }
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+int main(int argc, char *argv[]) {
     pa_mainloop_api *a;
     pa_threaded_mainloop *m;
     struct timeval tv;
diff --git a/src/tests/voltest.c b/src/tests/voltest.c
index d2c0ff69..5b26c0f1 100644
--- a/src/tests/voltest.c
+++ b/src/tests/voltest.c
@@ -3,7 +3,7 @@
 #include <pulse/volume.h>
 #include <pulse/gccmacro.h>
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+int main(int argc, char *argv[]) {
     pa_volume_t v;
 
     for (v = PA_VOLUME_MUTED; v <= PA_VOLUME_NORM*2; v += 256) {