Changeset 15266 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 10, 2008 5:21:43 PM (16 years ago)

Author:

vboxsync

Message:

slirp: don't try to receive ICMP every time but only if the event is active

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (1 diff)
• slirp/libslirp.h (modified) (3 diffs)
• slirp/slirp.c (modified) (3 diffs)

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

@@ -372 +372 @@
         {
             /* only check for slow/fast timers */
-            slirp_select_poll(pThis->pNATState, NULL, NULL, NULL);
+            slirp_select_poll(pThis->pNATState, /* fTimeout=*/true, /*fIcmp=*/false);
             continue;
         }
 
         /* poll the sockets in any case */
-        slirp_select_poll(pThis->pNATState, &ReadFDs, &WriteFDs, &XcptFDs);
+        slirp_select_poll(pThis->pNATState, /* fTimeout=*/false, /* fIcmp=*/(event == WSA_WAIT_EVENT_0));
         /* process _all_ outstanding requests but don't wait */
         RTReqProcess(pThis->pReqQueue, 0);

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -36 +36 @@
                        fd_set *readfds, fd_set *writefds, fd_set *xfds);
 
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC)
+void slirp_select_poll(PNATState pData, int fTimeout, int fIcmp);
+#else
 void slirp_select_poll(PNATState pData, fd_set *readfds, fd_set *writefds, fd_set *xfds);
+#endif
 
 void slirp_input(PNATState pData, const uint8_t *pkt, int pkt_len);
@@ -51 +55 @@
 
 #if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) 
+
+# ifdef VBOX_WITH_SLIRP_ICMP
+
+/*
+ * ICMP handle state change
+ */
+#define VBOX_ICMP_EVENT_INDEX           0
+
 /**
  * This event is for
@@ -57 +69 @@
  *  - slirp_link_down
  *  - wakeup
- *
- * The event index should be smaller than VBOX_SOCKET_EVENT_INDEX to ensure
- * that we can detect if that event was set (WSAWaitForMultipleEvents()
- * returns the index of the first active event).
  */
-#define VBOX_WAKEUP_EVENT_INDEX         0
+#  define VBOX_WAKEUP_EVENT_INDEX       1
 
 /*
  * UDP/TCP socket state change (socket ready to receive, to send, ...)
  */
-#define VBOX_SOCKET_EVENT_INDEX         1
-
-#ifdef VBOX_WITH_SLIRP_ICMP
-/*
- * ICMP handle state change
- */
-#define VBOX_ICMP_EVENT_INDEX         2
+#  define VBOX_SOCKET_EVENT_INDEX       2
 
 /*
  * The number of events for WSAWaitForMultipleEvents().
  */
-#define VBOX_EVENT_COUNT                3
-#else
-/*
- * The number of events for WSAWaitForMultipleEvents().
- */
-#define VBOX_EVENT_COUNT                2
+#  define VBOX_EVENT_COUNT              3
 
-#endif
+# else
+
+#  define VBOX_WAKEUP_EVENT_INDEX       0
+#  define VBOX_SOCKET_EVENT_INDEX       1
+#  define VBOX_EVENT_COUNT              2
+
+# endif
 
 HANDLE *slirp_get_events(PNATState pData);

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -654 +654 @@
 }
 
+#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+void slirp_select_poll(PNATState pData, int fTimeout, int fIcmp)
+#else
 void slirp_select_poll(PNATState pData, fd_set *readfds, fd_set *writefds, fd_set *xfds)
+#endif
 {
     struct socket *so, *so_next;
@@ -700 +704 @@
     }
 #if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-    if (!readfds && !writefds && !xfds)
+    if (fTimeout)
         return; /* only timer update */
 #endif
@@ -908 +912 @@
 #if defined(VBOX_WITH_SLIRP_ICMP)
 # if defined(RT_OS_WINDOWS)
-        sorecvfrom(pData, &pData->icmp_socket);
+        if (fIcmp)
+            sorecvfrom(pData, &pData->icmp_socket);
 # else
         if (pData->icmp_socket.s != -1 && FD_ISSET(pData->icmp_socket.s, readfds))