logos-storage/das-research
1
0
Fork 0
mirror of https://github.com/logos-storage/das-research.git synced 2026-01-09 08:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

use shuffled round robin between output queues

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

# Conflicts:
#	DAS/validator.py
This commit is contained in:
Csaba Kiraly 2023-03-22 09:32:56 +01:00
parent d20d8c7c3c
commit 31b7a5ecea
No known key found for this signature in database
GPG Key ID: 0FE274EE8C95166E
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
DAS/validator.py
View File

@ -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.