From 7cb340b7c998c230e42a2a4fccfc2f5eab814ac5 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Tue, 10 Apr 2012 00:12:37 +0000
Subject: [PATCH] Pass code check.

---
 examples/multiping.py  | 22 ++++++------------
 examples/multipoll.py  |  8 +++----
 examples/simpleperf.py | 53 +++++++++++++++++++++---------------------
 3 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/examples/multiping.py b/examples/multiping.py
index 6729204..ac8aed5 100755
--- a/examples/multiping.py
+++ b/examples/multiping.py
@@ -26,20 +26,19 @@ def startpings( host, targetips ):
     targetips.append( '10.0.0.200' )
 
     targetips = ' '.join( targetips )
-    
+
     # BL: Not sure why loopback intf isn't up!
     host.cmd( 'ifconfig lo up' )
 
-    
     # Simple ping loop
     cmd = ( 'while true; do '
-            ' for ip in %s; do ' % targetips  +
+            ' for ip in %s; do ' % targetips +
             '  echo -n %s "->" $ip ' % host.IP() +
             '   `ping -c1 -w 1 $ip | grep packets` ;'
             '  sleep 1;'
             ' done; '
             'done &' )
-    
+
     print ( '*** Host %s (%s) will be pinging ips: %s' %
            ( host.name, host.IP(), targetips ) )
 
@@ -47,7 +46,7 @@ def startpings( host, targetips ):
 
 def multiping( netsize, chunksize, seconds):
     "Ping subsets of size chunksize in net of size netsize"
-    
+
     # Create network and identify subnets
     topo = SingleSwitchTopo( netsize )
     net = Mininet( topo=topo )
@@ -60,13 +59,13 @@ def multiping( netsize, chunksize, seconds):
     poller = poll()
     for fd in fds:
         poller.register( fd, POLLIN )
-    
+
     # Start pings
     for subnet in subnets:
         ips = [ host.IP() for host in subnet ]
         for host in subnet:
             startpings( host, ips )
-    
+
     # Monitor output
     endTime = time() + seconds
     while time() < endTime:
@@ -78,17 +77,10 @@ def multiping( netsize, chunksize, seconds):
     # Stop pings
     for host in hosts:
         host.cmd( 'kill %while' )
-    
+
     net.stop()
 
 
 if __name__ == '__main__':
     setLogLevel( 'info' )
     multiping( netsize=20, chunksize=4, seconds=10 )
-
-    
-    
-
-    
-    
-    
\ No newline at end of file
diff --git a/examples/multipoll.py b/examples/multipoll.py
index a3ffcc6..f670827 100755
--- a/examples/multipoll.py
+++ b/examples/multipoll.py
@@ -8,13 +8,13 @@ monitoring them
 from mininet.topo import SingleSwitchTopo
 from mininet.net import Mininet
 from mininet.log import setLogLevel
-from mininet.util import quietRun
 
-from time import time, sleep
+from time import time
 from select import poll, POLLIN
 from subprocess import Popen, PIPE
 
 def monitorFiles( outfiles, seconds, timeoutms ):
+    "Monitor set of files and return [(host, line)...]"
     devnull = open( '/dev/null', 'w' )
     tails, fdToFile, fdToHost = {}, {}, {}
     for h, outfile in outfiles.iteritems():
@@ -63,7 +63,7 @@ def monitorTest( N=3, seconds=3 ):
         h.cmd( 'echo >', outfiles[ h ] )
         h.cmd( 'echo >', errfiles[ h ] )
         # Start pings
-        h.cmdPrint('ping', server.IP(), 
+        h.cmdPrint('ping', server.IP(),
                    '>', outfiles[ h ],
                    '2>', errfiles[ h ],
                    '&' )
@@ -79,5 +79,3 @@ def monitorTest( N=3, seconds=3 ):
 if __name__ == '__main__':
     setLogLevel('info')
     monitorTest()
-
-    
diff --git a/examples/simpleperf.py b/examples/simpleperf.py
index 12ca736..05cb2ae 100644
--- a/examples/simpleperf.py
+++ b/examples/simpleperf.py
@@ -12,34 +12,33 @@ from mininet.util import dumpNodeConnections
 from mininet.log import setLogLevel
 
 class SingleSwitchTopo(Topo):
-   "Single switch connected to n hosts."
-   def __init__(self, n=2, **opts):
-       Topo.__init__(self, **opts)
-       switch = self.add_switch('s1')
-       for h in range(n):
-        # Each host gets 50%/n of system CPU
-           host = self.add_host('h%s' % (h + 1),
-            cpu=.5/n)
-        # 10 Mbps, 5ms delay, 10% loss
-           self.add_link(host, switch,
-            bw=10, delay='5ms', loss=10, use_htb=True)
+    "Single switch connected to n hosts."
+    def __init__(self, n=2, **opts):
+        Topo.__init__(self, **opts)
+        switch = self.add_switch('s1')
+        for h in range(n):
+            # Each host gets 50%/n of system CPU
+            host = self.add_host('h%s' % (h + 1),
+                                 cpu=.5 / n)
+            # 10 Mbps, 5ms delay, 10% loss
+            self.add_link(host, switch,
+                          bw=10, delay='5ms', loss=10, use_htb=True)
 
 def perfTest():
-   "Create network and run simple performance test"
-   topo = SingleSwitchTopo(n=4)
-   net = Mininet(topo=topo,
-                 host=CPULimitedHost, link=TCLink)
-   net.start()
-   print "Dumping host connections"
-   dumpNodeConnections(net.hosts)
-   print "Testing network connectivity"
-   net.pingAll()
-   print "Testing bandwidth between h1 and h4"
-   h1 = net.getNodeByName('h1')
-   h4 = net.getNodeByName('h4')
-   net.iperf((h1, h4))
-   net.stop()
+    "Create network and run simple performance test"
+    topo = SingleSwitchTopo(n=4)
+    net = Mininet(topo=topo,
+                  host=CPULimitedHost, link=TCLink)
+    net.start()
+    print "Dumping host connections"
+    dumpNodeConnections(net.hosts)
+    print "Testing network connectivity"
+    net.pingAll()
+    print "Testing bandwidth between h1 and h4"
+    h1, h4 = net.getNodeByName('h1', 'h4')
+    net.iperf((h1, h4))
+    net.stop()
 
 if __name__ == '__main__':
-   setLogLevel('info')
-   perfTest()
+    setLogLevel('info')
+    perfTest()