Changeset 49842 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

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

Author:

vboxsync

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.

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• VBoxNetBaseService.cpp (modified) (9 diffs)
• VBoxNetBaseService.h (modified) (4 diffs)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -29 +29 @@
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint.h>
-#include <VBox/com/EventQueue.h>
 #include <VBox/com/VirtualBox.h>
+#include <VBox/com/NativeEventQueue.h>
 
 #include <iprt/alloca.h>
@@ -44 +44 @@
 #include <iprt/string.h>
 #include <iprt/time.h>
+#include <iprt/thread.h>
 #include <iprt/mem.h>
 #include <iprt/message.h>
@@ -83 +84 @@
       m_pIfBuf(NULL),
       m_cVerbosity(0),
-      m_fNeedMain(false)
+      m_fNeedMain(false),
+      m_EventQ(NULL),
+      m_hThrRecv(NIL_RTTHREAD),
+      fShutdown(false)
     {
         int rc = RTCritSectInit(&m_csThis);
@@ -113 +117 @@
     /* Controls whether service will connect SVC for runtime needs */
     bool                m_fNeedMain;
+    /* Event Queue */
+    com::NativeEventQueue  *m_EventQ;
+
+    /** receiving thread, used only if main is used */
+    RTTHREAD m_hThrRecv;
+
+    bool fShutdown;
+    static int recvLoop(RTTHREAD, void *);
 };
 
@@ -133 +145 @@
 
 
+int VBoxNetBaseService::Data::recvLoop(RTTHREAD, void *pvUser)
+{
+    VBoxNetBaseService *pThis = static_cast<VBoxNetBaseService *>(pvUser);
+
+    HRESULT hrc = com::Initialize();
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    pThis->doReceiveLoop();
+
+    return VINF_SUCCESS;
+}
+
+
 VBoxNetBaseService::VBoxNetBaseService(const std::string& aName, const std::string& aNetworkName):m(NULL)
 {
@@ -149 +174 @@
     if (m != NULL)
     {
+        shutdown();
         if (m->m_hIf != INTNET_HANDLE_INVALID)
         {
@@ -193 +219 @@
 {
     return m->m_fNeedMain;
+}
+
+
+int VBoxNetBaseService::run()
+{
+    /**
+     * If child class need Main we start receving thread which calls doReceiveLoop and enter to event polling loop
+     * and for the rest clients we do receiving on the current (main) thread.
+     */
+    if (isMainNeeded())
+        return startReceiveThreadAndEnterEventLoop();
+    else
+    {
+        doReceiveLoop();
+        return VINF_SUCCESS;
+    }
 }
 
@@ -414 +456 @@
 void VBoxNetBaseService::shutdown(void)
 {
+    syncEnter();
+    m->fShutdown = true;
+    syncLeave();
 }
 
@@ -678 +723 @@
 
 
+int VBoxNetBaseService::startReceiveThreadAndEnterEventLoop()
+{
+    AssertMsgReturn(isMainNeeded(), ("It's expected that we need Main"), VERR_INTERNAL_ERROR);
+        
+    /* start receiving thread */
+    int rc = RTThreadCreate(&m->m_hThrRecv, /* thread handle*/
+                            &VBoxNetBaseService::Data::recvLoop,  /* routine */
+                            this, /* user data */
+                            128 * _1K, /* stack size */
+                            RTTHREADTYPE_IO, /* type */
+                            0, /* flags, @todo: waitable ?*/
+                            "RECV");
+    AssertRCReturn(rc,rc);
+
+    m->m_EventQ = com::NativeEventQueue::getMainEventQueue();
+    AssertPtrReturn(m->m_EventQ, VERR_INTERNAL_ERROR);
+
+    while(true)
+    {
+        m->m_EventQ->processEventQueue(0);
+            
+        if (m->fShutdown)
+            break;
+
+        m->m_EventQ->processEventQueue(500);
+    }
+
+    return VINF_SUCCESS;
+}
+
+
 void VBoxNetBaseService::debugPrint(int32_t iMinLevel, bool fMsg, const char *pszFmt, ...) const
 {

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

@@ -30 +30 @@
 
 
+class VBoxNetLockee
+{
+public:
+    virtual int  syncEnter() = 0;
+    virtual int  syncLeave() = 0;
+};
+
+
+class VBoxNetALock
+{
+public:
+    VBoxNetALock(VBoxNetLockee *a_lck):m_lck(a_lck)
+    {
+        if (m_lck)
+            m_lck->syncEnter();
+    }
+
+    ~VBoxNetALock()
+    {
+        if (m_lck)
+            m_lck->syncLeave();
+    }
+
+private:
+    VBoxNetLockee *m_lck;
+};
+
 # ifndef BASE_SERVICES_ONLY 
-class VBoxNetBaseService: public VBoxNetHlpUDPService
+class VBoxNetBaseService: public VBoxNetHlpUDPService, public VBoxNetLockee
 {
 public:
@@ -48 +75 @@
                                         void const *pvData, size_t cbData) const;
     virtual void        usage(void) = 0;
-    virtual int         run(void) = 0;
     virtual int         parseOpt(int rc, const RTGETOPTUNION& getOptVal) = 0;
     virtual int         processFrame(void *, size_t) = 0;
@@ -56 +82 @@
 
     virtual int         init(void);
+    virtual int         run(void);
     virtual bool        isMainNeeded() const;
 
@@ -96 +123 @@
     virtual void debugPrintV(int32_t iMinLevel, bool fMsg, const char *pszFmt, va_list va) const;
 
+    private:
     void doReceiveLoop();
 
-protected:
+    /** starts receiving thread and enter event polling loop. */
+    int startReceiveThreadAndEnterEventLoop();
+
+    protected:
     /* VirtualBox instance */
     ComPtr<IVirtualBox> virtualbox;
 
-private:
+    private:
     struct Data;
     Data *m;
 
-private:
+    private:
     PRTGETOPTDEF getOptionsPtr();
 };