collect receivedQueue only if it is used later

Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2023-02-15 14:17:17 +01:00
parent 1669ec9236
commit af72e58d08
No known key found for this signature in database
GPG Key ID: 0FE274EE8C95166E

View File

@ -193,6 +193,7 @@ class Validator:
for i in range(len(column)): for i in range(len(column)):
if column[i]: if column[i]:
self.logger.debug("Recv: %d->%d: %d,%d", src, self.ID, i, id, extra=self.format) self.logger.debug("Recv: %d->%d: %d,%d", src, self.ID, i, id, extra=self.format)
if self.perNodeQueue or self.perNeighborQueue:
self.receivedQueue.append((i, id)) self.receivedQueue.append((i, id))
self.statsRxInSlot += column.count(1) self.statsRxInSlot += column.count(1)
else: else:
@ -207,6 +208,7 @@ class Validator:
for i in range(len(row)): for i in range(len(row)):
if row[i]: if row[i]:
self.logger.debug("Recv %d->%d: %d,%d", src, self.ID, id, i, extra=self.format) self.logger.debug("Recv %d->%d: %d,%d", src, self.ID, id, i, extra=self.format)
if self.perNodeQueue or self.perNeighborQueue:
self.receivedQueue.append((id, i)) self.receivedQueue.append((id, i))
self.statsRxInSlot += row.count(1) self.statsRxInSlot += row.count(1)
else: else:
@ -223,6 +225,7 @@ class Validator:
if not self.receivedBlock.getSegment(rID, cID): if not self.receivedBlock.getSegment(rID, cID):
self.logger.debug("Recv new: %d->%d: %d,%d", src, self.ID, rID, cID, extra=self.format) self.logger.debug("Recv new: %d->%d: %d,%d", src, self.ID, rID, cID, extra=self.format)
self.receivedBlock.setSegment(rID, cID) self.receivedBlock.setSegment(rID, cID)
if self.perNodeQueue or self.perNeighborQueue:
self.receivedQueue.append((rID, cID)) self.receivedQueue.append((rID, cID))
else: else:
self.logger.debug("Recv DUP: %d->%d: %d,%d", src, self.ID, rID, cID, extra=self.format) self.logger.debug("Recv DUP: %d->%d: %d,%d", src, self.ID, rID, cID, extra=self.format)
@ -263,6 +266,7 @@ class Validator:
neigh.receiving.setall(0) neigh.receiving.setall(0)
# add newly received segments to the send queue # add newly received segments to the send queue
if self.perNodeQueue or self.perNeighborQueue:
while self.receivedQueue: while self.receivedQueue:
(rID, cID) = self.receivedQueue.popleft() (rID, cID) = self.receivedQueue.popleft()
self.addToSendQueue(rID, cID) self.addToSendQueue(rID, cID)