target/mips: introduce MTTCG-enabled builds

[qemu.git] / slirp / mbuf.c

diff --git a/slirp/mbuf.c b/slirp/mbuf.c
index d688dd43f7b853b5b3838160732941e810e945f9..521c02c96739f4b3c333d9767e9a0874f05fea05 100644 (file)
--- a/slirp/mbuf.c
+++ b/slirp/mbuf.c
@@ -10,13 +10,12 @@
  * FreeBSD.  They are fixed size, determined by the MTU,
  * so that one whole packet can fit.  Mbuf's cannot be
  * chained together.  If there's more data than the mbuf
- * could hold, an external malloced buffer is pointed to
+ * could hold, an external g_malloced buffer is pointed to
  * by m_ext (and the data pointers) and M_EXT is set in
  * the flags
  */
 
-#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
 
 #define MBUF_THRESH 30
 
@@ -29,38 +28,38 @@
 void
 m_init(Slirp *slirp)
 {
-    slirp->m_freelist.m_next = slirp->m_freelist.m_prev = &slirp->m_freelist;
-    slirp->m_usedlist.m_next = slirp->m_usedlist.m_prev = &slirp->m_usedlist;
+    slirp->m_freelist.qh_link = slirp->m_freelist.qh_rlink = &slirp->m_freelist;
+    slirp->m_usedlist.qh_link = slirp->m_usedlist.qh_rlink = &slirp->m_usedlist;
 }
 
 void m_cleanup(Slirp *slirp)
 {
     struct mbuf *m, *next;
 
-    m = slirp->m_usedlist.m_next;
-    while (m != &slirp->m_usedlist) {
+    m = (struct mbuf *) slirp->m_usedlist.qh_link;
+    while ((struct quehead *) m != &slirp->m_usedlist) {
         next = m->m_next;
         if (m->m_flags & M_EXT) {
-            free(m->m_ext);
+            g_free(m->m_ext);
         }
-        free(m);
+        g_free(m);
         m = next;
     }
-    m = slirp->m_freelist.m_next;
-    while (m != &slirp->m_freelist) {
+    m = (struct mbuf *) slirp->m_freelist.qh_link;
+    while ((struct quehead *) m != &slirp->m_freelist) {
         next = m->m_next;
-        free(m);
+        g_free(m);
         m = next;
     }
 }
 
 /*
  * Get an mbuf from the free list, if there are none
- * malloc one
+ * allocate one
  *
  * Because fragmentation can occur if we alloc new mbufs and
  * free old mbufs, we mark all mbufs above mbuf_thresh as M_DOFREE,
- * which tells m_free to actually free() it
+ * which tells m_free to actually g_free() it
  */
 struct mbuf *
 m_get(Slirp *slirp)
@@ -70,15 +69,14 @@ m_get(Slirp *slirp)
 
        DEBUG_CALL("m_get");
 
-       if (slirp->m_freelist.m_next == &slirp->m_freelist) {
-               m = (struct mbuf *)malloc(SLIRP_MSIZE);
-               if (m == NULL) goto end_error;
+       if (slirp->m_freelist.qh_link == &slirp->m_freelist) {
+                m = g_malloc(SLIRP_MSIZE);
                slirp->mbuf_alloced++;
                if (slirp->mbuf_alloced > MBUF_THRESH)
                        flags = M_DOFREE;
                m->slirp = slirp;
        } else {
-               m = slirp->m_freelist.m_next;
+               m = (struct mbuf *) slirp->m_freelist.qh_link;
                remque(m);
        }
 
@@ -94,7 +92,6 @@ m_get(Slirp *slirp)
         m->m_prevpkt = NULL;
         m->resolution_requested = false;
         m->expiration_date = (uint64_t)-1;
-end_error:
        DEBUG_ARG("m = %p", m);
        return m;
 }
@@ -112,15 +109,15 @@ m_free(struct mbuf *m)
           remque(m);
 
        /* If it's M_EXT, free() it */
-       if (m->m_flags & M_EXT)
-          free(m->m_ext);
-
+        if (m->m_flags & M_EXT) {
+                g_free(m->m_ext);
+        }
        /*
         * Either free() it or put it on the free list
         */
        if (m->m_flags & M_DOFREE) {
                m->slirp->mbuf_alloced--;
-               free(m);
+                g_free(m);
        } else if ((m->m_flags & M_FREELIST) == 0) {
                insque(m,&m->slirp->m_freelist);
                m->m_flags = M_FREELIST; /* Clobber other flags */
@@ -130,7 +127,7 @@ m_free(struct mbuf *m)
 
 /*
  * Copy data from one mbuf to the end of
- * the other.. if result is too big for one mbuf, malloc()
+ * the other.. if result is too big for one mbuf, allocate
  * an M_EXT data segment
  */
 void
@@ -140,7 +137,7 @@ m_cat(struct mbuf *m, struct mbuf *n)
         * If there's no room, realloc
         */
        if (M_FREEROOM(m) < n->m_len)
-               m_inc(m,m->m_size+MINCSIZE);
+               m_inc(m, m->m_len + n->m_len);
 
        memcpy(m->m_data+m->m_len, n->m_data, n->m_len);
        m->m_len += n->m_len;
@@ -149,32 +146,29 @@ m_cat(struct mbuf *m, struct mbuf *n)
 }
 
 
-/* make m size bytes large */
+/* make m 'size' bytes large from m_data */
 void
 m_inc(struct mbuf *m, int size)
 {
-       int datasize;
-
-       /* some compiles throw up on gotos.  This one we can fake. */
-        if(m->m_size>size) return;
+    int gapsize;
 
-        if (m->m_flags & M_EXT) {
-         datasize = m->m_data - m->m_ext;
-         m->m_ext = (char *)realloc(m->m_ext,size);
-         m->m_data = m->m_ext + datasize;
-        } else {
-         char *dat;
-         datasize = m->m_data - m->m_dat;
-         dat = (char *)malloc(size);
-         memcpy(dat, m->m_dat, m->m_size);
-
-         m->m_ext = dat;
-         m->m_data = m->m_ext + datasize;
-         m->m_flags |= M_EXT;
-        }
+    /* some compilers throw up on gotos.  This one we can fake. */
+    if (M_ROOM(m) > size) {
+        return;
+    }
 
-        m->m_size = size;
+    if (m->m_flags & M_EXT) {
+        gapsize = m->m_data - m->m_ext;
+        m->m_ext = g_realloc(m->m_ext, size + gapsize);
+    } else {
+        gapsize = m->m_data - m->m_dat;
+        m->m_ext = g_malloc(size + gapsize);
+        memcpy(m->m_ext, m->m_dat, m->m_size);
+        m->m_flags |= M_EXT;
+    }
 
+    m->m_data = m->m_ext + gapsize;
+    m->m_size = size + gapsize;
 }
 
 
@@ -225,7 +219,8 @@ dtom(Slirp *slirp, void *dat)
        DEBUG_ARG("dat = %p", dat);
 
        /* bug corrected for M_EXT buffers */
-       for (m = slirp->m_usedlist.m_next; m != &slirp->m_usedlist;
+       for (m = (struct mbuf *) slirp->m_usedlist.qh_link;
+            (struct quehead *) m != &slirp->m_usedlist;
             m = m->m_next) {
          if (m->m_flags & M_EXT) {
            if( (char *)dat>=m->m_ext && (char *)dat<(m->m_ext + m->m_size) )
@@ -236,7 +231,7 @@ dtom(Slirp *slirp, void *dat)
          }
        }
 
-       DEBUG_ERROR((dfd, "dtom failed"));
+       DEBUG_ERROR("dtom failed");
 
        return (struct mbuf *)0;
 }