qemu-iotests: make cancel_and_wait() common

[qemu.git] / slirp / if.c

diff --git a/slirp/if.c b/slirp/if.c
index 2852396a4a50ff14e80290f852a7b1389c430f2f..dcd5fafe5d27cf5128c6c8b92162ee6d2b527ebe 100644 (file)
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -6,9 +6,7 @@
  */
 
 #include <slirp.h>
-#include "qemu-timer.h"
-
-#define ifs_init(ifm) ((ifm)->ifs_next = (ifm)->ifs_prev = (ifm))
+#include "qemu/timer.h"
 
 static void
 ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
@@ -98,8 +96,13 @@ if_output(struct socket *so, struct mbuf *ifm)
                        ifs_insque(ifm, ifq->ifs_prev);
                        goto diddit;
                }
-       } else
+        } else {
                ifq = slirp->if_batchq.ifq_prev;
+                /* Set next_m if the queue was empty so far */
+                if (slirp->next_m == &slirp->if_batchq) {
+                    slirp->next_m = ifm;
+                }
+        }
 
        /* Create a new doubly linked list for this session */
        ifm->ifq_so = so;
@@ -107,8 +110,6 @@ if_output(struct socket *so, struct mbuf *ifm)
        insque(ifm, ifq);
 
 diddit:
-       slirp->if_queued++;
-
        if (so) {
                /* Update *_queued */
                so->so_queued++;
@@ -151,73 +152,86 @@ diddit:
  * from the second session, then one packet from the third, then back
  * to the first, etc. etc.
  */
-void
-if_start(Slirp *slirp)
+void if_start(Slirp *slirp)
 {
     uint64_t now = qemu_get_clock_ns(rt_clock);
-    int requeued = 0;
-       struct mbuf *ifm, *ifqt;
-
-       DEBUG_CALL("if_start");
-
-       if (slirp->if_queued == 0)
-          return; /* Nothing to do */
-
- again:
-        /* check if we can really output */
-        if (!slirp_can_output(slirp->opaque))
-            return;
+    bool from_batchq, next_from_batchq;
+    struct mbuf *ifm, *ifm_next, *ifqt;
+
+    DEBUG_CALL("if_start");
+
+    if (slirp->if_start_busy) {
+        return;
+    }
+    slirp->if_start_busy = true;
+
+    if (slirp->if_fastq.ifq_next != &slirp->if_fastq) {
+        ifm_next = slirp->if_fastq.ifq_next;
+        next_from_batchq = false;
+    } else if (slirp->next_m != &slirp->if_batchq) {
+        /* Nothing on fastq, pick up from batchq via next_m */
+        ifm_next = slirp->next_m;
+        next_from_batchq = true;
+    } else {
+        ifm_next = NULL;
+    }
+
+    while (ifm_next) {
+        ifm = ifm_next;
+        from_batchq = next_from_batchq;
+
+        ifm_next = ifm->ifq_next;
+        if (ifm_next == &slirp->if_fastq) {
+            /* No more packets in fastq, switch to batchq */
+            ifm_next = slirp->next_m;
+            next_from_batchq = true;
+        }
+        if (ifm_next == &slirp->if_batchq) {
+            /* end of batchq */
+            ifm_next = NULL;
+        }
 
-       /*
-        * See which queue to get next packet from
-        * If there's something in the fastq, select it immediately
-        */
-       if (slirp->if_fastq.ifq_next != &slirp->if_fastq) {
-               ifm = slirp->if_fastq.ifq_next;
-       } else {
-               /* Nothing on fastq, see if next_m is valid */
-               if (slirp->next_m != &slirp->if_batchq)
-                  ifm = slirp->next_m;
-               else
-                  ifm = slirp->if_batchq.ifq_next;
-
-               /* Set which packet to send on next iteration */
-               slirp->next_m = ifm->ifq_next;
-       }
-       /* Remove it from the queue */
-       ifqt = ifm->ifq_prev;
-       remque(ifm);
-       slirp->if_queued--;
-
-       /* If there are more packets for this session, re-queue them */
-       if (ifm->ifs_next != /* ifm->ifs_prev != */ ifm) {
-               insque(ifm->ifs_next, ifqt);
-               ifs_remque(ifm);
-       }
+        /* Try to send packet unless it already expired */
+        if (ifm->expiration_date >= now && !if_encap(slirp, ifm)) {
+            /* Packet is delayed due to pending ARP resolution */
+            continue;
+        }
 
-       /* Update so_queued */
-       if (ifm->ifq_so) {
-               if (--ifm->ifq_so->so_queued == 0)
-                  /* If there's no more queued, reset nqueued */
-                  ifm->ifq_so->so_nqueued = 0;
-       }
+        if (ifm == slirp->next_m) {
+            /* Set which packet to send on next iteration */
+            slirp->next_m = ifm->ifq_next;
+        }
 
-        if (ifm->expiration_date < now) {
-            /* Expired */
-            m_free(ifm);
-        } else {
-            /* Encapsulate the packet for sending */
-            if (if_encap(slirp, ifm)) {
-                m_free(ifm);
-            } else {
-                /* re-queue */
-                insque(ifm, ifqt);
-                requeued++;
+        /* Remove it from the queue */
+        ifqt = ifm->ifq_prev;
+        remque(ifm);
+
+        /* If there are more packets for this session, re-queue them */
+        if (ifm->ifs_next != ifm) {
+            struct mbuf *next = ifm->ifs_next;
+
+            insque(next, ifqt);
+            ifs_remque(ifm);
+
+            if (!from_batchq) {
+                /* Next packet in fastq is from the same session */
+                ifm_next = next;
+                next_from_batchq = false;
+            } else if (slirp->next_m == &slirp->if_batchq) {
+                /* Set next_m and ifm_next if the session packet is now the
+                 * only one on batchq */
+                slirp->next_m = ifm_next = next;
             }
         }
 
-       if (slirp->if_queued)
-          goto again;
+        /* Update so_queued */
+        if (ifm->ifq_so && --ifm->ifq_so->so_queued == 0) {
+            /* If there's no more queued, reset nqueued */
+            ifm->ifq_so->so_nqueued = 0;
+        }
+
+        m_free(ifm);
+    }
 
-        slirp->if_queued = requeued;
+    slirp->if_start_busy = false;
 }