Make polypaudio plugin thread safe
PATCH 1/1 Make polypaudio plugin thread safe
Add a mutex to make sure that the Polypaudio plugin is thread safe.
ctl_polyp.c +114 -34
@@ -20,6 +20,8 @@#include <sys/poll.h> +#include <pthread.h> +#include <alsa/asoundlib.h> #include <alsa/control_external.h>
@@ -41,6 +43,8 @@ typedef struct snd_ctl_polyp {int subscribed;int updated; + +pthread_mutex_t mutex; } snd_ctl_polyp_t;#define SOURCE_VOL_NAME "Capture Volume"
@@ -159,11 +163,15 @@ static int polyp_elem_count(snd_ctl_ext_assert (ctl); +pthread_mutex_lock (&ctl->mutex); +if (ctl->source) count +=2 ;if (ctl->sink) count +=2 ; +pthread_mutex_unlock (&ctl->mutex); +return count; }
@@ -176,6 +184,8 @@ static int polyp_elem_list(snd_ctl_ext_tsnd_ctl_elem_id_set_interface (id,SND_CTL_ELEM_IFACE_MIXER ); +pthread_mutex_lock (&ctl->mutex); +if (ctl->source) {if (offset ==0 )snd_ctl_elem_id_set_name (id,SOURCE_VOL_NAME );
@@ -184,6 +194,8 @@ static int polyp_elem_list(snd_ctl_ext_t }else offset +=2 ; +pthread_mutex_unlock (&ctl->mutex); +if (offset ==2 )snd_ctl_elem_id_set_name (id,SINK_VOL_NAME );else if (offset ==3 )
@@ -215,24 +227,28 @@ static int polyp_get_attribute(snd_ctl_e int *type, unsigned int *acc, unsigned int *count) { snd_ctl_polyp_t *ctl = ext->private_data; -int err; +int err =0 ; -assert (ctl && ctl->p); +assert (ctl);if (key >3 )return -EINVAL ; +pthread_mutex_lock (&ctl->mutex); + +assert (ctl->p); + err =polyp_finish_poll (ctl->p);if (err <0 ) -return err; + goto finish; err =polyp_check_connection (ctl->p);if (err <0 ) -return err; + goto finish; err =polyp_update_volume (ctl);if (err <0 ) -return err; + goto finish;if (key &1 ) *type =SND_CTL_ELEM_TYPE_BOOLEAN ;
@@ -248,7 +264,10 @@ static int polyp_get_attribute(snd_ctl_eelse *count =1 ; -return 0 ; +finish: +pthread_mutex_unlock (&ctl->mutex); + +return err; } static int polyp_get_integer_info(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
@@ -265,22 +284,26 @@ static int polyp_read_integer(snd_ctl_ex long *value) {snd_ctl_polyp_t *ctl = ext->private_data; -int err, i; +int err =0 , i;pa_cvolume *vol =NULL ; -assert (ctl && ctl->p); +assert (ctl); + +pthread_mutex_lock (&ctl->mutex); + +assert (ctl->p); err =polyp_finish_poll (ctl->p);if (err <0 ) -return err; + goto finish; err =polyp_check_connection (ctl->p);if (err <0 ) -return err; + goto finish; err =polyp_update_volume (ctl);if (err <0 ) -return err; + goto finish;switch (key) {case 0 :
@@ -296,7 +319,8 @@ static int polyp_read_integer(snd_ctl_ex *value = !ctl->sink_muted;break ;default : -return -EINVAL ; + err = -EINVAL ; + goto finish; }if (vol) {
@@ -304,30 +328,37 @@ static int polyp_read_integer(snd_ctl_ex value[i] = vol->values[i]; } -return 0 ; +finish: +pthread_mutex_unlock (&ctl->mutex); + +return err; }static int polyp_write_integer (snd_ctl_ext_t *ext,snd_ctl_ext_key_t key,long *value) {snd_ctl_polyp_t *ctl = ext->private_data; -int err, i; +int err =0 , i;pa_operation *o;pa_cvolume *vol =NULL ; -assert (ctl && ctl->p && ctl->p->context); +assert (ctl); + +pthread_mutex_lock (&ctl->mutex); + +assert (ctl->p && ctl->p->context); err =polyp_finish_poll (ctl->p);if (err <0 ) -return err; + goto finish; err =polyp_check_connection (ctl->p);if (err <0 ) -return err; + goto finish; err =polyp_update_volume (ctl);if (err <0 ) -return err; + goto finish;switch (key) {case 0 :
@@ -335,7 +366,7 @@ static int polyp_write_integer(snd_ctl_ebreak ;case 1 :if (!!ctl->source_muted == !*value) -return 0 ; + goto finish; ctl->source_muted = !*value;break ;case 2 :
@@ -343,11 +374,12 @@ static int polyp_write_integer(snd_ctl_ebreak ;case 3 :if (!!ctl->sink_muted == !*value) -return 0 ; + goto finish; ctl->sink_muted = !*value;break ;default : -return -EINVAL ; + err = -EINVAL ; + goto finish; }if (vol) {
@@ -356,7 +388,7 @@ static int polyp_write_integer(snd_ctl_ebreak ;if (i == vol->channels) -return 0 ; + goto finish;for (i =0 ;i < vol->channels;i++) vol->values[i] = value[i];
@@ -379,9 +411,14 @@ static int polyp_write_integer(snd_ctl_e err =polyp_wait_operation (ctl->p, o);pa_operation_unref (o);if (err <0 ) -return err; + goto finish; + + err =1 ; -return 1 ; +finish: +pthread_mutex_unlock (&ctl->mutex); + +return err; }static void polyp_subscribe_events (snd_ctl_ext_t *ext,int subscribe)
@@ -390,7 +427,11 @@ static void polyp_subscribe_events(snd_cassert (ctl); +pthread_mutex_lock (&ctl->mutex); + ctl->subscribed = !!(subscribe &SND_CTL_EVENT_MASK_VALUE ); + +pthread_mutex_unlock (&ctl->mutex); } static int polyp_read_event(snd_ctl_ext_t *ext, snd_ctl_elem_id_t *id,
@@ -398,11 +439,14 @@ static int polyp_read_event(snd_ctl_ext_ {snd_ctl_polyp_t *ctl = ext->private_data;int offset; +int err = -EAGAIN ;assert (ctl); +pthread_mutex_lock (&ctl->mutex); +if (!ctl->updated || !ctl->subscribed) -return -EAGAIN ; + goto finish;if (ctl->source) offset =2 ;
@@ -425,16 +469,30 @@ static int polyp_read_event(snd_ctl_ext_ *event_mask =SND_CTL_EVENT_MASK_VALUE ; -return 1 ; + err =0 ; + +finish: +pthread_mutex_unlock (&ctl->mutex); + +return err; }static int polyp_ctl_poll_descriptors_count (snd_ctl_ext_t *ext) {snd_ctl_polyp_t *ctl = ext->private_data; +int count; + +assert (ctl); + +pthread_mutex_lock (&ctl->mutex); + +assert (ctl->p); + + count =polyp_poll_descriptors_count (ctl->p); -assert (ctl && ctl->p); +pthread_mutex_unlock (&ctl->mutex); -return polyp_poll_descriptors_count (ctl->p); +return count; }static int polyp_ctl_poll_descriptors (snd_ctl_ext_t *ext,struct pollfd *pfd,unsigned int space)
@@ -443,35 +501,49 @@ static int polyp_ctl_poll_descriptors(snsnd_ctl_polyp_t *ctl = ext->private_data; -assert (ctl && ctl->p); +assert (ctl); + +pthread_mutex_lock (&ctl->mutex); + +assert (ctl->p); num =polyp_poll_descriptors (ctl->p, pfd, space);if (num <0 ) -return num; + goto finish;if (ctl->updated)pa_mainloop_wakeup (ctl->p->mainloop); +finish: +pthread_mutex_unlock (&ctl->mutex); +return num; }static int polyp_ctl_poll_revents (snd_ctl_ext_t *ext,struct pollfd *pfd,unsigned int nfds,unsigned short *revents) {snd_ctl_polyp_t *ctl = ext->private_data; -int err; +int err =0 ; + +assert (ctl); + +pthread_mutex_lock (&ctl->mutex); -assert (ctl && ctl->p); +assert (ctl->p); err =polyp_poll_revents (ctl->p, pfd, nfds, revents);if (err <0 ) -return err; + goto finish; *revents =0 ;if (ctl->updated) *revents |=POLLIN ; -return 0 ; +finish: +pthread_mutex_unlock (&ctl->mutex); + +return err; }static void polyp_close (snd_ctl_ext_t *ext)
@@ -488,6 +560,8 @@ static void polyp_close(snd_ctl_ext_t *eif (ctl->sink)free (ctl->sink); +pthread_mutex_destroy (&ctl->mutex); +free (ctl); }
@@ -529,6 +603,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(polyp)int err;snd_ctl_polyp_t *ctl;pa_operation *o; +pthread_mutexattr_t mutexattr;snd_config_for_each (i, next, conf) {snd_config_t *n =snd_config_iterator_entry (i);
@@ -582,6 +657,11 @@ SND_CTL_PLUGIN_DEFINE_FUNC(polyp)if (err <0 ) goto error; +pthread_mutexattr_init (&mutexattr); +pthread_mutexattr_settype (&mutexattr,PTHREAD_MUTEX_RECURSIVE ); +pthread_mutex_init (&ctl->mutex, &mutexattr); +pthread_mutexattr_destroy (&mutexattr); +if (source) ctl->source =strdup (source);else if (device)
Common subdirectories: polyp.orig/CVS and polyp/CVS Only in polyp: .deps
Only in polyp: Makefile
Only in polyp: Makefile.in
pcm_polyp.c +165 -57
448 lines not on this page · raw message
polyp.c +2 -0
@@ -174,7 +174,9 @@ int polyp_wait_operation(snd_polyp_t *p,assert (p && o && (p->state ==POLYP_STATE_READY ));while (pa_operation_get_state (o) ==PA_OPERATION_RUNNING ) { + p->state =POLYP_STATE_POLLING ; err =pa_mainloop_iterate (p->mainloop,1 ,NULL ); + p->state =POLYP_STATE_READY ;if (err <0 )return err; }
At Tue, 07 Mar 2006 18:44:11 +0100,
Quoted 4 lines · Pierre Ossman
Add a mutex to make sure that the Polypaudio plugin is thread safe.
Signed-off-by Pierre Ossman <[email protected]>
Applied this, too.
Takashi
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642