Changeset 46300 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

May 28, 2013 3:31:18 PM (12 years ago)

Author:

vboxsync

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

86048

Message:

VMMDev: Fixed missing destructor call (not in function table, duh.) and integrated the testing output with RTTest.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (5 diffs)
• VMMDevState.h (modified) (3 diffs)
• VMMDevTesting.cpp (modified) (9 diffs)
• VMMDevTesting.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -3566 +3566 @@
  * @interface_method_impl{PDMDEVREG,pfnDestruct}
  */
-static DECLCALLBACK(int) vmmdevDestroy(PPDMDEVINS pDevIns)
+static DECLCALLBACK(int) vmmdevDestruct(PPDMDEVINS pDevIns)
 {
     PVMMDEV pThis = PDMINS_2_DATA(pDevIns, PVMMDEV);
@@ -3580 +3580 @@
         pThis->pCredentials = NULL;
     }
+
+#ifndef VBOX_WITHOUT_TESTING_FEATURES
+    /*
+     * Clean up the testing device.
+     */
+    vmmdevTestingTerminate(pDevIns);
+#endif
 
     return VINF_SUCCESS;
@@ -3672 +3679 @@
                                   "GuestCoreDumpDir|"
                                   "GuestCoreDumpCount|"
-                                  "TestingEnabled"
+                                  "TestingEnabled|"
+                                  "TestintXmlOutputFile"
                                   ,
                                   "");
@@ -3730 +3738 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed querying \"TestingEnabled\" as a boolean"));
+    rc = CFGMR3QueryStringAllocDef(pCfg, "TestintXmlOutputFile", &pThis->pszTestingXmlOutput, NULL);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed querying \"TestintXmlOutputFile\" as a string"));
     /** @todo image-to-load-filename? */
 #endif
@@ -3913 +3924 @@
     vmmdevConstruct,
     /* pfnDestruct */
-    NULL,
+    vmmdevDestruct,
     /* pfnRelocate */
     vmmdevRelocate,

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/vmm/pdmifs.h>
+#ifndef VBOX_WITHOUT_TESTING_FEATURES
+# include <iprt/test.h>
+#endif
 
 #define VMMDEV_WITH_ALT_TIMESYNC
@@ -348 +351 @@
         } Value;
     } TestingData;
+    /** The XML output file name (can be a named pipe, doesn't matter to us). */
+    R3PTRTYPE(char *)       pszTestingXmlOutput;
+    /** Testing instance for dealing with the output. */
+    RTTEST                  hTestingTest;
 #endif /* !VBOX_WITHOUT_TESTING_FEATURES */
 } VMMDevState;

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp

@@ -32 +32 @@
 #include <iprt/string.h>
 #include <iprt/time.h>
-#ifdef IN_RING3
-# include <iprt/stream.h>
-#endif
+#include <iprt/test.h>
 
 #include "VMMDevState.h"
@@ -47 +45 @@
         LogAlways(a);\
         LogRel(a);\
-        RTPrintf a; \
     } while (0)
 
