Network top layout (#49)

* Fixed: output layout for network-top looks well.
* Fixed: tests for softnet-stat-top.
* Changed: new __sub__() returns SoftnetStat object.
* Added: __eq__() function, comparing each field in SoftnetStat objects.

Author: strizhechenko

Makefile

@@ -48,5 +48,5 @@ mac_run: env
 	network-top --random \
 		--softirqs-file=./tests/softirqs/i7/softirqs1 \
 		--softnet-stat-file=./tests/softnet_stat/softnet_stat1 \
-		--interrupts-file=./tests/interrupts/multinic_multiqueue_4cpu/interrupts_short \
+		--interrupts-file=./tests/interrupts/singlequeue_8cpu/interrupts_short \
 		--devices=eth1,eth2,eth3

netutils_linux/network_top.py

@@ -33,8 +33,62 @@ def tick(self):
             _top.tick()
         self.eval()
 
+    def __repr_dev(self):
+        top = self.tops.get('link-rate')
+        repr_source = top.diff if top.options.delta_mode else top.current
+        output = ["# network devices\n"]
+        for dev in top.options.devices:
+            output.append("{0:<14} {1}".format(dev, top.__repr_dev__(dev)))
+        return "\n".join(output)
+
+    def __repr_irq(self):
+        top = self.tops.get('irqtop')
+        repr_source = top.diff if top.options.delta_mode else top.current
+        if not top.diff_total:
+            return ""
+        # output_lines = ["\t".join(str(x) for x in ['Total:'] + map(str, top.diff_total))]
+        output_lines = list()
+        for line in repr_source:
+            if line[0] == 'CPU0':
+                line.insert(0, ' ')
+            elif top.skip_zero_line(line):
+                continue
+            output_lines.append("\t".join(map(str, line)))
+        return "\n".join(["# /proc/interrupts\n"] + output_lines)
+
+    def __repr_cpu(self):
+        irqtop = self.tops.get('irqtop')
+        softirq_top = self.tops.get('softirq_top')
+        softnet_stat_top = self.tops.get('softnet_stat_top')
+
+        # all these evaluations are better to put in softirqs.parse()
+        softirq_repr_source = softirq_top.diff if softirq_top.options.delta_mode else softirq_top.current
+        active_cpu_count = softirq_top.__active_cpu_count__(softirq_top.current)
+        softirq_output = softirq_repr_source.get('NET_RX')[:active_cpu_count]
+        softnet_stat_top_output = softnet_stat_top.diff if softnet_stat_top.options.delta_mode else softnet_stat_top.current
+
+        network_output = zip(irqtop.diff_total, softirq_output, softnet_stat_top_output)
+        fields = ["CPU", "Interrupts", "NET RX", "total", "dropped", "time_squeeze", "cpu_collision", "received_rps"]
+        header = "# Load per cpu:\n\n{0:6}  {1:>12} {2:>12} {3:>12} {4:>8} {5:>12} {6:>13} {7:>12}".format(*fields)
+        output = [header] + [
+            "CPU{0:3}: {1:>12} {2:>12} {3:>12} {4:>8} {5:>12} {6:>13} {7:>12}".format(softnet_stat.cpu, irq, softirq,
+                                                                                      softnet_stat.total,
+                                                                                      softnet_stat.dropped,
+                                                                                      softnet_stat.time_squeeze,
+                                                                                      softnet_stat.cpu_collision,
+                                                                                      softnet_stat.received_rps)
+            for irq, softirq, softnet_stat in network_output
+        ]
+        return "\n".join(output)
+
     def __repr__(self):
-        return "\n".join(str(_top) for top_name, _top in self.tops.iteritems())
+        # return "\n".join(str(_top) for top_name, _top in self.tops.iteritems())
+        return "\n\n".join([
+            self.header,
+            self.__repr_irq(),
+            self.__repr_cpu(),
+            self.__repr_dev(),
+        ])
 
     def parse_options(self):
         parser = OptionParser()

netutils_linux/softnet_stat.py

@@ -4,29 +4,51 @@
 
 
 class SoftnetStat:
-    def __init__(self, row, cpu, random=False):
+    cpu = None
+    total = None
+    dropped = None
+    time_squeeze = None
+    cpu_collision = None
+    received_rps = None
+
+    def __init__(self, random=False):
+        self.random = random
+
+    def parse_string(self, row, cpu):
         row = [int('0x' + x, 16) for x in row.strip().split()]
         self.total, self.dropped, self.time_squeeze = row[0:3]
         self.cpu_collision = row[6]
         self.received_rps = row[7]
         self.cpu = cpu
-        self.random = random
+        return self
+
+    def parse_list(self, data):
+        self.cpu, self.total, self.dropped, self.time_squeeze, self.cpu_collision, self.received_rps = data
+        return self
 
     def __repr__(self):
         return "CPU: {0:2} total: {1:11} dropped: {2} time_squeeze: {3:4} cpu_collision: {4} received_rps: {5}" \
             .format(self.cpu, self.total, self.dropped, self.time_squeeze, self.cpu_collision, self.received_rps)
 
     def __sub__(self, other):
-        template = "CPU: {0:2} total: {1:8} dropped: {2} time_squeeze: {3} cpu_collision: {4} received_rps: {5}"
-        if self.random:
-            return template.format(self.cpu, randint(1, 100000), randint(0, 1), randint(0, 10), 0, randint(0, 5))
-        return template \
-            .format(self.cpu,
-                    self.total - other.total,
-                    self.dropped - other.dropped,
-                    self.time_squeeze - other.time_squeeze,
-                    self.cpu_collision - other.cpu_collision,
-                    self.received_rps - other.received_rps)
+        return SoftnetStat().parse_list([
+            self.cpu,
+            randint(1, 100000) if self.random else self.total - other.total,
+            randint(0, 1) if self.random else self.dropped - other.dropped,
+            randint(0, 10) if self.random else self.time_squeeze - other.time_squeeze,
+            0 if self.random else self.cpu_collision - other.cpu_collision,
+            randint(0, 5) if self.random else self.received_rps - other.received_rps
+        ])
+
+    def __eq__(self, other):
+        return all([
+            self.cpu == other.cpu,
+            self.total == other.total,
+            self.dropped == other.dropped,
+            self.time_squeeze == other.time_squeeze,
+            self.cpu_collision == other.cpu_collision,
+            self.received_rps == other.received_rps,
+        ])
 
 
 class SoftnetStatTop(BaseTop):
@@ -41,9 +63,10 @@ def __init__(self):
     def parse(self):
         with open(self.options.softnet_stat_file) as softnet_stat:
             data = softnet_stat.read().strip().split('\n')
-            return [SoftnetStat(row, cpu, self.options.random) for cpu, row in enumerate(data)]
+            return [SoftnetStat(self.options.random).parse_string(row, cpu) for cpu, row in enumerate(data)]
 
     def eval(self):
+        print self.current
         self.diff = [data - self.previous[cpu] for cpu, data in enumerate(self.current)]
 
     def __repr__(self):

tests/interrupts/singlequeue_8cpu/interrupts_short

@@ -0,0 +1,11 @@
+           CPU0       CPU1       CPU2       CPU3       CPU4       CPU5       CPU6       CPU7       
+  0:        133          0          0          0          0          0          0          0  IR-IO-APIC-edge      timer
+ 17:  825698509          0          0          0          0          0          0          0  IR-IO-APIC-fasteoi   eth0
+ 18:     888213          0          0          0          0          0          0          0  IR-IO-APIC-fasteoi   eth1
+ 26:       5922          0          0          0          0          0          0          0  IR-HPET_MSI-edge      hpet2
+ 34:  362262054          0          0          0          0          0          0          0  IR-PCI-MSI-edge      ahci
+ 35:        301          0          0          0          0          0          0          0  IR-PCI-MSI-edge      snd_hda_intel
+LOC: 1524101041 1201179305 1064310873  976437815 1527876073 1057933934 1005872914  926783958   Local timer interrupts
+RES:   27928951   23470011   22810864   23039338   29556969   24381694   22775135   21870396   Rescheduling interrupts
+CAL:   35167682   25159679   16355174   11470742   30081046   19313300   12014676    8780072   Function call interrupts
+TLB:   11033015   13526546   12035501   10882796   13228285   19068022   16802525   13950467   TLB shootdowns

tests/softnet_stat_test.py

@@ -28,10 +28,11 @@ class SoftnetStatTests(unittest.TestCase):
     """
 
     def test_delta(self):
-        __first = [SoftnetStat(row, cpu) for cpu, row in enumerate(self.first.strip().split('\n'))]
-        __second = [SoftnetStat(row, cpu) for cpu, row in enumerate(self.second.strip().split('\n'))]
+        __first = [SoftnetStat().parse_string(row, cpu) for cpu, row in enumerate(self.first.strip().split('\n'))]
+        __second = [SoftnetStat().parse_string(row, cpu) for cpu, row in enumerate(self.second.strip().split('\n'))]
         delta = __second[0] - __first[0]
-        expected = 'CPU:  0 total:    11936 dropped: 0 time_squeeze: 0 cpu_collision: 0 received_rps: 0'
+        data = [0, 11936, 0, 0, 0, 0]
+        expected = SoftnetStat().parse_list(data)
         self.assertEqual(delta, expected)