Attachment 299325 Details for Bug 439146 – patch for total interrupts

[patch] patch for total interrupts

dstat-0.6.7-int.patch (text/plain), 1.74 KB, created by Radek Brich on 2008-03-27 14:19:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Brich

Created: 2008-03-27 14:19:57 UTC

Size: 1.74 KB

patch

obsolete

>diff -up dstat-0.6.7/dstat.int dstat-0.6.7/dstat
>--- dstat-0.6.7/dstat.int	2008-02-26 01:03:29.000000000 +0100
>+++ dstat-0.6.7/dstat	2008-03-27 13:01:49.000000000 +0100
>@@ -798,7 +798,6 @@ class dstat_epoch(dstat):
> #   def show(self):
> #       return ansi['reset'] + ( '%10.2f' % self.val['epoch'] )
> 
>-### FIXME: Make total work as well
> class dstat_int(dstat):
>     def __init__(self):
>         self.name = 'interrupts'
>@@ -845,13 +844,13 @@ class dstat_int(dstat):
>         if op.intlist:
>             list = op.intlist
>         else:
>-            list = self.discover + ['total']
>+            list = self.discover
>             for name in list:
>                 if name in ('0', '1', '2', '8', 'NMI', 'LOC', 'MIS', 'CPU0'):
>                     list.remove(name)
>             if not op.full and len(list) > 3: list = list[-3:]
>         for name in list:
>-            if name in self.discover:
>+            if name in self.discover + ['total']:
>                 ret.append(name)
>             elif name.lower() in self.intmap.keys():
>                 ret.append(self.intmap[name.lower()])
>@@ -862,9 +861,11 @@ class dstat_int(dstat):
>             l = line.split()
>             if not l or l[0] != 'intr': continue
>             for name in self.vars:
>-                self.cn2[name] = long(l[int(name) + 2])
>-            self.cn2['total'] = self.cn2['total'] + long(l[int(name) + 2])
>-        for name in self.vars + ['total']:
>+                if name == 'total':
>+                    self.cn2['total'] = long(l[1])
>+                else:
>+                    self.cn2[name] = long(l[int(name) + 2])
>+        for name in self.vars:
>             self.val[name] = (self.cn2[name] - self.cn1[name]) * 1.0 / tick
>         if step == op.delay:
>             self.cn1.update(self.cn2)

Actions: View | Diff

Attachments on bug 439146: 299325