Changeset 49842 in vbox for trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

Timestamp:

Dec 9, 2013 1:49:46 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91186

Message:

DHCP/NAT and NAT are acting in the same manner: polling for events on main thread and waiting for packets on internal network on RECV thread. DHCP/Host-Only waits for packets on main thread.

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (9 diffs)

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -18 +18 @@
 #include "winutils.h"
 
+#include <VBox/com/assert.h>
 #include <VBox/com/com.h>
 #include <VBox/com/listeners.h>
@@ -26 +27 @@
 #include <VBox/com/errorprint.h>
 #include <VBox/com/VirtualBox.h>
-#include <VBox/com/NativeEventQueue.h>
 
 #include <iprt/net.h>
@@ -131 +131 @@
     int run();
     virtual int init(void);
-    /* @todo: when configuration would be really needed */
     virtual int parseOpt(int rc, const RTGETOPTUNION& getOptVal);
     /* VBoxNetNAT always needs Main */
@@ -151 +150 @@
     uint16_t m_u16Mtu;
     netif m_LwipNetIf;
-    /* thread where we're waiting for a frames, no semaphores needed */
-    RTTHREAD hThrIntNetRecv;
 
     /* Our NAT network descriptor in Main */
@@ -187 +184 @@
 INTNETSEG VBoxNetLwipNAT::aXmitSeg[64];
 
+/**
+ * @note: this work on Event thread.
+ */
 HRESULT VBoxNetLwipNAT::HandleEvent(VBoxEventType_T aEventType,
                                                   IEvent *pEvent)
@@ -515 +515 @@
 
 
-/**
- * Intnet-recv thread
- */
-int VBoxNetLwipNAT::intNetThreadRecv(RTTHREAD, void *)
-{
-    int rc = VINF_SUCCESS;
-
-    /* 1. initialization and connection */
-    HRESULT hrc = com::Initialize();
-    if (FAILED(hrc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to initialize COM!");
-
-    g_pLwipNat->doReceiveLoop();
-    /* 3. deinitilization and termination */
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-
 err_t VBoxNetLwipNAT::netifLinkoutput(netif *pNetif, pbuf *pPBuf)
 {
@@ -699 +680 @@
 
 
+/** This method executed on main thread, only at the end threr're one threads started explcitly (LWIP and later in ::run()
+ * RECV) 
+ */
 int VBoxNetLwipNAT::init()
 {
@@ -808 +792 @@
     }
 
+    /* this starts LWIP thread */
     vboxLwipCoreInitialize(VBoxNetLwipNAT::onLwipTcpIpInit, this);
-
-    rc = RTThreadCreate(&g_pLwipNat->hThrIntNetRecv, /* thread handle*/
-                        VBoxNetLwipNAT::intNetThreadRecv,  /* routine */
-                        NULL, /* user data */
-                        128 * _1K, /* stack size */
-                        RTTHREADTYPE_IO, /* type */
-                        0, /* flags, @todo: waitable ?*/
-                        "INTNET-RECV");
-    AssertRCReturn(rc,rc);
-
-
 
     LogFlowFuncLeaveRC(rc);
@@ -963 +937 @@
 int VBoxNetLwipNAT::run()
 {
-    /* EventQueue processing from VBoxHeadless.cpp */
-    com::NativeEventQueue         *gEventQ = NULL;
-    gEventQ = com::NativeEventQueue::getMainEventQueue();
-    while(true)
-    {
-        /* XXX:todo: graceful termination */
-        gEventQ->processEventQueue(0);
-        gEventQ->processEventQueue(500);
-    }
+    /* Father starts receiving thread and enter event loop. */
+    VBoxNetBaseService::run();
 
     vboxLwipCoreFinalize(VBoxNetLwipNAT::onLwipTcpIpFini, this);