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
This commit is contained in:
Lennart Poettering 2006-05-11 13:01:24 +00:00
parent dbf62d4bc5
commit e929aabc03
3 changed files with 24 additions and 10 deletions

View file

@ -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) {