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

Timestamp:

May 28, 2019 2:30:02 PM (6 years ago)

Author:

vboxsync

Message:

ValKit/NetPerf: Adding -buffer-size/-b option for setting socket receive & send buffer sizes. bugref:9474

File:

• trunk/src/VBox/ValidationKit/utils/network/NetPerf.cpp (modified) (8 diffs)

trunk/src/VBox/ValidationKit/utils/network/NetPerf.cpp

@@ -86 +86 @@
 #define NETPERF_MIN_COOL_DOWN                   1000  /*  1s */
 
+/** Maximum socket buffer size possible (bytes). */
+#define NETPERF_MAX_BUF_SIZE                    _128M
+/** Minimum socket buffer size possible (bytes). */
+#define NETPERF_MIN_BUF_SIZE                    256
+
 /** The length of the length prefix used when submitting parameters and
  * results. */
@@ -142 +147 @@
     /** Server: Quit after the first client. */
     bool            fSingleClient;
+    /** Send and receive buffer sizes for TCP sockets, zero if to use defaults. */
+    uint32_t        cbBufferSize;
     /** @} */
 
@@ -235 +242 @@
     { "--check-data",       'C', RTGETOPT_REQ_NOTHING },
     { "--verbose",          'v', RTGETOPT_REQ_NOTHING },
+    { "--buffer-size",      'b', RTGETOPT_REQ_UINT32  },
     { "--help",             'h', RTGETOPT_REQ_NOTHING } /* for Usage() */
 };
@@ -303 +311 @@
             case 'C':
                 pszHelp = "Check payload data at the receiving end";
+                break;
+            case 'b':
+                pszHelp = "Send and receive buffer sizes for TCP";
                 break;
             case 'v':
@@ -1136 +1147 @@
         RTTestIPrintf(RTTESTLVL_ALWAYS, "Failed to get client details: %Rrc\n", rc);
         Addr.enmType = RTNETADDRTYPE_INVALID;
+    }
+
+    /*
+     * Adjust send and receive buffer sizes if necessary.
+     */
+    if (pParams->cbBufferSize)
+    {
+        rc = RTTcpSetBufferSize(hSocket, pParams->cbBufferSize);
+        if (RT_FAILURE(rc))
+            return RTTestIFailedRc(rc, "Failed to set socket buffer sizes to %#x: %Rrc\n", pParams->cbBufferSize, rc);
     }
 
@@ -1639 +1660 @@
 
     /*
+     * Adjust send and receive buffer sizes if necessary.
+     */
+    if (pParams->cbBufferSize)
+    {
+        rc = RTTcpSetBufferSize(hSocket, pParams->cbBufferSize);
+        if (RT_FAILURE(rc))
+            return RTTestIFailedRc(rc, "Failed to set socket buffer sizes to %#x: %Rrc\n", pParams->cbBufferSize, rc);
+    }
+
+    /*
      * Verify the super secret Start Connect Id to start the connection.
      */
@@ -1794 +1825 @@
     Params.cMsCoolDown      = NETPERF_DEFAULT_COOL_DOWN;
     Params.cbPacket         = NETPERF_DEFAULT_PKT_SIZE_LATENCY;
+    Params.cbBufferSize     = 0;
 
     Params.hSocket          = NIL_RTSOCKET;
@@ -1922 +1954 @@
                 break;
 
+            case 'b':
+                Params.cbBufferSize = ValueUnion.u32;
+                if (   (    Params.cbBufferSize < NETPERF_MIN_BUF_SIZE
+                         || Params.cbBufferSize > NETPERF_MAX_BUF_SIZE)
+                    && Params.cbBufferSize  != 0)
+                {
+                    RTTestFailed(g_hTest, "Invalid packet size %u bytes, valid range: %u-%u or 0\n",
+                                 Params.cbBufferSize, NETPERF_MIN_BUF_SIZE, NETPERF_MAX_BUF_SIZE);
+                    return RTTestSummaryAndDestroy(g_hTest);
+                }
+                break;
+
             default:
                 return RTGetOptPrintError(rc, &ValueUnion);