Changeset 89642 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 13, 2021 1:38:33 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145087

Message:

ValKit/Audio: g_aCommands -> g_apCommands to avoid having the compiler generate initialization code for copying g_CmdEnum, g_CmdPlay, g_CmdRec and g_CmdSelfTest into the array. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (10 diffs)
• vkatCmdGeneric.cpp (modified) (3 diffs)
• vkatCmdSelfTest.cpp (modified) (1 diff)
• vkatInternal.h (modified) (1 diff)

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

@@ -734 +734 @@
 
 
+const VKATCMD g_CmdTest =
+{
+    "test",
+    audioTestMain,
+    "Runs audio tests and creates an audio test set.",
+    g_aCmdTestOptions,
+    RT_ELEMENTS(g_aCmdTestOptions),
+    audioTestCmdTestHelp
+};
+
+
 /*********************************************************************************************************************************
 *   Command: verify                                                                                                              *
@@ -895 +906 @@
 
 
+const VKATCMD g_CmdVerify =
+{
+    "verify",
+    audioVerifyMain,
+    "Verifies a formerly created audio test set.",
+    g_aCmdVerifyOptions,
+    RT_ELEMENTS(g_aCmdVerifyOptions),
+    NULL,
+};
+
+
 /*********************************************************************************************************************************
 *   Main                                                                                                                         *
@@ -914 +936 @@
 }
 
-const VKATCMD g_aCommands[] =
-{
-    {
-        "test",     audioTestMain,
-        "Runs audio tests and creates an audio test set.",
-        g_aCmdTestOptions,      RT_ELEMENTS(g_aCmdTestOptions),     audioTestCmdTestHelp
-    },
-    {
-        "verify",   audioVerifyMain,
-        "Verifies a formerly created audio test set.",
-        g_aCmdVerifyOptions,    RT_ELEMENTS(g_aCmdVerifyOptions),   NULL,
-    },
-    g_cmdEnum,
-    g_cmdPlay,
-    g_cmdRec,
-    g_cmdSelfTest
+/**
+ * Commands.
+ */
+const VKATCMD *g_apCommands[] =
+{
+    &g_CmdTest,
+    &g_CmdVerify,
+    &g_CmdEnum,
+    &g_CmdPlay,
+    &g_CmdRec,
+    &g_CmdSelfTest
 };
 
@@ -956 +973 @@
                  );
 
