"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "plugins/dstat_freespace.py" between
dstat-0.7.3.tar.gz and dstat-0.7.4.tar.gz

About: dstat is a versatile resource statistic tool and a replacement for vmstat, iostat and ifstat (using Python).

dstat_freespace.py  (dstat-0.7.3)	:	dstat_freespace.py  (dstat-0.7.4)
skipping to change at line 28		skipping to change at line 28
for l in self.splitlines():		for l in self.splitlines():
if len(l) < 6: continue		if len(l) < 6: continue
if l[2] in ('binfmt_misc', 'devpts', 'iso9660', 'none', 'proc', 'sys fs', 'usbfs', 'cgroup', 'tmpfs', 'devtmpfs', 'debugfs', 'mqueue', 'systemd-1', ' rootfs', 'autofs'): continue		if l[2] in ('binfmt_misc', 'devpts', 'iso9660', 'none', 'proc', 'sys fs', 'usbfs', 'cgroup', 'tmpfs', 'devtmpfs', 'debugfs', 'mqueue', 'systemd-1', ' rootfs', 'autofs'): continue
### FIXME: Excluding 'none' here may not be what people want (/dev/s hm)		### FIXME: Excluding 'none' here may not be what people want (/dev/s hm)
if l[0] in ('devpts', 'none', 'proc', 'sunrpc', 'usbfs', 'securityfs ', 'hugetlbfs', 'configfs', 'selinuxfs', 'pstore', 'nfsd'): continue		if l[0] in ('devpts', 'none', 'proc', 'sunrpc', 'usbfs', 'securityfs ', 'hugetlbfs', 'configfs', 'selinuxfs', 'pstore', 'nfsd'): continue
name = l[1]		name = l[1]
res = os.statvfs(name)		res = os.statvfs(name)
if res[0] == 0: continue ### Skip zero block filesystems		if res[0] == 0: continue ### Skip zero block filesystems
ret.append(name)		ret.append(name)
#print l[0] + " / " + name + " / " + l[2]		#print(l[0] + " / " + name + " / " + l[2])
return ret		return ret
def name(self):		def name(self):
return ['/' + os.path.basename(name) for name in self.vars]		return ['/' + os.path.basename(name) for name in self.vars]
def extract(self):		def extract(self):
self.val['total'] = (0, 0)		self.val['total'] = (0, 0)
for name in self.vars:		for name in self.vars:
res = os.statvfs(name)		res = os.statvfs(name)
self.val[name] = ( (float(res.f_blocks) - float(res.f_bavail)) * lon g(res.f_frsize), float(res.f_bavail) * float(res.f_frsize) )		self.val[name] = ( (float(res.f_blocks) - float(res.f_bavail)) * int (res.f_frsize), float(res.f_bavail) * float(res.f_frsize) )
self.val['total'] = (self.val['total'][0] + self.val[name][0], self. val['total'][1] + self.val[name][1])		self.val['total'] = (self.val['total'][0] + self.val[name][0], self. val['total'][1] + self.val[name][1])
# vim:ts=4:sw=4:et		# vim:ts=4:sw=4:et
End of changes. 2 change blocks.
2 lines changed or deleted		2 lines changed or added

---