split of signal releasing into its own function and name it pa_threaded_mainloop_accept()

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@844 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/polyp/thread-mainloop.c b/src/polyp/thread-mainloop.c
index 577e0c2f6bc933e2dad60feb8d716b90d74a735d..90274f1c1276eb4ab305317181f92d605af2d937 100644 (file)
--- a/src/polyp/thread-mainloop.c
+++ b/src/polyp/thread-mainloop.c
@@ -51,7 +51,7 @@ struct pa_threaded_mainloop {
     pthread_t thread_id;
     pthread_mutex_t mutex;
     int n_waiting;
-    pthread_cond_t cond, release_cond;
+    pthread_cond_t cond, accept_cond;
     int thread_running;
 };
 
@@ -105,7 +105,7 @@ pa_threaded_mainloop *pa_threaded_mainloop_new(void) {
     pthread_mutexattr_destroy(&a);
     
     pthread_cond_init(&m->cond, NULL);
-    pthread_cond_init(&m->release_cond, NULL);
+    pthread_cond_init(&m->accept_cond, NULL);
     m->thread_running = 0;
     m->n_waiting = 0;
 
@@ -126,7 +126,7 @@ void pa_threaded_mainloop_free(pa_threaded_mainloop* m) {
 
     pthread_mutex_destroy(&m->mutex);
     pthread_cond_destroy(&m->cond);
-    pthread_cond_destroy(&m->release_cond);
+    pthread_cond_destroy(&m->accept_cond);
     
     pa_xfree(m);
 }
@@ -187,13 +187,13 @@ void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m) {
     pthread_mutex_unlock(&m->mutex);
 }
 
-void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_release) {
+void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_accept) {
     assert(m);
     
     pthread_cond_broadcast(&m->cond);
 
-    if (wait_for_release && m->n_waiting > 0)
-        pthread_cond_wait(&m->release_cond, &m->mutex);
+    if (wait_for_accept && m->n_waiting > 0)
+        pthread_cond_wait(&m->accept_cond, &m->mutex);
 }
 
 void pa_threaded_mainloop_wait(pa_threaded_mainloop *m) {
@@ -206,7 +206,16 @@ void pa_threaded_mainloop_wait(pa_threaded_mainloop *m) {
     pthread_cond_wait(&m->cond, &m->mutex);
     assert(m->n_waiting > 0);
     m->n_waiting --;
-    pthread_cond_signal(&m->release_cond);
+    pthread_cond_signal(&m->accept_cond);
+}
+
+void pa_threaded_mainloop_accept(pa_threaded_mainloop *m) {
+    assert(m);
+    
+    /* Make sure that this function is not called from the helper thread */
+    assert(!m->thread_running || !pthread_equal(pthread_self(), m->thread_id));
+
+    pthread_cond_signal(&m->accept_cond);
 }
 
 int pa_threaded_mainloop_get_retval(pa_threaded_mainloop *m) {

diff --git a/src/polyp/thread-mainloop.h b/src/polyp/thread-mainloop.h
index d4762e27622d9c3cd3b51ddf02be2d5f4573714b..d0bfd5ae3113a4facb301ed5b2257b005d26e814 100644 (file)
--- a/src/polyp/thread-mainloop.h
+++ b/src/polyp/thread-mainloop.h
@@ -67,9 +67,12 @@ void pa_threaded_mainloop_wait(pa_threaded_mainloop *m);
 /** Signal all threads waiting for a signalling event in
  * pa_threaded_mainloop_wait(). If wait_for_release is non-zero, do
  * not return before the signal was accepted by a
- * pa_threaded_mainloop_wait() call. While waiting for that condition
+ * pa_threaded_mainloop_accept() call. While waiting for that condition
  * the event loop object is unlocked. */
-void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_release);
+void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_accept);
+
+/** Accept a signal from the event thread issued with pa_threaded_mainloop_signal() */
+void pa_threaded_mainloop_accept(pa_threaded_mainloop *m);
 
 /** Return the return value as specified with the main loop's quit() routine. */
 int pa_threaded_mainloop_get_retval(pa_threaded_mainloop *m);

diff --git a/src/tests/thread-mainloop-test.c b/src/tests/thread-mainloop-test.c
index 1434deb97e2208dcdb319de5f1752d44ae0f4ca0..8ca3f92fa6d24e73906c36f0149ed56ef31ddc94 100644 (file)
--- a/src/tests/thread-mainloop-test.c
+++ b/src/tests/thread-mainloop-test.c
@@ -59,7 +59,9 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
     fprintf(stderr, "waiting 5s (signal)\n");
     pa_threaded_mainloop_wait(m);
     fprintf(stderr, "wait completed\n");
-
+    pa_threaded_mainloop_accept(m);
+    fprintf(stderr, "signal accepted\n");
+    
     pa_threaded_mainloop_unlock(m);
     
     fprintf(stderr, "waiting 5s (sleep)\n");