Changeset 39498 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

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

Author:

vboxsync

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

75169

Message:

RTReq refactoring.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (2 diffs)
• slirp_state.h (modified) (8 diffs)

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

@@ -622 +622 @@
     QSOCKET_LOCK_CREATE(tcb);
     QSOCKET_LOCK_CREATE(udb);
-    rc = RTReqCreateQueue(&pData->pReqQueue);
+    rc = RTReqQueueCreate(&pData->pReqQueue);
     AssertReleaseRC(rc);
 #endif
@@ -1950 +1950 @@
 void slirp_process_queue(PNATState pData)
 {
-     RTReqProcess(pData->pReqQueue, RT_INDEFINITE_WAIT);
+     RTReqQueueProcess(pData->pReqQueue, RT_INDEFINITE_WAIT);
 }
 void *slirp_get_queue(PNATState pData)

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

@@ -136 +136 @@
     int soMaxConn;
 #ifdef VBOX_WITH_SLIRP_MT
-    PRTREQQUEUE pReqQueue;
+    RTREQQUEUE hReqQueue;
 #endif
 #ifdef RT_OS_WINDOWS
@@ -474 +474 @@
         PRTREQ pReq;                                                    \
         int rc;                                                         \
-        rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /*cMillies*/,    \
-                           (PFNRT)tcp_output 2, data, sotcb);           \
+        rc = RTReqQueueCallVoid((data)->hReqQueue, &pReq, 0 /*cMillies*/, \
+                                (PFNRT)tcp_output 2, data, sotcb);      \
         if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
@@ -491 +491 @@
     do {                                                                \
         int rc;                                                         \
-        rc = RTReqCallEx((data)->pReqQueue, NULL, 0 /*cMillies*/,       \
-                         RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,          \
-                         (PFNRT)tcp_input, 4, data, mbuf, size, so);    \
+        rc = RTReqQueueCallEx((data)->hReqQueue, NULL, 0 /*cMillies*/,  \
+                              RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,     \
+                              (PFNRT)tcp_input, 4, data, mbuf, size, so); \
         AssertReleaseRC(rc);                                            \
     } while(0)
@@ -501 +501 @@
         PRTREQ pReq;                                                    \
         int rc;                                                         \
-        rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /*cMillies*/,    \
-                           (PFNRT)tcp_connect, 2, data, so);            \
+        rc = RTReqQueueCallVoid((data)->hReqQueue, &pReq, 0 /*cMillies*/, \
+                                (PFNRT)tcp_connect, 2, data, so);       \
         if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
@@ -519 +519 @@
         PRTREQ pReq;                                                    \
         int rc;                                                         \
-        rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /*cMillies*/,    \
-                           (PFNRT)soread_queue, 4,                      \
-                           data, so, ifclose, &(ret));                  \
+        rc = RTReqQueueCallVoid((data)->hReqQueue, &pReq, 0 /*cMillies*/, \
+                                (PFNRT)soread_queue, 4,                 \
+                                data, so, ifclose, &(ret));             \
         if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
@@ -538 +538 @@
         PRTREQ pReq;                                                    \
         int rc;                                                         \
-        rc = RTReqCall((data)->pReqQueue, &pReq, 0 /*cMillies*/,        \
-                       (PFNRT)sowrite, 2, data, so);                    \
+        rc = RTReqQueueCall((data)->hReqQueue, &pReq, 0 /*cMillies*/,   \
+                            (PFNRT)sowrite, 2, data, so);               \
         if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
@@ -556 +556 @@
         PRTREQ pReq;                                                    \
         int rc;                                                         \
-        rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /*cMillies */,   \
-                           (PFNRT)sorecvfrom, 2, data, so);             \
+        rc = RTReqQueueCallVoid((data)->hReqQueue, &pReq, 0 /*cMillies */, \
+                                (PFNRT)sorecvfrom, 2, data, so);        \
         if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
@@ -574 +574 @@
         PRTREQ pReq;                                                    \
         int rc;                                                         \
-        rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /* cMillies*/,   \
-                           (PFNRT)udp_detach, 2, data, so);             \
+        rc = RTReqQueueCallVoid((data)->hReqQueue, &pReq, 0 /* cMillies*/, \
+                                (PFNRT)udp_detach, 2, data, so);        \
         if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \