Changeset 90868 in vbox

Timestamp:

Aug 25, 2021 10:12:34 AM (3 years ago)

Author:

vboxsync

Message:

Audio/VKAT: More logging adjustments. bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/AudioTestService.cpp (modified) (5 diffs)
• Devices/Audio/AudioTestServiceTcp.cpp (modified) (6 diffs)
• ValidationKit/utils/audio/vkatCommon.cpp (modified) (3 diffs)
• ValidationKit/utils/audio/vkatDriverStack.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Audio/AudioTestService.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_AUDIO_TEST
+#include <iprt/log.h>
 
 #include <iprt/alloca.h>
@@ -37 +38 @@
 #include <iprt/json.h>
 #include <iprt/list.h>
-#include <iprt/log.h>
 #include <iprt/mem.h>
 #include <iprt/message.h>
@@ -997 +997 @@
             rc = RTPipeWrite(pThis->hPipeW, "", 1, &cbWritten);
             if (RT_FAILURE(rc))
-                RTMsgError("Failed to inform worker thread of a new client");
+                LogRel(("Failed to inform worker thread of a new client, rc=%Rrc\n", rc));
         }
         else
         {
-            RTMsgError("Creating new client structure failed with out of memory error\n");
+            LogRel(("Creating new client structure failed with out of memory error\n"));
             pThis->pTransport->pfnNotifyBye(pThis->pTransportInst, pTransportClient);
         }
@@ -1062 +1062 @@
                     return VINF_SUCCESS;
                 else
-                    RTMsgError("Creating the client worker thread failed with %Rrc\n", rc);
+                    LogRel(("Creating the client worker thread failed with %Rrc\n", rc));
 
                 RTPipeClose(pThis->hPipeR);
@@ -1068 +1068 @@
             }
             else
-                RTMsgError("Creating communications pipe failed with %Rrc\n", rc);
+                LogRel(("Creating communications pipe failed with %Rrc\n", rc));
 
             RTPollSetDestroy(pThis->hPollSet);
         }
         else
-            RTMsgError("Creating pollset failed with %Rrc\n", rc);
+            LogRel(("Creating pollset failed with %Rrc\n", rc));
 
         RTCritSectDelete(&pThis->CritSectClients);
     }
     else
-        RTMsgError("Creating global critical section failed with %Rrc\n", rc);
+        LogRel(("Creating global critical section failed with %Rrc\n", rc));
 
     return rc;

trunk/src/VBox/Devices/Audio/AudioTestServiceTcp.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_AUDIO_TEST
+#include <iprt/log.h>
+
 #include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/critsect.h>
 #include <iprt/err.h>
-#include <iprt/log.h>
 #include <iprt/mem.h>
 #include <iprt/message.h>
@@ -313 +314 @@
     int rc;
 
+    LogFunc(("enmMode=%#x\n", pThis->enmMode));
+
     if (pThis->enmMode == ATSTCPMODE_SERVER)
     {
@@ -414 +417 @@
         int rc = RTTcpServerDestroy(pThis->pTcpServer);
         if (RT_FAILURE(rc))
-            RTMsgInfo("RTTcpServerDestroy failed in atsTcpNotifyReboot: %Rrc", rc);
+            LogRel(("RTTcpServerDestroy failed in atsTcpNotifyReboot: %Rrc", rc));
         pThis->pTcpServer = NULL;
     }
@@ -680 +683 @@
         int rc = RTTcpServerDestroy(pThis->pTcpServer);
         if (RT_FAILURE(rc))
-            RTMsgInfo("RTTcpServerDestroy failed in atsTcpTerm: %Rrc", rc);
+            LogRel(("RTTcpServerDestroy failed in atsTcpTerm: %Rrc", rc));
         pThis->pTcpServer        = NULL;
     }
@@ -735 +738 @@
             if (rc == VERR_NET_DOWN)
             {
-                RTMsgInfo("RTTcpServerCreateEx(%s, %u,) failed: %Rrc, retrying for 20 seconds...\n",
-                          pThis->szBindAddr[0] ? pThis->szBindAddr : NULL, pThis->uBindPort, rc);
+                LogRel2(("RTTcpServerCreateEx(%s, %u,) failed: %Rrc, retrying for 20 seconds...\n",
+                         pThis->szBindAddr[0] ? pThis->szBindAddr : NULL, pThis->uBindPort, rc));
                 uint64_t StartMs = RTTimeMilliTS();
                 do
@@ -745 +748 @@
                          && RTTimeMilliTS() - StartMs < 20000);
                 if (RT_SUCCESS(rc))
-                    RTMsgInfo("RTTcpServerCreateEx succceeded.\n");
+                    LogRel2(("RTTcpServerCreateEx succceeded\n"));
             }
 
             if (RT_FAILURE(rc))
             {
-                RTMsgError("RTTcpServerCreateEx(%s, %u,) failed: %Rrc\n",
-                           pThis->szBindAddr[0] ? pThis->szBindAddr : NULL, pThis->uBindPort, rc);
+                LogRel(("RTTcpServerCreateEx(%s, %u,) failed: %Rrc\n",
+                        pThis->szBindAddr[0] ? pThis->szBindAddr : NULL, pThis->uBindPort, rc));
             }
         }

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_AUDIO_TEST
+#include <iprt/log.h>
 
 #include <iprt/ctype.h>
@@ -526 +528 @@
     PAUDIOTESTENV   pTstEnv = pCtx->pTstEnv;
 
-    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Beginning test set '%s' in '%s'\n", pszTag, pTstEnv->szPathTemp);
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Beginning test set '%s' in '%s'\n", pszTag, pTstEnv->szPathTemp);
 
     return AudioTestSetCreate(&pTstEnv->Set, pTstEnv->szPathTemp, pszTag);
@@ -540 +542 @@
     PAUDIOTESTENV   pTstEnv = pCtx->pTstEnv;
 
-    RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Ending test set '%s'\n", pszTag);
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Ending test set '%s'\n", pszTag);
 
     /* Pack up everything to be ready for transmission. */

trunk/src/VBox/ValidationKit/utils/audio/vkatDriverStack.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_AUDIO_TEST
+#include <iprt/log.h>
+
 #include <iprt/errcore.h>
 #include <iprt/message.h>
@@ -854 +857 @@
         if (pDrvStack->pIAudioConnector)
         {
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Destroying stream '%s' (IAudioConnector) ...\n", pStream->Cfg.szName);
             int rc = pDrvStack->pIAudioConnector->pfnStreamDestroy(pDrvStack->pIAudioConnector, pStream, true /*fImmediate*/);
             if (RT_FAILURE(rc))
@@ -860 +864 @@
         else
         {
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Destroying stream '%s' (IHostAudio) ...\n", pStream->Cfg.szName);
             PAUDIOTESTDRVSTACKSTREAM pStreamAt = (PAUDIOTESTDRVSTACKSTREAM)pStream;
             int rc = pDrvStack->pIHostAudio->pfnStreamDestroy(pDrvStack->pIHostAudio, &pStreamAt->Backend, true /*fImmediate*/);
@@ -871 +876 @@
                 RTTestFailed(g_hTest, "PDMIHOSTAUDIO::pfnStreamDestroy failed: %Rrc", rc);
         }
+
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Destroying stream '%s' done\n", pStream->Cfg.szName);
     }
 }
@@ -1515 +1522 @@
     return VINF_SUCCESS;
 }
-