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

Timestamp:

Nov 12, 2008 4:16:50 AM (16 years ago)

Author:

vboxsync

Message:

per polling allocation of event array was replaced by on init allocation
sending event registration moved in initialization part

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (2 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (6 diffs)
• slirp/slirp_state.h (modified) (1 diff)

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

@@ -303 +303 @@
 # else /* RT_OS_WINDOWS */
         phEvents = slirp_get_events(pThis->pNATState);
-        phEvents[0] = pThis->hSendEvent;
         event = WSAWaitForMultipleEvents(nFDs, phEvents, FALSE, 2 /*ms*/, FALSE);
         AssertRelease(event != WSA_WAIT_FAILED);
@@ -696 +695 @@
 # else
             pThis->hSendEvent = WSACreateEvent();
+            slirp_register_external_event(pThis->pNATState, pThis->hSendEvent);
 # endif
 

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

@@ -51 +51 @@
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) 
 HANDLE *slirp_get_events(PNATState pData);
+HANDLE *slirp_register_external_event(PNATState pData, HANDLE hEvent);
 #endif
 #ifdef __cplusplus

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

@@ -222 +222 @@
         WSAStartup(MAKEWORD(2,0), &Data);
     }
+#ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+    /*XXX:probably should be configurable*/
+    pData->phEvents = malloc(sizeof(HANDLE) * pData->cMaxEvent);
+#endif
 #endif
 
@@ -307 +311 @@
          "\n"));
 #endif
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+    free(pData->phEvents);
+#endif
     free(pData);
 }
@@ -374 +381 @@
                  */
                 cElements = 1;
-                for (so = tcb.so_next; so != &tcb; so = so_next, cElements++) 
-                        so_next = so->so_next;
-                for (so = udb.so_next; so != &udb; so = so_next, cElements++)
-                        so_next = so->so_next;
-                if (pData->phEvents != NULL)
-                    free(pData->phEvents);
-                pData->phEvents = malloc(sizeof(HANDLE) * cElements);
 #endif
 
@@ -400 +400 @@
 
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+                        AssertRelease(cEvents >= pData->cMaxEvent);
                         WSAResetEvent(so->hNetworkEvent);
 #endif
@@ -501 +502 @@
 #else
                                 WSAResetEvent(so->hNetworkEvent);
+                                AssertRelease(cEvents >= pData->cMaxEvent);
                                 rc = WSAEventSelect(so->s, so->hNetworkEvent, FD_READ|FD_WRITE|FD_OOB|FD_ACCEPT);
                                 AssertRelease(rc != SOCKET_ERROR);
@@ -936 +938 @@
         return (pData->phEvents);
 }
-#endif
+HANDLE *slirp_register_external_event(PNATState pData, HANDLE hEvent)
+{
+        pData->phEvents[0] = hEvent;
+}
+#endif

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

@@ -117 +117 @@
     struct socket *udp_last_so;
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) 
+    int cMaxEvent;
     HANDLE *phEvents;
 #endif