Changeset 107317 in vbox

Timestamp:

Dec 13, 2024 1:21:33 PM (5 weeks ago)

Author:

vboxsync

Message:

UsbNet: bugref:10779 Public statistics, also added missing PDMUsbHlpSTAMRegisterF to pdmusb.h

Location:

trunk

Files:

• include/VBox/vmm/pdmusb.h (modified) (1 diff)
• src/VBox/Devices/Network/UsbNet.cpp (modified) (5 diffs)

trunk/include/VBox/vmm/pdmusb.h

@@ -1436 +1436 @@
 }
 
+/**
+ * Same as pfnSTAMRegister except that the name is specified in a
+ * RTStrPrintf like fashion.
+ *
+ * @param   pDevIns             Device instance of the DMA.
+ * @param   pvSample            Pointer to the sample.
+ * @param   enmType             Sample type. This indicates what pvSample is
+ *                              pointing at.
+ * @param   enmVisibility       Visibility type specifying whether unused
+ *                              statistics should be visible or not.
+ * @param   enmUnit             Sample unit.
+ * @param   pszDesc             Sample description.
+ * @param   pszName             Sample name format string, unix path style.  If
+ *                              this does not start with a '/', the default
+ *                              prefix will be prepended, otherwise it will be
+ *                              used as-is.
+ * @param   ...                 Arguments to the format string.
+ */
+DECLINLINE(void) RT_IPRT_FORMAT_ATTR(7, 8) PDMUsbHlpSTAMRegisterF(PPDMUSBINS pUsbIns, void *pvSample, STAMTYPE enmType,
+                                                                  STAMVISIBILITY enmVisibility, STAMUNIT enmUnit,
+                                                                  const char *pszDesc, const char *pszName, ...)
+{
+    va_list va;
+    va_start(va, pszName);
+    pUsbIns->pHlpR3->pfnSTAMRegisterV(pUsbIns, pvSample, enmType, enmVisibility, enmUnit, pszDesc, pszName, va);
+    va_end(va);
+}
+
 #endif /* IN_RING3 */
 

trunk/src/VBox/Devices/Network/UsbNet.cpp

@@ -416 +416 @@
     PVUSBURB                            pResetUrb;
 
+    STAMCOUNTER                         StatReceiveBytes;
+    STAMCOUNTER                         StatTransmitBytes;
+
     /**
      * LUN\#0 data.
@@ -1322 +1325 @@
     pUrb->cbData = (uint32_t)(sizeof(*pNth16) + sizeof(*pNdp16) + cb);
     usbNetLinkDone(pThis, pUrb);
+    STAM_REL_COUNTER_ADD(&pThis->StatReceiveBytes, cb);
     RTCritSectLeave(&pThis->CritSect);
 
@@ -1610 +1614 @@
                     if (RT_FAILURE(rc))
                         return usbNetCompleteStall(pThis, NULL, pUrb, "SendBuf failed");
+                    STAM_REL_COUNTER_ADD(&pThis->StatTransmitBytes, pDGram->wDatagramLength);
                 }
                 else
@@ -2201 +2206 @@
                                      "MAC|"
                                      "CableConnected|"
-                                     "LinkUpDelay|"
+                                     "LinkUpDelay"
                                      , "Config", "UsbNet", iInstance);
     if (RT_FAILURE(rc))
@@ -2286 +2291 @@
             AssertFailedReturn(VERR_INVALID_PARAMETER);
     }
+
+    /*
+     * Register statistics.
+     * The /Public/ bits are official and used by session info in the GUI.
+     */
+    PDMUsbHlpSTAMRegisterF(pUsbIns, &pThis->StatReceiveBytes,  STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_BYTES,
+                           "Amount of data received",    "/Public/NetAdapter/%u/BytesReceived", iInstance);
+    PDMUsbHlpSTAMRegisterF(pUsbIns, &pThis->StatTransmitBytes, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_BYTES,
+                           "Amount of data transmitted", "/Public/NetAdapter/%u/BytesTransmitted", iInstance);
+    PDMUsbHlpSTAMRegisterF(pUsbIns, &pUsbIns->iInstance,       STAMTYPE_U32,     STAMVISIBILITY_ALWAYS, STAMUNIT_NONE,
+                           "Device instance number",     "/Public/NetAdapter/%u/%s", iInstance, pUsbIns->pReg->szName);
 
     return VINF_SUCCESS;