dstat_vz_ubc.py (dstat-0.7.3) | : | dstat_vz_ubc.py (dstat-0.7.4) | ||
---|---|---|---|---|
skipping to change at line 53 | skipping to change at line 53 | |||
def extract(self): | def extract(self): | |||
for name in self.vars + ['total']: | for name in self.vars + ['total']: | |||
self.set2[name] = 0 | self.set2[name] = 0 | |||
for l in self.splitlines(): | for l in self.splitlines(): | |||
if len(l) < 6 or l[0] == 'uid': | if len(l) < 6 or l[0] == 'uid': | |||
continue | continue | |||
elif len(l) == 7: | elif len(l) == 7: | |||
name = l[0][0:-1] | name = l[0][0:-1] | |||
if name in self.vars: | if name in self.vars: | |||
self.set2[name] = self.set2[name] + long(l[6]) | self.set2[name] = self.set2[name] + int(l[6]) | |||
self.set2['total'] = self.set2['total'] + long(l[6]) | self.set2['total'] = self.set2['total'] + int(l[6]) | |||
elif name == '0': | elif name == '0': | |||
continue | continue | |||
else: | else: | |||
if name in self.vars: | if name in self.vars: | |||
self.set2[name] = self.set2[name] + long(l[5]) | self.set2[name] = self.set2[name] + int(l[5]) | |||
self.set2['total'] = self.set2['total'] + long(l[5]) | self.set2['total'] = self.set2['total'] + int(l[5]) | |||
for name in self.vars: | for name in self.vars: | |||
self.val[name] = (self.set2[name] - self.set1[name]) * 1.0 / elapsed | self.val[name] = (self.set2[name] - self.set1[name]) * 1.0 / elapsed | |||
if step == op.delay: | if step == op.delay: | |||
self.set1.update(self.set2) | self.set1.update(self.set2) | |||
# vim:ts=4:sw=4:et | # vim:ts=4:sw=4:et | |||
End of changes. 2 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |