From: Michael Vrable <mvrable@cs.ucsd.edu>
Date: Tue, 27 Apr 2010 21:13:45 +0000 (-0700)
Subject: Print flow identification in TCP parsing output.
X-Git-Url: http://git.vrable.net/?a=commitdiff_plain;h=28fcabeed673340d8aec42d51c1cbea89b748212;p=bluesky.git

Print flow identification in TCP parsing output.

Also fix a division-by-zero bug in computing bandwidth if no data is
transferred.
---

diff --git a/parsetrace/parse.py b/parsetrace/parse.py
index 4419a35..687dd79 100755
--- a/parsetrace/parse.py
+++ b/parsetrace/parse.py
@@ -45,11 +45,12 @@ class Connection:
             print "Network RTT:", rtt
             print "Additional response delay:", start - rtt
             print "Transfer time:", end - start
-            print "Bandwidth:", data / (end - start)
+            if end - start > 0:
+                print "Bandwidth:", data / (end - start)
             print
-            logfile.write("%d\t%d\t%d\t%f\t%f\t%f\n"
+            logfile.write("%d\t%d\t%d\t%f\t%f\t%f\t# %s\n"
                           % (self.id, self.transfer_count, data,
-                              rtt, start - rtt, end - start))
+                              rtt, start - rtt, end - start, self.endpoints))
             self.transfer_count += 1
         self.times = []
         self.state = STATE_START