Explicitly destroy cond/mutex

Author: Cuda-Chen

virtio-snd.c

@@ -518,7 +518,7 @@ static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
      * the length of frame). */
     /* CNFA only accept frame with signed 16-bit data in little-endian. */
     props->audio_host =
-        CNFAInit(NULL, "semu-virtio-snd", virtio_snd_cb, rate, 0, channels, 0,
+        CNFAInit("ALSA", "semu-virtio-snd", virtio_snd_cb, rate, 0, channels, 0,
                  cnfa_period_frames, NULL, NULL, &props->v);
     pthread_mutex_init(&props->lock.lock, NULL);
     pthread_cond_init(&props->lock.readable, NULL);
@@ -535,6 +535,7 @@ static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
 static void virtio_snd_read_pcm_start(const virtio_snd_pcm_hdr_t *query,
                                       uint32_t *plen)
 {
+    fprintf(stderr, "pcm_start start\n");
     const virtio_snd_pcm_hdr_t *request = query;
     uint32_t stream_id = request->stream_id;
     uint32_t code = vsnd_props[stream_id].pp.hdr.hdr.code;
@@ -554,11 +555,13 @@ static void virtio_snd_read_pcm_start(const virtio_snd_pcm_hdr_t *query,
     pthread_cond_signal(&props->v.ctrl_cond);
 
     *plen = 0;
+    fprintf(stderr, "pcm_start stop\n");
 }
 
 static void virtio_snd_read_pcm_stop(const virtio_snd_pcm_hdr_t *query,
                                      uint32_t *plen)
 {
+    fprintf(stderr, "pcm_stop start\n");
     const virtio_snd_pcm_hdr_t *request = query;
     uint32_t stream_id = request->stream_id;
     uint32_t code = vsnd_props[stream_id].pp.hdr.hdr.code;
@@ -577,11 +580,13 @@ static void virtio_snd_read_pcm_stop(const virtio_snd_pcm_hdr_t *query,
     pthread_cond_signal(&props->v.ctrl_cond);
 
     *plen = 0;
+    fprintf(stderr, "pcm_stop stop\n");
 }
 
 static void virtio_snd_read_pcm_release(const virtio_snd_pcm_hdr_t *query,
                                         uint32_t *plen)
 {
+    fprintf(stderr, "pcm_release start\n");
     const virtio_snd_pcm_hdr_t *request = query;
     uint32_t stream_id = request->stream_id;
     virtio_snd_prop_t *props = &vsnd_props[stream_id];
@@ -597,12 +602,21 @@ static void virtio_snd_read_pcm_release(const virtio_snd_pcm_hdr_t *query,
     props->pp.hdr.hdr.code = VIRTIO_SND_R_PCM_RELEASE;
 
     /* Tear down PCM buffer related locking attributes. */
+    fprintf(stderr, "pcm_release tear down PCM buffer start\n");
     free(props->intermediate);
+
+    /* Explicitly unlock the CVs and mutex. */
+    pthread_cond_broadcast(&props->lock.readable);
+    pthread_cond_broadcast(&props->lock.writable);
+    pthread_mutex_unlock(&props->lock.lock);
+
     pthread_mutex_destroy(&props->lock.lock);
     pthread_cond_destroy(&props->lock.readable);
     pthread_cond_destroy(&props->lock.writable);
+    fprintf(stderr, "pcm_release tear down PCM buffer stop\n");
 
     /* Tear down PCM buffer queue. */
+    fprintf(stderr, "pcm_release tear down PCM buffer queue\n");
     vsnd_buf_queue_node_t *tmp = NULL;
     vsnd_buf_queue_node_t *node;
     if (!list_empty(&props->buf_queue_head)) {
@@ -612,13 +626,17 @@ static void virtio_snd_read_pcm_release(const virtio_snd_pcm_hdr_t *query,
         }
     }
 
-    CNFAClose(props->audio_host);
-
     /* Tear down stream related locking attributes. */
+    pthread_cond_broadcast(&props->v.ctrl_cond);
+    pthread_mutex_unlock(&props->v.ctrl_mutex);
     pthread_mutex_destroy(&props->v.ctrl_mutex);
     pthread_cond_destroy(&props->v.ctrl_cond);
 
+    fprintf(stderr, "pcm_release tear down CNFA\n");
+    CNFAClose(props->audio_host);
+
     *plen = 0;
+    fprintf(stderr, "pcm_release stop\n");
 }
 
 static void __virtio_snd_frame_dequeue(short *out,
@@ -668,6 +686,7 @@ static void virtio_snd_cb(struct CNFADriver *dev,
 
     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(&v_ptr->ctrl_cond, &v_ptr->ctrl_mutex);
     }