From 31b7a5eceac0ac7137dcd4c7f831b1dfd6dbe698 Mon Sep 17 00:00:00 2001
From: Csaba Kiraly <csaba.kiraly@gmail.com>
Date: Wed, 22 Mar 2023 09:32:56 +0100
Subject: [PATCH] use shuffled round robin between output queues

Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>

# Conflicts:
#	DAS/validator.py
---
 DAS/validator.py | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/DAS/validator.py b/DAS/validator.py
index cfa7fac..3f8782b 100644
--- a/DAS/validator.py
+++ b/DAS/validator.py
@@ -274,10 +274,8 @@ class Validator:
         reality of libp2p implementations where topics between two nodes are
         multiplexed over the same transport.
         """
-        progress = True
-        while (progress):
-            progress = False
 
+        def activeSendQueues():
             queues = []
             # collect and shuffle
             for rID, neighs in self.rowNeighbors.items():
@@ -290,14 +288,27 @@ class Validator:
                     if (neigh.sendQueue):
                         queues.append((1, cID, neigh))
 
-            for dim, lineID, neigh in shuffled(queues, self.shuffleQueues):
-                if dim == 0:
-                    self.checkSendSegmentToNeigh(lineID, neigh.sendQueue.popleft(), neigh)
-                else:
-                    self.checkSendSegmentToNeigh(neigh.sendQueue.popleft(), lineID, neigh)
-                progress = True
-                if self.statsTxInSlot >= self.bwUplink:
-                    return
+            return queues
+
+        progress = True
+        while (progress):
+
+            if hasattr(self, 'activeSendQueues'):
+                progress = False
+                for dim, lineID, neigh in self.activeSendQueues:
+                    if dim == 0:
+                        self.checkSendSegmentToNeigh(lineID, neigh.sendQueue.popleft(), neigh)
+                    else:
+                        self.checkSendSegmentToNeigh(neigh.sendQueue.popleft(), lineID, neigh)
+                    progress = True
+                    if self.statsTxInSlot >= self.bwUplink:
+                        return
+
+            self.activeSendQueues = activeSendQueues()
+            if self.activeSendQueues:
+                self.activeSendQueues = shuffled(activeSendQueues(), self.shuffleQueues)
+            else:
+                return
 
     def runSegmentShuffleScheduler(self):
         """ Schedule chunks for sending.