Changeset 10740 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 18, 2008 10:00:56 AM (16 years ago)

Author:

vboxsync

Message:

Reduced the force of the scheduling/yield hack and make it not apply when the trunk is sending stuff.

Location:

trunk/src/VBox/Devices/Network

Files:

• SrvIntNetR0.cpp (modified) (5 diffs)
• testcase/tstIntNetR0.cpp (modified) (2 diffs)

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

@@ -604 +604 @@
  * Sends a frame to a specific interface.
  *
- * @param   pIf         The interface.
- * @param   pSG         The gather buffer which data is being sent to the interface.
- */
-static void intnetR0IfSend(PINTNETIF pIf, PINTNETSG pSG)
+ * @param   pIf             The interface.
+ * @param   pIfSender       The interface sending the frame. This is NULL if it's the trunk.
+ * @param   pSG             The gather buffer which data is being sent to the interface.
+ */
+static void intnetR0IfSend(PINTNETIF pIf, PINTNETIF pIfSender, PINTNETSG pSG)
 {
     LogFlow(("intnetR0IfSend: pIf=%p:{.hIf=%RX32}\n", pIf, pIf->hIf));
@@ -620 +621 @@
     }
 
-/** @todo we'll have to drop this I'm afraid since it'll screw up the host networking otherwise... */
+#if 0 /* This is bad stuff now as we're blocking while locking down the network.
+         we really shouldn't delay the network traffic on the host just because
+         some bugger isn't responding. Will have to deal with this in a different
+         manner if required. */
     /*
      * Retry a few times, yielding the CPU in between.
-     * But don't let a unresponsive VM harm performance, so give up after a short while.
+     * But don't let a unresponsive VM harm performance, so give up after a couple of tries.
      */
     if (pIf->cYields < 100)
     {
         unsigned cYields = 10;
-        do
+#else
+    /*
+     * Scheduling hack, for unicore machines primarily.
+     */
+    if (    pIf->cYields < 4 /* just twice */
+        &&  pIfSender /* but not if it's from the trunk */)
+    {
+        unsigned cYields = 2;
+#endif
+        while (--cYields > 0)
         {
             RTSemEventSignal(pIf->Event);
@@ -642 +655 @@
             }
             pIf->cYields++;
-        } while (--cYields > 0);
+        }
         STAM_REL_COUNTER_INC(&pIf->pIntBuf->cStatYieldsNok);
     }
@@ -751 +764 @@
     for (PINTNETIF pIf = pNetwork->pIFs; pIf; pIf = pIf->pNext)
         if (pIf != pIfSender)
-            intnetR0IfSend(pIf, pSG);
+            intnetR0IfSend(pIf, pIfSender, pSG);
 
     /*
@@ -816 +829 @@
         {
             fExactIntNetRecipient |= fIt;
-            intnetR0IfSend(pIf, pSG);
+            intnetR0IfSend(pIf, pIfSender, pSG);
         }
     }

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -43 +43 @@
 #include <iprt/time.h>
 #include <iprt/asm.h>
+#include <iprt/getopt.h>
 
 
@@ -381 +382 @@
 }
 
-int main()
-{
-
+int main(int argc, char **argv)
+{
     /*
-     * Init runtime and create an INTNET instance.
+     * Init the runtime and parse arguments.
      */
     RTR3Init();
-    RTPrintf("tstIntNetR0: TESTING...\n");
+
+    static RTOPTIONDEF const s_aOptions[] =
+    {
+        { "--recv-buffer",  'r', RTGETOPT_REQ_UINT32 },
+        { "--send-buffer",  's', RTGETOPT_REQ_UINT32 },
+    };
+
+    uint32_t cbRecv = 32 * _1K;
+    uint32_t cbSend = 1536*2;
+
+    int ch;
+    int iArg = 1;
+    RTOPTIONUNION Value;
+    while ((ch = RTGetOpt(argc,argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), &iArg, &Value)))
+        switch (ch)
+        {
+            case 'r':
+                cbRecv = Value.u32;
+                break;
+
+            case 's':
+                cbSend = Value.u32;
+                break;
+
+            default:
+                RTPrintf("tstIntNetR0: invalid argument: %s\n", Value.psz);
+                return 1;
+        }
+    if (iArg < argc)
+    {
+        RTPrintf("tstIntNetR0: invalid argument: %s\n", argv[iArg]);
+        return 1;
+    }
+
+    /*
+     * Create an INTNET instance.
+     */
+    RTPrintf("tstIntNetR0: TESTING cbSend=%d cbRecv=%d ...\n", cbSend, cbRecv);
     PINTNET pIntNet;
     int rc = INTNETR0Create(&pIntNet);