Changeset 30421 in vbox for trunk/src/VBox

Timestamp:

Jun 24, 2010 11:59:49 AM (15 years ago)

Author:

vboxsync

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

63055

Message:

NAT: small performance enhancement (allocate intermediate buffer only if it's required).

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (3 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/misc.c (modified) (1 diff)
• slirp/slirp.c (modified) (3 diffs)

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

@@ -284 +284 @@
     AssertRC(rc);
 
-    slirp_ext_m_free(pThis->pNATState, m);
-    RTMemFree(pu8Buf);
+    slirp_ext_m_free(pThis->pNATState, m, pu8Buf);
     if (ASMAtomicDecU32(&pThis->cUrgPkts) == 0)
     {
@@ -329 +328 @@
 
 done_unlocked:
-    slirp_ext_m_free(pThis->pNATState, m);
-    RTMemFree(pu8Buf);
+    slirp_ext_m_free(pThis->pNATState, m, pu8Buf);
     ASMAtomicDecU32(&pThis->cPkts);
 
@@ -352 +350 @@
     {
         Assert(!pSgBuf->pvUser);
-        slirp_ext_m_free(pThis->pNATState, (struct mbuf *)pSgBuf->pvAllocator);
+        slirp_ext_m_free(pThis->pNATState, (struct mbuf *)pSgBuf->pvAllocator, NULL);
         pSgBuf->pvAllocator = NULL;
     }

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

@@ -127 +127 @@
 
 struct mbuf *slirp_ext_m_get(PNATState pData, size_t cbMin, void **ppvBuf, size_t *pcbBuf);
-void slirp_ext_m_free(PNATState pData, struct mbuf *);
+void slirp_ext_m_free(PNATState pData, struct mbuf *, uint8_t *pu8Buf);
 
 /*

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

@@ -418 +418 @@
 }
 
-void slirp_ext_m_free(PNATState pData, struct mbuf *m)
-{
+void slirp_ext_m_free(PNATState pData, struct mbuf *m, uint8_t *pu8Buf)
+{
+    
+    if (   !pu8Buf 
+        && pu8Buf != mtod(m, uint8_t *))
+        RTMemFree(pu8Buf); /* This buffer was allocated on heap */
     m_freem(pData, m);
 }

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

@@ -1538 +1538 @@
     struct ethhdr *eh;
     uint8_t *buf = NULL;
+    uint8_t *mbuf = NULL;
     size_t mlen = 0;
     STAM_PROFILE_START(&pData->StatIF_encap, a);
@@ -1545 +1546 @@
     m->m_len += ETH_HLEN;
     eh = mtod(m, struct ethhdr *);
+    mlen = m_length(m, NULL);
 
     if (memcmp(eh->h_source, special_ethaddr, ETH_ALEN) != 0)
@@ -1558 +1560 @@
         }
     }
-    mlen = m_length(m, NULL);
-    buf = RTMemAlloc(mlen);
-    if (!buf)
-    {
-        LogRel(("NAT: Can't alloc memory for outgoing buffer\n"));
-        m_freem(pData, m);
-        goto done;
-    }
+    if (m->m_next)
+    {
+        buf = RTMemAlloc(mlen);
+        if (!buf)
+        {
+            LogRel(("NAT: Can't alloc memory for outgoing buffer\n"));
+            m_freem(pData, m);
+            goto done;
+        }
+        mbuf = buf;
+        m_copydata(m, 0, mlen, (char *)buf);
+    }
+    else
+        mbuf = mtod(m, uint8_t *);
     eh->h_proto = RT_H2N_U16(eth_proto);
-    m_copydata(m, 0, mlen, (char *)buf);
     if (flags & ETH_ENCAP_URG)
-        slirp_urg_output(pData->pvUser, m, buf, mlen);
+        slirp_urg_output(pData->pvUser, m, mbuf, mlen);
     else
-        slirp_output(pData->pvUser, m, buf, mlen);
+        slirp_output(pData->pvUser, m, mbuf, mlen);
 done:
     STAM_PROFILE_STOP(&pData->StatIF_encap, a);