|
@@ -52,6 +52,13 @@ class ClientRepository(DirectObject.DirectObject):
|
|
|
self.bootedText = None
|
|
self.bootedText = None
|
|
|
|
|
|
|
|
self.tcpConn = None
|
|
self.tcpConn = None
|
|
|
|
|
+
|
|
|
|
|
+ # Reader statistics
|
|
|
|
|
+ self.rsDatagramCount = 0
|
|
|
|
|
+ self.rsUpdateObjs = {}
|
|
|
|
|
+ self.rsLastUpdate = 0
|
|
|
|
|
+ self.rsDoReport = base.config.GetBool('reader-statistics', 1)
|
|
|
|
|
+ self.rsUpdateInterval = base.config.GetDouble('reader-statistics-interval', 10)
|
|
|
return None
|
|
return None
|
|
|
|
|
|
|
|
def setServerDelta(self, delta):
|
|
def setServerDelta(self, delta):
|
|
@@ -216,10 +223,15 @@ class ClientRepository(DirectObject.DirectObject):
|
|
|
self.tcpConn.considerFlush()
|
|
self.tcpConn.considerFlush()
|
|
|
except:
|
|
except:
|
|
|
pass
|
|
pass
|
|
|
|
|
+
|
|
|
|
|
+ if self.rsDoReport:
|
|
|
|
|
+ self.reportReaderStatistics()
|
|
|
|
|
|
|
|
if self.connectHttp:
|
|
if self.connectHttp:
|
|
|
datagram = Datagram()
|
|
datagram = Datagram()
|
|
|
if self.tcpConn.receiveDatagram(datagram):
|
|
if self.tcpConn.receiveDatagram(datagram):
|
|
|
|
|
+ if self.rsDoReport:
|
|
|
|
|
+ self.rsDatagramCount += 1
|
|
|
self.handleDatagram(datagram)
|
|
self.handleDatagram(datagram)
|
|
|
return 1
|
|
return 1
|
|
|
|
|
|
|
@@ -235,6 +247,8 @@ class ClientRepository(DirectObject.DirectObject):
|
|
|
if self.qcr.dataAvailable():
|
|
if self.qcr.dataAvailable():
|
|
|
datagram = NetDatagram()
|
|
datagram = NetDatagram()
|
|
|
if self.qcr.getData(datagram):
|
|
if self.qcr.getData(datagram):
|
|
|
|
|
+ if self.rsDoReport:
|
|
|
|
|
+ self.rsDatagramCount += 1
|
|
|
self.handleDatagram(datagram)
|
|
self.handleDatagram(datagram)
|
|
|
return 1
|
|
return 1
|
|
|
return 0
|
|
return 0
|
|
@@ -265,6 +279,19 @@ class ClientRepository(DirectObject.DirectObject):
|
|
|
# inherit from it need to make their own handleDatagram method
|
|
# inherit from it need to make their own handleDatagram method
|
|
|
pass
|
|
pass
|
|
|
|
|
|
|
|
|
|
+ def reportReaderStatistics(self):
|
|
|
|
|
+ now = globalClock.getRealTime()
|
|
|
|
|
+ if now - self.rsLastUpdate < self.rsUpdateInterval:
|
|
|
|
|
+ return
|
|
|
|
|
+
|
|
|
|
|
+ self.rsLastUpdate = now
|
|
|
|
|
+ self.notify.info("Received %s datagrams" % (self.rsDatagramCount))
|
|
|
|
|
+ if self.rsUpdateObjs:
|
|
|
|
|
+ self.notify.info("Updates: %s" % (self.rsUpdateObjs))
|
|
|
|
|
+
|
|
|
|
|
+ self.rsDatagramCount = 0
|
|
|
|
|
+ self.rsUpdateObjs = {}
|
|
|
|
|
+
|
|
|
def handleGenerateWithRequired(self, di):
|
|
def handleGenerateWithRequired(self, di):
|
|
|
# Get the class Id
|
|
# Get the class Id
|
|
|
classId = di.getArg(STUint16);
|
|
classId = di.getArg(STUint16);
|
|
@@ -471,7 +498,10 @@ class ClientRepository(DirectObject.DirectObject):
|
|
|
# Get the DO Id
|
|
# Get the DO Id
|
|
|
doId = di.getArg(STUint32)
|
|
doId = di.getArg(STUint32)
|
|
|
#print("Updating " + str(doId))
|
|
#print("Updating " + str(doId))
|
|
|
|
|
+ if self.rsDoReport:
|
|
|
|
|
+ self.rsUpdateObjs[doId] = self.rsUpdateObjs.get(doId, 0) + 1
|
|
|
# Find the DO
|
|
# Find the DO
|
|
|
|
|
+
|
|
|
do = self.doId2do.get(doId)
|
|
do = self.doId2do.get(doId)
|
|
|
cdc = self.doId2cdc.get(doId)
|
|
cdc = self.doId2cdc.get(doId)
|
|
|
if (do != None and cdc != None):
|
|
if (do != None and cdc != None):
|