Changeset 26423 in vbox

Timestamp:

Feb 11, 2010 11:16:39 AM (15 years ago)

Author:

vboxsync

Message:

NAT: some fewer AssertRelease*

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (1 diff)
• slirp/mbuf.c (modified) (5 diffs)
• slirp/slirp_state.h (modified) (4 diffs)
• slirp/socket.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -338 +338 @@
 
     rc = RTCritSectEnter(&pThis->csDevAccess);
+    AssertRC(rc);
 
     rc = pThis->pIAboveNet->pfnWaitReceiveAvail(pThis->pIAboveNet, RT_INDEFINITE_WAIT);

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

@@ -86 +86 @@
 #if 1
     rc = RTCritSectInit(&pData->cs_mbuf_zone);
-    AssertReleaseRC(rc);
+    AssertRC(rc);
     rc = mbuf_zone_init(pData);
     Assert((rc == 0));
@@ -127 +127 @@
     
     rc = RTCritSectEnter(&pData->cs_mbuf_zone);
-    AssertReleaseRC(rc);
+    AssertRC(rc);
 
 recheck_zone:
@@ -179 +179 @@
     DEBUG_ARG("m = %lx", (long )m);
     rc = RTCritSectLeave(&pData->cs_mbuf_zone);
-    AssertReleaseRC(rc);
+    AssertRC(rc);
     return m;
 }
@@ -191 +191 @@
 
     rc = RTCritSectEnter(&pData->cs_mbuf_zone);
-    AssertReleaseRC(rc);
+    AssertRC(rc);
     mbuf_alloced--;
     if(m)
@@ -226 +226 @@
     } /* if(m) */
     rc = RTCritSectLeave(&pData->cs_mbuf_zone);
-    AssertReleaseRC(rc);
+    AssertRC(rc);
 }
 

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

@@ -445 +445 @@
         /* Assert(strcmp(RTThreadSelfName(), "EMT") != 0); */         \
         rc = RTCritSectEnter(&VBOX_X(queue) ## _mutex);               \
-        AssertReleaseRC(rc);                                          \
+        AssertRC(rc);                                                 \
     } while (0)
 # define QSOCKET_UNLOCK(queue)                                        \
@@ -451 +451 @@
         int rc;                                                       \
         rc = RTCritSectLeave(&VBOX_X(queue) ## _mutex);               \
-        AssertReleaseRC(rc);                                          \
+        AssertRC(rc);                                                 \
     } while (0)
 # define QSOCKET_LOCK_CREATE(queue)                                   \
@@ -457 +457 @@
         int rc;                                                       \
         rc = RTCritSectInit(&pData->queue ## _mutex);                 \
-        AssertReleaseRC(rc);                                          \
+        AssertRC(rc);                                                 \
     } while (0)
 # define QSOCKET_LOCK_DESTROY(queue)                                  \
     do {                                                              \
         int rc = RTCritSectDelete(&pData->queue ## _mutex);           \
-        AssertReleaseRC(rc);                                          \
+        AssertRC(rc);                                                 \
     } while (0)
 
@@ -507 +507 @@
         int rc;                                                         \
         rc = RTReqAlloc((data)->pReqQueue, &pReq, RTREQTYPE_INTERNAL);  \
-        AssertReleaseRC(rc);                                            \
+        AssertRC(rc);                                                   \
         pReq->u.Internal.pfn      = (PFNRT)tcp_output;                  \
         pReq->u.Internal.cArgs    = 2;                                  \

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

@@ -96 +96 @@
         int rc;                                                         \
         /* Assert(strcmp(RTThreadSelfName(), "EMT") != 0); */           \
-        Log2(("lock:%s:%d L on %R[natsock]\n", __FUNCTION__, __LINE__, (so)));       \
-        Assert(!RTCritSectIsOwner(&(so)->so_mutex));                     \
-        rc = RTCritSectEnter(&(so)->so_mutex);                           \
-        AssertReleaseRC(rc);                                            \
+        Log2(("lock:%s:%d L on %R[natsock]\n", __FUNCTION__, __LINE__, (so))); \
+        Assert(!RTCritSectIsOwner(&(so)->so_mutex));                    \
+        rc = RTCritSectEnter(&(so)->so_mutex);                          \
+        AssertRC(rc);                                                   \
     } while (0)
 # define SOCKET_UNLOCK(so)                                              \
     do {                                                                \
         int rc;                                                         \
-        if ((so) != NULL) Log2(("lock:%s:%d U on %R[natsock]\n", __FUNCTION__, __LINE__, (so)));       \
-        rc = RTCritSectLeave(&(so)->so_mutex);                           \
-        AssertReleaseRC(rc);                                            \
+        if ((so) != NULL) Log2(("lock:%s:%d U on %R[natsock]\n", __FUNCTION__, __LINE__, (so))); \
+        rc = RTCritSectLeave(&(so)->so_mutex);                          \
+        Assert(rc);                                                     \
     } while (0)
 # define SOCKET_LOCK_CREATE(so)                                         \
     do {                                                                \
         int rc;                                                         \
-        rc = RTCritSectInit(&(so)->so_mutex);                            \
-        AssertReleaseRC(rc);                                            \
+        rc = RTCritSectInit(&(so)->so_mutex);                           \
+        AssertRC(rc);                                                   \
     } while (0)
 # define SOCKET_LOCK_DESTROY(so)                                        \
     do {                                                                \
-        int rc = RTCritSectDelete(&(so)->so_mutex);                      \
-        AssertReleaseRC(rc);                                            \
+        int rc = RTCritSectDelete(&(so)->so_mutex);                     \
+        AssertRC(rc);                                                   \
     } while (0)
 #else