[polypaudio-commits] r823 - in /trunk/src: ./ Makefile.am polyp/thread-mainloop.c polyp/thread-mainloop.h tests/thread-mainloop-test.c
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Sun Apr 30 16:34:17 PDT 2006
Author: lennart
Date: Mon May 1 01:34:17 2006
New Revision: 823
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=823&root=polypaudio&view=rev
Log:
add new threaded main loop implementation (with test/example)
Added:
trunk/src/polyp/thread-mainloop.c (with props)
trunk/src/polyp/thread-mainloop.h (with props)
trunk/src/tests/thread-mainloop-test.c (with props)
Modified:
trunk/src/ (props changed)
trunk/src/Makefile.am
Propchange: trunk/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon May 1 01:34:17 2006
@@ -1,3 +1,4 @@
+thread-mainloop-test
channelmap-test
*.loT
pabrowse
Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=823&root=polypaudio&r1=822&r2=823&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Mon May 1 01:34:17 2006
@@ -181,6 +181,7 @@
noinst_PROGRAMS = \
mainloop-test \
+ thread-mainloop-test \
mcalign-test \
pacat-simple \
parec-simple \
@@ -210,6 +211,11 @@
mainloop_test_CFLAGS = $(AM_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la
mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+
+thread_mainloop_test_SOURCES = tests/thread-mainloop-test.c
+thread_mainloop_test_CFLAGS = $(AM_CFLAGS)
+thread_mainloop_test_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la
+thread_mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
mcalign_test_SOURCES = tests/mcalign-test.c
mcalign_test_CFLAGS = $(AM_CFLAGS)
@@ -290,6 +296,7 @@
polyp/mainloop.h \
polyp/mainloop-api.h \
polyp/mainloop-signal.h \
+ polyp/thread-mainloop.h \
polyp/polypaudio.h \
polyp/context.h \
polyp/def.h \
@@ -348,6 +355,7 @@
polyp/volume.c polyp/volume.h \
polyp/mainloop.c polyp/mainloop.h \
polyp/mainloop-signal.c polyp/mainloop-signal.h \
+ polyp/thread-mainloop.c polyp/thread-mainloop.h \
polypcore/poll.c polypcore/poll.h
# Internal stuff that is shared with libpolypcore
Added: trunk/src/polyp/thread-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/thread-mainloop.c?rev=823&root=polypaudio&view=auto
==============================================================================
--- trunk/src/polyp/thread-mainloop.c (added)
+++ trunk/src/polyp/thread-mainloop.c Mon May 1 01:34:17 2006
@@ -1,0 +1,203 @@
+/* $Id$ */
+
+/***
+ This file is part of polypaudio.
+
+ polypaudio 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.
+
+ polypaudio 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 polypaudio; 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 <pthread.h>
+#include <assert.h>
+#include <signal.h>
+#include <sys/poll.h>
+#include <stdio.h>
+
+#include <polypcore/xmalloc.h>
+
+#include "mainloop.h"
+#include "thread-mainloop.h"
+
+struct pa_threaded_mainloop {
+ pa_mainloop *real_mainloop;
+ pthread_t thread_id;
+ pthread_mutex_t mutex;
+ pthread_cond_t cond;
+ int thread_running;
+};
+
+static int poll_func(struct pollfd *ufds, unsigned long nfds, int timeout, void *userdata) {
+ pthread_mutex_t *mutex = userdata;
+ int r;
+
+ assert(mutex);
+
+ /* Before entering poll() we unlock the mutex, so that
+ * avahi_simple_poll_quit() can succeed from another thread. */
+
+ pthread_mutex_unlock(mutex);
+ r = poll(ufds, nfds, timeout);
+ pthread_mutex_lock(mutex);
+
+ return r;
+}
+
+static void* thread(void *userdata){
+ pa_threaded_mainloop *m = userdata;
+ sigset_t mask;
+
+ /* Make sure that signals are delivered to the main thread */
+ sigfillset(&mask);
+ pthread_sigmask(SIG_BLOCK, &mask, NULL);
+
+ pthread_mutex_lock(&m->mutex);
+ pa_mainloop_run(m->real_mainloop, NULL);
+ pthread_mutex_unlock(&m->mutex);
+
+ return NULL;
+}
+
+pa_threaded_mainloop *pa_threaded_mainloop_new(void) {
+ pa_threaded_mainloop *m;
+ pthread_mutexattr_t a;
+
+ m = pa_xnew(pa_threaded_mainloop, 1);
+
+ if (!(m->real_mainloop = pa_mainloop_new())) {
+ pa_xfree(m);
+ return NULL;
+ }
+
+ pa_mainloop_set_poll_func(m->real_mainloop, poll_func, &m->mutex);
+
+ pthread_mutexattr_init(&a);
+ pthread_mutexattr_settype(&a, PTHREAD_MUTEX_RECURSIVE);
+ pthread_mutex_init(&m->mutex, NULL);
+ pthread_mutexattr_destroy(&a);
+
+ pthread_cond_init(&m->cond, NULL);
+ m->thread_running = 0;
+
+ return m;
+}
+
+void pa_threaded_mainloop_free(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));
+
+ if (m->thread_running)
+ pa_threaded_mainloop_stop(m);
+
+ if (m->real_mainloop)
+ pa_mainloop_free(m->real_mainloop);
+
+ pthread_mutex_destroy(&m->mutex);
+ pthread_cond_destroy(&m->cond);
+
+ pa_xfree(m);
+}
+
+int pa_threaded_mainloop_start(pa_threaded_mainloop *m) {
+ assert(m);
+
+ assert(!m->thread_running);
+
+ pthread_mutex_lock(&m->mutex);
+
+ if (pthread_create(&m->thread_id, NULL, thread, m) < 0) {
+ pthread_mutex_unlock(&m->mutex);
+ return -1;
+ }
+
+ m->thread_running = 1;
+
+ pthread_mutex_unlock(&m->mutex);
+
+ return 0;
+}
+
+void pa_threaded_mainloop_stop(pa_threaded_mainloop *m) {
+ assert(m);
+
+ if (!m->thread_running)
+ return;
+
+ /* Make sure that this function is not called from the helper thread */
+ assert(!pthread_equal(pthread_self(), m->thread_id));
+
+ pthread_mutex_lock(&m->mutex);
+ pa_mainloop_quit(m->real_mainloop, 0);
+ pthread_mutex_unlock(&m->mutex);
+
+ pthread_join(m->thread_id, NULL);
+ m->thread_running = 0;
+
+ return;
+}
+
+void pa_threaded_mainloop_lock(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_mutex_lock(&m->mutex);
+}
+
+void pa_threaded_mainloop_unlock(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_mutex_unlock(&m->mutex);
+}
+
+void pa_threaded_mainloop_signal(pa_threaded_mainloop *m) {
+ assert(m);
+
+ /* Make sure that this function is called from the helper thread */
+ assert(m->thread_running && pthread_equal(pthread_self(), m->thread_id));
+
+ pthread_cond_broadcast(&m->cond);
+}
+
+void pa_threaded_mainloop_wait(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_wait(&m->cond, &m->mutex);
+}
+
+int pa_threaded_mainloop_get_retval(pa_threaded_mainloop *m) {
+ assert(m);
+
+ return pa_mainloop_get_retval(m->real_mainloop);
+}
+
+pa_mainloop_api* pa_threaded_mainloop_get_api(pa_threaded_mainloop*m) {
+ assert(m);
+
+ return pa_mainloop_get_api(m->real_mainloop);
+}
+
Propchange: trunk/src/polyp/thread-mainloop.c
------------------------------------------------------------------------------
svn:keywords = Id
Added: trunk/src/polyp/thread-mainloop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/thread-mainloop.h?rev=823&root=polypaudio&view=auto
==============================================================================
--- trunk/src/polyp/thread-mainloop.h (added)
+++ trunk/src/polyp/thread-mainloop.h Mon May 1 01:34:17 2006
@@ -1,0 +1,58 @@
+#ifndef foothreadmainloophfoo
+#define foothreadmainloophfoo
+
+/* $Id$ */
+
+/***
+ This file is part of polypaudio.
+
+ polypaudio 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.
+
+ polypaudio 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 polypaudio; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#include <polyp/mainloop-api.h>
+#include <polyp/cdecl.h>
+
+PA_C_DECL_BEGIN
+
+/** \file
+ *
+ * A thread based main loop implementation based on pa_mainloop.*/
+
+/** An opaque main loop object */
+typedef struct pa_threaded_mainloop pa_threaded_mainloop;
+
+/** Allocate a new main loop object */
+pa_threaded_mainloop *pa_threaded_mainloop_new(void);
+
+/** Free a main loop object */
+void pa_threaded_mainloop_free(pa_threaded_mainloop* m);
+
+int pa_threaded_mainloop_start(pa_threaded_mainloop *m);
+void pa_threaded_mainloop_stop(pa_threaded_mainloop *m);
+void pa_threaded_mainloop_lock(pa_threaded_mainloop *m);
+void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m);
+void pa_threaded_mainloop_signal(pa_threaded_mainloop *m);
+void pa_threaded_mainloop_wait(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);
+
+/** Return the abstract main loop abstraction layer vtable for this main loop. */
+pa_mainloop_api* pa_threaded_mainloop_get_api(pa_threaded_mainloop*m);
+
+PA_C_DECL_END
+
+#endif
Propchange: trunk/src/polyp/thread-mainloop.h
------------------------------------------------------------------------------
svn:keywords = Id
Added: trunk/src/tests/thread-mainloop-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/thread-mainloop-test.c?rev=823&root=polypaudio&view=auto
==============================================================================
--- trunk/src/tests/thread-mainloop-test.c (added)
+++ trunk/src/tests/thread-mainloop-test.c Mon May 1 01:34:17 2006
@@ -1,0 +1,73 @@
+/* $Id$ */
+
+/***
+ This file is part of polypaudio.
+
+ polypaudio 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.
+
+ polypaudio 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 polypaudio; 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 <assert.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#include <polypcore/gccmacro.h>
+#include <polypcore/util.h>
+#include <polyp/thread-mainloop.h>
+
+static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, void *userdata) {
+ fprintf(stderr, "TIME EVENT\n");
+ pa_threaded_mainloop_signal(userdata);
+}
+
+int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+ pa_mainloop_api *a;
+ pa_threaded_mainloop *m;
+ struct timeval tv;
+
+ m = pa_threaded_mainloop_new();
+ assert(m);
+ a = pa_threaded_mainloop_get_api(m);
+ assert(a);
+
+ pa_threaded_mainloop_start(m);
+
+ pa_threaded_mainloop_lock(m);
+
+ pa_gettimeofday(&tv);
+ tv.tv_sec += 5;
+ a->time_new(a, &tv, tcb, m);
+
+ fprintf(stderr, "waiting 5s (signal)\n");
+ pa_threaded_mainloop_wait(m);
+ fprintf(stderr, "wait completed\n");
+
+ pa_threaded_mainloop_unlock(m);
+
+ fprintf(stderr, "waiting 5s (sleep)\n");
+ sleep(5);
+
+ fprintf(stderr, "shutting down\n");
+
+ pa_threaded_mainloop_stop(m);
+
+ pa_threaded_mainloop_free(m);
+ return 0;
+}
Propchange: trunk/src/tests/thread-mainloop-test.c
------------------------------------------------------------------------------
svn:keywords = Id
More information about the pulseaudio-commits
mailing list