Bug 1592 - Parsing bug in FlowMonitor example script (fix suggested by Eric Hein)
authorTommaso Pecorella <tommaso.pecorella@unifi.it>
Sun, 15 Dec 2013 09:02:28 +0100
changeset 10526 a69d7ca6e5b4
parent 10525 dd7455dbc658
child 10527 210b3b72062d
Bug 1592 - Parsing bug in FlowMonitor example script (fix suggested by Eric Hein)
RELEASE_NOTES
src/flow-monitor/examples/flowmon-parse-results.py
--- a/RELEASE_NOTES	Sat Dec 14 10:13:57 2013 +0100
+++ b/RELEASE_NOTES	Sun Dec 15 09:02:28 2013 +0100
@@ -71,6 +71,7 @@
 Bugs fixed
 ----------
 - Bug 1496 - Option to print log level in NS_LOG messages, and documentation.
+- Bug 1592 - Parsing bug in FlowMonitor example script
 - Bug 1756 - RLC AM Mode State Variable Bug
 - Bug 1763 - Message 3 should be sent using the UL GRANT in the RAR
 - Bug 1778 - Implement TapBridge::IsLinkUp() function
--- a/src/flow-monitor/examples/flowmon-parse-results.py	Sat Dec 14 10:13:57 2013 +0100
+++ b/src/flow-monitor/examples/flowmon-parse-results.py	Sun Dec 15 09:02:28 2013 +0100
@@ -8,7 +8,7 @@
 
 def parse_time_ns(tm):
     if tm.endswith('ns'):
-        return long(tm[:-2])
+        return long(tm[:-4])
     raise ValueError(tm)
 
 
@@ -39,8 +39,8 @@
         self.flowId = int(flow_el.get('flowId'))
         rxPackets = long(flow_el.get('rxPackets'))
         txPackets = long(flow_el.get('txPackets'))
-        tx_duration = float(long(flow_el.get('timeLastTxPacket')[:-2]) - long(flow_el.get('timeFirstTxPacket')[:-2]))*1e-9
-        rx_duration = float(long(flow_el.get('timeLastRxPacket')[:-2]) - long(flow_el.get('timeFirstRxPacket')[:-2]))*1e-9
+        tx_duration = float(long(flow_el.get('timeLastTxPacket')[:-4]) - long(flow_el.get('timeFirstTxPacket')[:-4]))*1e-9
+        rx_duration = float(long(flow_el.get('timeLastRxPacket')[:-4]) - long(flow_el.get('timeFirstRxPacket')[:-4]))*1e-9
         self.rx_duration = rx_duration
         self.probe_stats_unsorted = []
         if rxPackets:
@@ -48,7 +48,7 @@
         else:
             self.hopCount = -1000
         if rxPackets:
-            self.delayMean = float(flow_el.get('delaySum')[:-2]) / rxPackets * 1e-9
+            self.delayMean = float(flow_el.get('delaySum')[:-4]) / rxPackets * 1e-9
             self.packetSizeMean = float(flow_el.get('rxBytes')) / rxPackets
         else:
             self.delayMean = None