-    for (uintptr_t iCmd = 0; iCmd < RT_ELEMENTS(g_aCommands); iCmd++)
-    {
+    for (uintptr_t iCmd = 0; iCmd < RT_ELEMENTS(g_apCommands); iCmd++)
+    {
+        PCVKATCMD const pCmd = g_apCommands[iCmd];
         RTStrmPrintf(pStrm,
                      "\n"
@@ -963 +981 @@
                      "    %s\n"
                      "Options for '%s':\n",
-                     g_aCommands[iCmd].pszCommand, g_aCommands[iCmd].pszDesc, g_aCommands[iCmd].pszCommand);
-        PCRTGETOPTDEF const paOptions = g_aCommands[iCmd].paOptions;
-        for (unsigned i = 0; i < g_aCommands[iCmd].cOptions; i++)
+                     pCmd->pszCommand, pCmd->pszDesc, pCmd->pszCommand);
+        PCRTGETOPTDEF const paOptions = pCmd->paOptions;
+        for (unsigned i = 0; i < pCmd->cOptions; i++)
         {
             if (RT_C_IS_PRINT(paOptions[i].iShort))
@@ -973 +991 @@
 
             const char *pszHelp = NULL;
-            if (g_aCommands[iCmd].pfnOptionHelp)
-                pszHelp = g_aCommands[iCmd].pfnOptionHelp(&paOptions[i]);
+            if (pCmd->pfnOptionHelp)
+                pszHelp = pCmd->pfnOptionHelp(&paOptions[i]);
             if (pszHelp)
                 RTStrmPrintf(pStrm, "    %s\n", pszHelp);
@@ -1075 +1093 @@
             case VINF_GETOPT_NOT_OPTION:
             {
-                for (uintptr_t i = 0; i < RT_ELEMENTS(g_aCommands); i++)
-                    if (strcmp(ValueUnion.psz, g_aCommands[i].pszCommand) == 0)
+                for (uintptr_t iCmd = 0; iCmd < RT_ELEMENTS(g_apCommands); iCmd++)
+                {
+                    PCVKATCMD const pCmd = g_apCommands[iCmd];
+                    if (strcmp(ValueUnion.psz, pCmd->pszCommand) == 0)
                     {
-                        size_t const cCombinedOptions  = g_aCommands[i].cOptions + RT_ELEMENTS(g_aCmdCommonOptions);
+                        size_t const cCombinedOptions  = pCmd->cOptions + RT_ELEMENTS(g_aCmdCommonOptions);
                         PRTGETOPTDEF paCombinedOptions = (PRTGETOPTDEF)RTMemAlloc(cCombinedOptions * sizeof(RTGETOPTDEF));
                         if (paCombinedOptions)
@@ -1084 +1104 @@
                             memcpy(paCombinedOptions, g_aCmdCommonOptions, sizeof(g_aCmdCommonOptions));
                             memcpy(&paCombinedOptions[RT_ELEMENTS(g_aCmdCommonOptions)],
-                                   g_aCommands[i].paOptions, g_aCommands[i].cOptions * sizeof(RTGETOPTDEF));
+                                   pCmd->paOptions, pCmd->cOptions * sizeof(RTGETOPTDEF));
 
                             rc = RTGetOptInit(&GetState, argc, argv, paCombinedOptions, cCombinedOptions,
@@ -1091 +1111 @@
                             {
 
-                                rcExit = g_aCommands[i].pfnHandler(&GetState);
+                                rcExit = pCmd->pfnHandler(&GetState);
                                 RTMemFree(paCombinedOptions);
                                 return rcExit;
@@ -1099 +1119 @@
                         return RTMsgErrorExitFailure("Out of memory!");
                     }
+                }
                 RTMsgError("Unknown command '%s'!\n", ValueUnion.psz);
                 audioTestUsage(g_pStdErr);

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

@@ -149 +149 @@
  * Command table entry for 'enum'.
  */
-const VKATCMD g_cmdEnum =
+const VKATCMD g_CmdEnum =
 {
     "enum",
@@ -478 +478 @@
  * Command table entry for 'play'.
  */
-const VKATCMD g_cmdPlay =
+const VKATCMD g_CmdPlay =
 {
     "play",
@@ -858 +858 @@
  * Command table entry for 'rec'.
  */
-const VKATCMD g_cmdRec =
+const VKATCMD g_CmdRec =
 {
     "rec",

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

@@ -329 +329 @@
 }
 
-const VKATCMD g_cmdSelfTest =
-{
-    "selftest", audioTestCmdSelftestHandler,
+/**
+ * Command table entry for 'selftest'.
+ */
+const VKATCMD g_CmdSelfTest =
+{
+    "selftest",
+    audioTestCmdSelftestHandler,
     "Performs self-tests.",
-    s_aCmdSelftestOptions,  RT_ELEMENTS(s_aCmdSelftestOptions), audioTestCmdSelftestHelp,
+    s_aCmdSelftestOptions,
+    RT_ELEMENTS(s_aCmdSelftestOptions),
+    audioTestCmdSelftestHelp,
 };
 

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -363 +363 @@
     DECLCALLBACKMEMBER(const char *, pfnOptionHelp,(PCRTGETOPTDEF pOpt));
 } VKATCMD;
-/** Pointer to a single VKAT command. */
-typedef VKATCMD *PVKATCMD;
-
-extern const VKATCMD g_cmdEnum;
-extern const VKATCMD g_cmdPlay;
-extern const VKATCMD g_cmdRec;
-extern const VKATCMD g_cmdSelfTest;
+/** Pointer to a const VKAT command entry. */
+typedef VKATCMD const *PCVKATCMD;
+
+extern const VKATCMD g_CmdEnum;
+extern const VKATCMD g_CmdPlay;
+extern const VKATCMD g_CmdRec;
+extern const VKATCMD g_CmdSelfTest;
 
 extern AUDIOTESTDESC g_aTests[];