(nuttx-apps) branch master updated: drivertest: Fix drivertest_audio crash

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new d9b8a0ee6 drivertest: Fix drivertest_audio crash
d9b8a0ee6 is described below

commit d9b8a0ee62e771b8a02b972ac5390d4b8dc2e9ba
Author: renjianguang <renjiangu...@xiaomi.com>
AuthorDate: Thu Aug 17 13:16:04 2023 +0800

    drivertest: Fix drivertest_audio crash
    
    1.call AUDIOIOC_RELEASE when finished
    2.make sure the driver dequeue all buffers before free the buffers
    
    Signed-off-by: renjianguang <renjiangu...@xiaomi.com>
---
 testing/drivertest/drivertest_audio.c | 36 ++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/testing/drivertest/drivertest_audio.c 
b/testing/drivertest/drivertest_audio.c
index e7b10981c..556a15f60 100644
--- a/testing/drivertest/drivertest_audio.c
+++ b/testing/drivertest/drivertest_audio.c
@@ -511,6 +511,12 @@ static int audio_test_cleanup(FAR struct audio_state_s 
*state, int direction)
 
   ioctl(fd, AUDIOIOC_UNREGISTERMQ, (unsigned long)state->mq);
 
+#ifdef CONFIG_AUDIO_MULTI_SESSION
+  ioctl(fd, AUDIOIOC_RELEASE, (unsigned long)state->session);
+#else
+  ioctl(fd, AUDIOIOC_RELEASE, 0);
+#endif
+
   if (state->out_fd >= 0)
     {
       close(state->out_fd);
@@ -535,6 +541,7 @@ static void audio_test_case(void **audio_state)
     };
 
   struct mq_attr attr;
+  int unconsumed = 0;
   unsigned int prio;
   bool streaming;
   bool running;
@@ -596,6 +603,8 @@ static void audio_test_case(void **audio_state)
       printf("Start %s. \n", direct == AUDIO_TYPE_OUTPUT ?
                              "Playback" : "Capture");
 
+      unconsumed = buf_info.nbuffers;
+
       while (running)
         {
           ret = mq_receive(state->mq, (FAR char *)&msg, sizeof(msg), &prio);
@@ -607,6 +616,7 @@ static void audio_test_case(void **audio_state)
           switch (msg.msg_id)
             {
               case AUDIO_MSG_DEQUEUE:
+                unconsumed--;
                 if (streaming)
                   {
                     if (direct == AUDIO_TYPE_INPUT)
@@ -627,11 +637,15 @@ static void audio_test_case(void **audio_state)
                         ret = audio_test_enqueuebuffer(state,
                                                        msg.u.ptr, direct);
                         if (ret != OK)
-                        {
-                          close(state->out_fd);
-                          state->out_fd = -1;
-                          streaming = false;
-                        }
+                          {
+                            close(state->out_fd);
+                            state->out_fd = -1;
+                            streaming = false;
+                          }
+                        else
+                          {
+                            unconsumed++;
+                          }
                       }
                   }
                 break;
@@ -659,12 +673,16 @@ static void audio_test_case(void **audio_state)
           ret = mq_getattr(state->mq, &attr);
           assert_false(ret < 0);
 
-          if (attr.mq_curmsgs == 0)
-          {
-            break;
-          }
+          if (attr.mq_curmsgs == 0 && unconsumed <= 0)
+            {
+              break;
+            }
 
           mq_receive(state->mq, (FAR char *)&msg, sizeof(msg), &prio);
+          if (msg.msg_id == AUDIO_MSG_DEQUEUE)
+            {
+              unconsumed--;
+            }
         }
       while (ret >= 0);