logos-storage/das-research
1
0
Fork 0
mirror of https://github.com/logos-storage/das-research.git synced 2026-01-05 22:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding log level TRACE

Browse Source 
Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2023-03-14 11:16:43 +01:00
parent af124c0755
commit 6e4b37a3d2
No known key found for this signature in database
GPG Key ID: 0FE274EE8C95166E
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DAS/simulator.py
View File

@ -2,6 +2,7 @@
import networkx as nx import networkx as nx
import logging, random import logging, random
from functools import partial, partialmethod
from datetime import datetime from datetime import datetime
from statistics import mean from statistics import mean
from DAS.tools import * from DAS.tools import *
@ -135,6 +136,11 @@ class Simulator:
def initLogger(self): def initLogger(self):
"""It initializes the logger.""" """It initializes the logger."""
logging.TRACE = 5
logging.addLevelName(logging.TRACE, 'TRACE')
logging.Logger.trace = partialmethod(logging.Logger.log, logging.TRACE)
logging.trace = partial(logging.log, logging.TRACE)
logger = logging.getLogger("DAS") logger = logging.getLogger("DAS")
if len(logger.handlers) == 0: if len(logger.handlers) == 0:
logger.setLevel(self.logLevel) logger.setLevel(self.logLevel)
@ -144,7 +150,6 @@ class Simulator:
logger.addHandler(ch) logger.addHandler(ch)
self.logger = logger self.logger = logger
def resetShape(self, shape): def resetShape(self, shape):
"""It resets the parameters of the simulation.""" """It resets the parameters of the simulation."""
self.shape = shape self.shape = shape

12
DAS/validator.py
View File

@ -155,12 +155,12 @@ class Validator:
if src in self.columnNeighbors[cID]: if src in self.columnNeighbors[cID]:
self.columnNeighbors[cID][src].receiving[rID] = 1 self.columnNeighbors[cID][src].receiving[rID] = 1
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.trace("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: 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.trace("Recv DUP: %d->%d: %d,%d", src, self.ID, rID, cID, extra=self.format)
# self.statsRxDuplicateInSlot += 1 # self.statsRxDuplicateInSlot += 1
self.statsRxInSlot += 1 self.statsRxInSlot += 1
@ -183,7 +183,7 @@ class Validator:
if self.amIproposer == 1: if self.amIproposer == 1:
self.logger.error("I am a block proposer", extra=self.format) self.logger.error("I am a block proposer", extra=self.format)
else: else:
self.logger.debug("Receiving the data...", extra=self.format) self.logger.trace("Receiving the data...", extra=self.format)
#self.logger.debug("%s -> %s", self.block.data, self.receivedBlock.data, extra=self.format) #self.logger.debug("%s -> %s", self.block.data, self.receivedBlock.data, extra=self.format)
self.block.merge(self.receivedBlock) self.block.merge(self.receivedBlock)
@ -219,7 +219,7 @@ class Validator:
def sendSegmentToNeigh(self, rID, cID, neigh): def sendSegmentToNeigh(self, rID, cID, neigh):
"""Send segment to a neighbor (without checks).""" """Send segment to a neighbor (without checks)."""
self.logger.debug("sending %d/%d to %d", rID, cID, neigh.node.ID, extra=self.format) self.logger.trace("sending %d/%d to %d", rID, cID, neigh.node.ID, extra=self.format)
i = rID if neigh.dim else cID i = rID if neigh.dim else cID
neigh.sent[i] = 1 neigh.sent[i] = 1
neigh.node.receiveSegment(rID, cID, self.ID) neigh.node.receiveSegment(rID, cID, self.ID)
@ -454,7 +454,7 @@ class Validator:
# be queued after successful repair. # be queued after successful repair.
for i in range(len(rep)): for i in range(len(rep)):
if rep[i]: if rep[i]:
self.logger.debug("Rep: %d,%d", id, i, extra=self.format) self.logger.trace("Rep: %d,%d", id, i, extra=self.format)
self.addToSendQueue(id, i) self.addToSendQueue(id, i)
# self.statsRepairInSlot += rep.count(1) # self.statsRepairInSlot += rep.count(1)
@ -472,7 +472,7 @@ class Validator:
# be queued after successful repair. # be queued after successful repair.
for i in range(len(rep)): for i in range(len(rep)):
if rep[i]: if rep[i]:
self.logger.debug("Rep: %d,%d", i, id, extra=self.format) self.logger.trace("Rep: %d,%d", i, id, extra=self.format)
self.addToSendQueue(i, id) self.addToSendQueue(i, id)
# self.statsRepairInSlot += rep.count(1) # self.statsRepairInSlot += rep.count(1)