@@ -235 +232 @@
                         {
 #ifdef IN_RING3
+                            pThis->TestingData.String.sz[off] = '\0';
                             switch (uCmd)
                             {
                                 case VMMDEV_TESTING_CMD_INIT:
-                                    VMMDEV_TESTING_OUTPUT(("testing: INIT '%.*s'\n",
-                                                           sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz));
+                                    VMMDEV_TESTING_OUTPUT(("testing: INIT '%s'\n", pThis->TestingData.String.sz));
+                                    RTTestChangeName(pThis->hTestingTest, pThis->TestingData.String.sz);
+                                    RTTestBanner(pThis->hTestingTest);
                                     break;
                                 case VMMDEV_TESTING_CMD_SUB_NEW:
-                                    VMMDEV_TESTING_OUTPUT(("testing: SUB_NEW  '%.*s'\n",
-                                                           sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz));
+                                    VMMDEV_TESTING_OUTPUT(("testing: SUB_NEW  '%s'\n", pThis->TestingData.String.sz));
+                                    RTTestSub(pThis->hTestingTest, pThis->TestingData.String.sz);
                                     break;
                                 case VMMDEV_TESTING_CMD_FAILED:
-                                    VMMDEV_TESTING_OUTPUT(("testing: FAILED '%.*s'\n",
-                                                           sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz));
+                                    RTTestFailed(pThis->hTestingTest, "%s", pThis->TestingData.String.sz);
+                                    VMMDEV_TESTING_OUTPUT(("testing: FAILED '%s'\n", pThis->TestingData.String.sz));
                                     break;
                                 case VMMDEV_TESTING_CMD_SKIPPED:
-                                    VMMDEV_TESTING_OUTPUT(("testing: SKIPPED '%.*s'\n",
-                                                           sizeof(pThis->TestingData.String.sz) - 1, pThis->TestingData.String.sz));
+                                    if (off)
+                                        RTTestSkipped(pThis->hTestingTest, "%s", pThis->TestingData.String.sz);
+                                    else
+                                        RTTestSkipped(pThis->hTestingTest, NULL);
+                                    VMMDEV_TESTING_OUTPUT(("testing: SKIPPED '%s'\n", pThis->TestingData.String.sz));
                                     break;
                             }
@@ -270 +272 @@
                         pThis->TestingData.Error.c = u32;
                         if (uCmd == VMMDEV_TESTING_CMD_TERM)
+                        {
+                            while (RTTestErrorCount(pThis->hTestingTest) < u32)
+                                RTTestErrorInc(pThis->hTestingTest); /* A bit stupid, but does the trick. */
+                            RTTestSubDone(pThis->hTestingTest);
                             VMMDEV_TESTING_OUTPUT(("testing: TERM - %u errors\n", u32));
+                        }
                         else
+                        {
+                            while (RTTestSubErrorCount(pThis->hTestingTest) < u32)
+                                RTTestErrorInc(pThis->hTestingTest); /* A bit stupid, but does the trick. */
+                            RTTestSubDone(pThis->hTestingTest);
                             VMMDEV_TESTING_OUTPUT(("testing: SUB_DONE - %u errors\n", u32));
+                        }
                         return VINF_SUCCESS;
 #else
@@ -296 +308 @@
                     if (   off >= 12
                         && cb  == 1
-                        && off < sizeof(pThis->TestingData.Value.szName) - 1 - 12)
+                        && off - 12 < sizeof(pThis->TestingData.Value.szName) - 1)
                     {
                         if (u32)
@@ -306 +318 @@
                         {
 #ifdef IN_RING3
-                            VMMDEV_TESTING_OUTPUT(("testing: VALUE '%.*s'%*s: %'9llu (%#llx) [%u]\n",
-                                                   sizeof(pThis->TestingData.Value.szName) - 1, pThis->TestingData.Value.szName,
+                            pThis->TestingData.Value.szName[off - 12] = '\0';
+
+                            RTTESTUNIT enmUnit = (RTTESTUNIT)pThis->TestingData.Value.u32Unit;
+                            if (enmUnit <= RTTESTUNIT_INVALID || enmUnit >= RTTESTUNIT_END)
+                            {
+                                VMMDEV_TESTING_OUTPUT(("Invalid log value unit %#x\n", pThis->TestingData.Value.u32Unit));
+                                enmUnit = RTTESTUNIT_NONE;
+                            }
+                            RTTestValue(pThis->hTestingTest, pThis->TestingData.Value.szName,
+                                        pThis->TestingData.Value.u64Value.u, enmUnit);
+
+                            VMMDEV_TESTING_OUTPUT(("testing: VALUE '%s'%*s: %'9llu (%#llx) [%u]\n",
+                                                   pThis->TestingData.Value.szName,
                                                    off - 12 > 48 ? 0 : 48 - (off - 12), "",
                                                    pThis->TestingData.Value.u64Value.u, pThis->TestingData.Value.u64Value.u,
@@ -316 +339 @@
                         }
                         return VINF_SUCCESS;
-
-#ifdef IN_RING3
-                        pThis->TestingData.Error.c = u32;
-                        if (uCmd == VMMDEV_TESTING_CMD_TERM)
-                            VMMDEV_TESTING_OUTPUT(("testing: TERM - %u errors\n", u32));
-                        else
-                            VMMDEV_TESTING_OUTPUT(("testing: SUB_DONE - %u errors\n", u32));
-                        return VINF_SUCCESS;
-#else
-                        return VINF_IOM_R3_IOPORT_WRITE;
-#endif
                     }
                     break;
@@ -443 +455 @@
  * @param   pDevIns             The VMMDev device instance.
  */
+void vmmdevTestingTerminate(PPDMDEVINS pDevIns)
+{
+    VMMDevState *pThis = PDMINS_2_DATA(pDevIns, VMMDevState *);
+    if (!pThis->fTestingEnabled)
+        return;
+
+    if (pThis->hTestingTest != NIL_RTTEST)
+    {
+        RTTestSummaryAndDestroy(pThis->hTestingTest);
+        pThis->hTestingTest = NIL_RTTEST;
+    }
+}
+
+
+/**
+ * Initializes the testing part of the VMMDev if enabled.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns             The VMMDev device instance.
+ */
 int vmmdevTestingInitialize(PPDMDEVINS pDevIns)
 {
@@ -496 +528 @@
     }
 
+    /*
+     * Open the XML output file(/pipe/whatever) if specfied.
+     */
+    rc = RTTestCreateEx("VMMDevTesting", RTTEST_C_USE_ENV | RTTEST_C_NO_TLS | RTTEST_C_XML_DELAY_TOP_TEST,
+                        RTTESTLVL_INVALID, -1 /*iNativeTestPipe*/, pThis->pszTestingXmlOutput, &pThis->hTestingTest);
+    if (RT_FAILURE(rc))
+        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS, "Error creating testing instance");
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.h

@@ -25 +25 @@
 RT_C_DECLS_BEGIN
 
-int vmmdevTestingInitialize(PPDMDEVINS pDevIns);
+int  vmmdevTestingInitialize(PPDMDEVINS pDevIns);
+void vmmdevTestingTerminate(PPDMDEVINS pDevIns);
 
 RT_C_DECLS_END