Changeset 39498 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Dec 1, 2011 7:59:21 PM (13 years ago)

Author:

vboxsync

Message:

RTReq refactoring.

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp (modified) (11 diffs)

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

@@ -101 +101 @@
     RTSEMEVENT              m_EventUrgSend;
 
-    PRTREQQUEUE             m_pReqQueue;
-    PRTREQQUEUE             m_pSendQueue;
-    PRTREQQUEUE             m_pUrgSendQueue;
+    RTREQQUEUE              m_hReqQueue;
+    RTREQQUEUE              m_hSendQueue;
+    RTREQQUEUE              m_hUrgSendQueue;
     volatile uint32_t       cUrgPkt;
     volatile uint32_t       cPkt;
@@ -186 +186 @@
     slirp_register_external_event(m_pNATState, m_hWakeupEvent, VBOX_WAKEUP_EVENT_INDEX);
 #endif
-    rc = RTReqCreateQueue(&m_pReqQueue);
-    AssertReleaseRC(rc);
-
-    rc = RTReqCreateQueue(&m_pSendQueue);
-    AssertReleaseRC(rc);
-
-    rc = RTReqCreateQueue(&m_pUrgSendQueue);
+    rc = RTReqQueueCreate(&m_hReqQueue);
+    AssertReleaseRC(rc);
+
+    rc = RTReqQueueCreate(&m_hSendQueue);
+    AssertReleaseRC(rc);
+
+    rc = RTReqQueueCreate(&m_hUrgSendQueue);
     AssertReleaseRC(rc);
 
@@ -226 +226 @@
         WaitReq.cMillies = 2000; /* 2 secs - the sleep is for some reason uninterruptible... */  /** @todo fix interruptability in SrvIntNet! */
 #if 0
-        RTReqProcess(m_pSendQueue, 0);
-        RTReqProcess(m_pUrgSendQueue, 0);
+        RTReqProcess(m_hSendQueue, 0);
+        RTReqProcess(m_hUrgSendQueue, 0);
 #endif
         int rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_WAIT, 0, &WaitReq.Hdr);
@@ -267 +267 @@
 
                     /* don't wait, we may have to wakeup the NAT thread first */
-                    rc = RTReqCallEx(m_pReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                                     (PFNRT)SendWorker, 2, m, cbFrame);
+                    rc = RTReqQueueCallEx(m_hReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                                          (PFNRT)SendWorker, 2, m, cbFrame);
                     natNotifyNATThread();
                     AssertReleaseRC(rc);
@@ -301 +301 @@
                         memcpy(pvSlirpFrame, pvSegFrame, cbSegFrame);
 
-                        rc = RTReqCallEx(m_pReqQueue, NULL /*ppReq*/, 0 /*cMillies*/,
-                                         RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                                         (PFNRT)SendWorker, 2, m, cbSegFrame);
+                        rc = RTReqQueueCallEx(m_hReqQueue, NULL /*ppReq*/, 0 /*cMillies*/,
+                                              RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                                              (PFNRT)SendWorker, 2, m, cbSegFrame);
                         AssertReleaseRC(rc);
                     }
@@ -357 +357 @@
 {
     LogFlowFunc(("ENTER: m:%p, pu8Buf:%p, cb:%d\n", m, pu8Buf, cb));
-    int rc = RTReqCallEx(g_pNAT->m_pUrgSendQueue,  NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                         (PFNRT)IntNetSendWorker, 4, (uintptr_t)1, (uintptr_t)pu8Buf, (uintptr_t)cb, (uintptr_t)m);
+    int rc = RTReqQueueCallEx(g_pNAT->m_hUrgSendQueue,  NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                              (PFNRT)IntNetSendWorker, 4, (uintptr_t)1, (uintptr_t)pu8Buf, (uintptr_t)cb, (uintptr_t)m);
     ASMAtomicIncU32(&g_pNAT->cUrgPkt);
     RTSemEventSignal(g_pNAT->m_EventUrgSend);
@@ -368 +368 @@
     LogFlowFunc(("ENTER: m:%p, pu8Buf:%p, cb:%d\n", m, pu8Buf, cb));
     AssertRelease(g_pNAT == pvUser);
-    int rc = RTReqCallEx(g_pNAT->m_pSendQueue,  NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                         (PFNRT)IntNetSendWorker, 4, (uintptr_t)0, (uintptr_t)pu8Buf, (uintptr_t)cb, (uintptr_t)m);
+    int rc = RTReqQueueCallEx(g_pNAT->m_hSendQueue,  NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                              (PFNRT)IntNetSendWorker, 4, (uintptr_t)0, (uintptr_t)pu8Buf, (uintptr_t)cb, (uintptr_t)m);
     ASMAtomicIncU32(&g_pNAT->cPkt);
     RTSemEventSignal(g_pNAT->m_EventSend);
@@ -524 +524 @@
         }
         /* process _all_ outstanding requests but don't wait */
-        RTReqProcess(pThis->m_pReqQueue, 0);
+        RTReqQueueProcess(pThis->m_hReqQueue, 0);
         RTMemFree(polls);
 
@@ -551 +551 @@
         slirp_select_poll(pThis->m_pNATState, /* fTimeout=*/false, /* fIcmp=*/(dwEvent == WSA_WAIT_EVENT_0));
         /* process _all_ outstanding requests but don't wait */
-        RTReqProcess(pThis->m_pReqQueue, 0);
+        RTReqQueueProcess(pThis->m_hReqQueue, 0);
 #endif /* RT_OS_WINDOWS */
     }
@@ -561 +561 @@
 {
     while (g_pNAT->fIsRunning)
-        RTReqProcess(g_pNAT->m_pSendQueue, 0);
+        RTReqQueueProcess(g_pNAT->m_hSendQueue, 0);
     return VINF_SUCCESS;
 }
@@ -567 +567 @@
 {
     while (g_pNAT->fIsRunning)
-        RTReqProcess(g_pNAT->m_pUrgSendQueue, 0);
+        RTReqQueueProcess(g_pNAT->m_hUrgSendQueue, 0);
     return VINF_SUCCESS;
 }