Changeset 14159 in vbox

Timestamp:

Nov 13, 2008 6:30:22 AM (16 years ago)

Author:

vboxsync

Message:

registration several sockets per event, to avoid artificial barrier with
WSA_MAXIMUM_WAIT_EVENTS (64). Currently registered 64 sockets per event.
should work fine ;)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (9 diffs)
• socket.c (modified) (2 diffs)
• socket.h (modified) (1 diff)
• tcp_input.c (modified) (1 diff)
• tcp_subr.c (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -200 +200 @@
 {
     int fNATfailed = 0;
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+    int i;
+#endif
     PNATState pData = malloc(sizeof(NATState));
     *ppData = pData;
@@ -224 +227 @@
 #ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
     /*XXX:probably should be configurable*/
-    pData->cMaxEvent = 256;
+    pData->cMaxEvent = WSA_MAXIMUM_WAIT_EVENTS;
     pData->phEvents = malloc(sizeof(HANDLE) * pData->cMaxEvent);
+    for (i = 1; i < WSA_MAXIMUM_WAIT_EVENTS; ++i) {
+            pData->phEvents[i] = CreateEvent(NULL, FALSE, FALSE, NULL);
+    }
 #endif
 #endif
@@ -402 +408 @@
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
                         AssertRelease(cEvents < pData->cMaxEvent);
-                        WSAResetEvent(so->hNetworkEvent);
 #endif
                         /*
@@ -504 +509 @@
                                 UPD_NFDS(so->s);
 #else
-                                WSAResetEvent(so->hNetworkEvent);
                                 AssertRelease(cEvents < pData->cMaxEvent);
                                 rc = WSAEventSelect(so->s, so->hNetworkEvent, FD_READ|FD_WRITE|FD_OOB|FD_ACCEPT);
@@ -631 +635 @@
                                 if (so->so_state & SS_FACCEPTCONN) {
                                         tcp_connect(pData, so);
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                                        WSAResetEvent(so->hNetworkEvent);
-#endif
                                         continue;
                                 } /* else */
@@ -670 +671 @@
                               if (errno == EAGAIN || errno == EWOULDBLOCK ||
                                   errno == EINPROGRESS || errno == ENOTCONN) {
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                                        WSAResetEvent(so->hNetworkEvent);
-#endif
                                 continue;
                               }
@@ -709 +707 @@
                             if (errno == EAGAIN || errno == EWOULDBLOCK ||
                                 errno == EINPROGRESS || errno == ENOTCONN) {
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                              WSAResetEvent(so->hNetworkEvent);
-#endif
                               continue; /* Still connecting, continue */
                             }
@@ -725 +720 @@
                               if (errno == EAGAIN || errno == EWOULDBLOCK ||
                                   errno == EINPROGRESS || errno == ENOTCONN) {
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                                WSAResetEvent(so->hNetworkEvent);
-#endif
                                 continue;
                                 }
@@ -759 +751 @@
 #endif
                             sorecvfrom(pData, so);
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                                WSAResetEvent(so->hNetworkEvent);
-#endif
                         }
                 }

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

@@ -60 +60 @@
     so->so_state = SS_NOFDREF;
     so->s = -1;
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-    so->hNetworkEvent = WSACreateEvent(); /*XXX: NOT correct place*/
-    AssertRelease(so->hNetworkEvent != WSA_INVALID_EVENT);
-#endif
   }
   return(so);
@@ -740 +736 @@
 }
 
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+void soregister_event(struct NATState *pData, struct socket *so)
+{
+        static int soidx;
+        static int eidx = 1;
+        
+        if (soidx >= WSA_MAXIMUM_WAIT_EVENTS * eidx) {
+                eidx++;
+        }
+        so->hNetworkEvent = pData->phEvents[eidx];
+        soidx++;
+}
+#endif

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

@@ -104 +104 @@
 void soisfdisconnected _P((struct socket *));
 void sofwdrain _P((struct socket *));
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+void soregister_event _P((PNATState, struct socket *));
+#endif
 
 #endif /* _SOCKET_H_ */

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

@@ -391 +391 @@
             goto dropwithreset;
           }
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+          soregister_event(pData, so);
+#endif
 
           sbreserve(&so->so_snd, tcp_sndspace);

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

@@ -466 +466 @@
                         return;
                 }
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+                soregister_event(pData, so);
+#endif
                 so->so_laddr = inso->so_laddr;
                 so->so_lport = inso->so_lport;

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

@@ -636 +636 @@
                 return NULL;
         }
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
+        soregister_event(pData, so);
+#endif
         so->s = socket(AF_INET,SOCK_DGRAM,0);
         so->so_expire = curtime + SO_EXPIRE;