Create stream-specific locking

Author: Cuda-Chen

virtio-snd.c

@@ -298,6 +298,8 @@ typedef struct {
 typedef struct {
     int32_t guest_playing;
     uint32_t stream_id;
+    pthread_mutex_t ctrl_mutex;
+    pthread_cond_t ctrl_cond;
 } vsnd_stream_sel_t;
 
 typedef struct {
@@ -339,9 +341,7 @@ static virtio_snd_prop_t vsnd_props[VSND_DEV_CNT_MAX] = {
 static int vsnd_dev_cnt = 0;
 
 static pthread_mutex_t virtio_snd_mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t virtio_snd_ctrl_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t virtio_snd_tx_cond = PTHREAD_COND_INITIALIZER;
-static pthread_cond_t virtio_snd_ctrl_cond = PTHREAD_COND_INITIALIZER;
 static int tx_ev_notify;
 
 /* Forward declaration */
@@ -566,6 +566,8 @@ static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
     pthread_mutex_init(&props->ring.lock, NULL);
     pthread_cond_init(&props->ring.readable, NULL);
     pthread_cond_init(&props->ring.writable, NULL);
+    pthread_mutex_init(&props->v.ctrl_mutex, NULL);
+    pthread_cond_init(&props->v.ctrl_cond, NULL);
     INIT_LIST_HEAD(&props->buf_queue_head);
     props->immediate =
         (void *) malloc(sizeof(*props->immediate) * cnfa_period_bytes);
@@ -597,7 +599,7 @@ static void virtio_snd_read_pcm_start(const virtio_snd_pcm_hdr_t *query,
     /* Control the callback to start playing */
     props->pp.hdr.hdr.code = VIRTIO_SND_R_PCM_START;
     props->v.guest_playing++;
-    pthread_cond_signal(&virtio_snd_ctrl_cond);
+    pthread_cond_signal(&props->v.ctrl_cond);
 
     *plen = 0;
     fprintf(stderr, "end virtio_snd_read_pcm_start\n");
@@ -622,7 +624,7 @@ static void virtio_snd_read_pcm_stop(const virtio_snd_pcm_hdr_t *query,
     /* Control the callback to stop playing */
     props->pp.hdr.hdr.code = VIRTIO_SND_R_PCM_STOP;
     props->v.guest_playing--;
-    pthread_cond_signal(&virtio_snd_ctrl_cond);
+    pthread_cond_signal(&props->v.ctrl_cond);
 
     *plen = 0;
     fprintf(stderr, "end virtio_snd_read_pcm_stop\n");
@@ -666,6 +668,9 @@ static void virtio_snd_read_pcm_release(const virtio_snd_pcm_hdr_t *query,
 
     CNFAClose(props->audio_host);
     fprintf(stderr, "pass CNFAclose\n");
+    /* Tear down stream related locking mechanisms */
+    pthread_mutex_destroy(&props->v.ctrl_mutex);
+    pthread_cond_destroy(&props->v.ctrl_cond);
 
     *plen = 0;
     fprintf(stderr, "virtio_snd_read_pcm_release\n");
@@ -774,11 +779,11 @@ static void virtio_snd_cb(struct CNFADriver *dev,
     int channels = dev->channelsPlay;
     uint32_t out_buf_sz = framesp * channels;
 
-    pthread_mutex_lock(&virtio_snd_ctrl_mutex);
+    pthread_mutex_lock(&v_ptr->ctrl_mutex);
     while (v_ptr->guest_playing == 0) {
         fprintf(stderr, "wait ctrl cond\n");
         memset(out, 0, sizeof(*out) * out_buf_sz);
-        pthread_cond_wait(&virtio_snd_ctrl_cond, &virtio_snd_ctrl_mutex);
+        pthread_cond_wait(&v_ptr->ctrl_cond, &v_ptr->ctrl_mutex);
     }
 
     totalframesr += framesr;
@@ -809,7 +814,7 @@ static void virtio_snd_cb(struct CNFADriver *dev,
     fprintf(stderr, "totalframesp %d totalframesr %d\n", totalframesp,
             totalframesr);
 
-    pthread_mutex_unlock(&virtio_snd_ctrl_mutex);
+    pthread_mutex_unlock(&v_ptr->ctrl_mutex);
 }
 
 #define VSND_DESC_CNT 3