From 82ba393469dfe2bd7f6394beb9625dbaf426dc47 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Sun, 15 Dec 2013 09:02:28 +0100 Subject: [PATCH] Bug 1592 - Parsing bug in FlowMonitor example script (fix suggested by Eric Hein) --- RELEASE_NOTES | 1 + src/flow-monitor/examples/flowmon-parse-results.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 9639c07c1..c7471fad7 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -71,6 +71,7 @@ New user-visible features 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 diff --git a/src/flow-monitor/examples/flowmon-parse-results.py b/src/flow-monitor/examples/flowmon-parse-results.py index f0adf03be..30b112905 100644 --- a/src/flow-monitor/examples/flowmon-parse-results.py +++ b/src/flow-monitor/examples/flowmon-parse-results.py @@ -8,7 +8,7 @@ except ImportError: def parse_time_ns(tm): if tm.endswith('ns'): - return long(tm[:-2]) + return long(tm[:-4]) raise ValueError(tm) @@ -39,8 +39,8 @@ class Flow(object): 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 @@ class Flow(object): 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