Changeset 98082 in vbox

Timestamp:

Jan 15, 2023 1:59:48 AM (2 years ago)

Author:

vboxsync

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

155214

Message:

Main/ConsoleImpl: Optimized the getDeviceActivity code a little by replacing two std::vector objects with fixed sized arrays of 8 elements each. To facilitate this DeviceType got a new final 'End' value added. Also missing validation of the aType values. Result is ~30% smaller code. bugref:9892

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (3 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1325 +1325 @@
     <const name="Graphics3D"        value="7">
       <desc>Graphics device 3D activity.</desc>
+    </const>
+    <const name="End"               value="8">
+      <desc>End of valid device types (exclusive).  Used for invalid validation and such.</desc>
     </const>
   </enum>

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -2832 +2832 @@
      */
 
-    std::vector<bool> aWanted;
-    std::vector<PDMLEDCORE> aLED;
-    DeviceType_T maxWanted = (DeviceType_T) 0;
-    DeviceType_T enmType;
-
     /* Make a roadmap of which DeviceType_T LED types are wanted */
+    DeviceType_T maxWanted = (DeviceType_T)0;
+    bool aWanted[DeviceType_End] = { 0 };
+    Assert(aWanted[1] == false && aWanted[DeviceType_End - 1] == false);
+
     for (size_t iType = 0; iType < aType.size(); ++iType)
     {
-        enmType = aType[iType];
+        DeviceType_T const enmType = aType[iType];
+        AssertReturn(enmType > DeviceType_Null && enmType < DeviceType_End,
+                     setError(E_INVALIDARG, tr("Invalid DeviceType for getDeviceActivity in entry #%u: %d"), iType, enmType));
+        aWanted[enmType] = true;
         if (enmType > maxWanted)
-        {
             maxWanted = enmType;
-            aWanted.resize(maxWanted + 1);
-        }
-        aWanted[enmType] = true;
-    }
-    aLED.resize(maxWanted + 1);
+    }
+
+    /* Resize the result vector before making changes (may throw, paranoia). */
+    aActivity.resize(aType.size());
 
     /* Collect all the LEDs in a single sweep through all drivers' sets */
+    PDMLEDCORE aLEDs[DeviceType_End] = { {0} };
+    Assert(aLEDs[1].u32 == 0 && aLEDs[DeviceType_End / 2].u32 == 0 && aLEDs[DeviceType_End - 1].u32 == 0); /* paranoia */
     for (uint32_t idxSet = 0; idxSet < mcLedSets; ++idxSet)
     {
@@ -2861 +2863 @@
             for (uint32_t inSet = 0; inSet < pLS->cLeds; ++inSet)
             {
-                enmType = pLS->paSubTypes[inSet];
+                DeviceType_T const enmType = pLS->paSubTypes[inSet];
                 if (enmType < maxWanted && aWanted[enmType])
-                    aLED[enmType].u32 |= readAndClearLed(pLS->papLeds[inSet]);
+                    aLEDs[enmType].u32 |= readAndClearLed(pLS->papLeds[inSet]);
             }
         }
@@ -2869 +2871 @@
         else
         {
-            enmType = pLS->enmType;
+            DeviceType_T const enmType = pLS->enmType;
             if (enmType < maxWanted && aWanted[enmType])
                 for (uint32_t inSet = 0; inSet < pLS->cLeds; ++inSet)
-                    aLED[enmType].u32 |= readAndClearLed(pLS->papLeds[inSet]);
-        }
-    }
-
-    aActivity.resize(aType.size());
+                    aLEDs[enmType].u32 |= readAndClearLed(pLS->papLeds[inSet]);
+        }
+    }
+
+    /* Compose the result vector: */
     for (size_t iType = 0; iType < aActivity.size(); ++iType)
     {
-        /* Compose the result */
-        switch (aLED[aType[iType]].u32 & (PDMLED_READING | PDMLED_WRITING))
+        switch (aLEDs[aType[iType]].u32 & (PDMLED_READING | PDMLED_WRITING))
         {
             case 0:

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -671 +671 @@
     Assert(cLeds > 0);
     Assert(cLeds < 1024);  /* Adjust if any driver supports >=1024 units! */
+    Assert(enmType > DeviceType_Null && enmType < DeviceType_End);
 
     /* Grab a LED set entry before we start allocating anything so the destructor can do the cleanups. */