Skip to content
This repository
Browse code

Preparing 0.5.7.

  • Loading branch information...
commit e827e29ad11c997ab10e2a5c924876bb81cbfb40 1 parent 9c8247e
Dag Wieers authored December 23, 2004
7  ChangeLog
... ...
@@ -1,3 +1,7 @@
  1
+* 0.5.7
  2
+- Change Makefile to not install when run without target. (Kurt Roeckx)
  3
+- Fixed another crash caused by /proc instability.
  4
+
1 5
 * 0.5.6
2 6
 - Made sys and int stats unit-aware (so 10000 int/sec -> 10.0k) (Anton Blanchard)
3 7
 - Improve conv() function and stat show() functions
@@ -13,7 +17,8 @@
13 17
 - Added smp support (Bert de Bruijn)
14 18
 - proc stats now show averages
15 19
 - Check if output is a tty, else disable colors and updates
16  
-- Fixed bug in interrupt stats on smp systems
  20
+- Fixed bug in interrupt stats on smp systems (Bert de Bruijn)
  21
+- Improved intterupt stats (Bert de Bruijn)
17 22
 - Improvement in output, 10.0k or 5.0 will be displayed simply as 10k or 5
18 23
 - proc stats now show floats
19 24
 
3  Makefile
@@ -4,7 +4,8 @@ bindir = $(prefix)/bin
4 4
 datadir = $(prefix)/share
5 5
 mandir = $(datadir)/man
6 6
 
7  
-all: install
  7
+all:
  8
+	@echo "No build phase."
8 9
 
9 10
 install:
10 11
 #	-[ ! -f $(DESTDIR)$(sysconfdir)/dstat.conf ] && install -D -m0644 dstat.conf $(DESTDIR)$(sysconfdir)/dstat.conf
3  TODO
@@ -21,9 +21,10 @@
21 21
 + Look into interfacing with specific HW counters in /proc
22 22
 
23 23
 ### General bugs
  24
++ Backport all changes to dstat15
24 25
 + Timer is not accurate on 2.6 kernel, every second there's a 1ms deviation (every 17mins -> 1sec)
25 26
 
26 27
 ### Stat bugs
27 28
 + tcp stat is very slow and generates lots of softirqs (on some systems)
28  
-+ proc stat seems to be off by one, no clue why
29 29
 + Implement better (?) protection against counter rollovers
  30
++ Fix bug with: ./dstat -tit -I 177
14  dstat
@@ -20,7 +20,7 @@ import os, sys, re, getopt, time, termios
20 20
 import ConfigParser, urlparse, signal, resource
21 21
 #import curses
22 22
 
23  
-VERSION = '0.5.6'
  23
+VERSION = '0.5.7'
24 24
 
25 25
 enable = ('yes', 'on', 'true', '1')
26 26
 disable = ('no', 'off', 'false', '0')
@@ -223,8 +223,9 @@ class dstat:
223 223
 		if isinstance(self.name, types.StringType):
224 224
 			return self.len
225 225
 		else:
226  
-			for i in self.cn2: break
227  
-			return len(self.cn2[i]) * self.len + len(self.cn2[i]) - 1
  226
+			for name in self.cn2.keys():
  227
+				return len(self.cn2[name]) * self.len + len(self.cn2[name]) - 1
  228
+			return 0
228 229
 
229 230
 	def title1(self):
230 231
 		if isinstance(self.name, types.StringType):
@@ -255,7 +256,7 @@ class dstat:
255 256
 			return ansi['blue'] + ret
256 257
 
257 258
 	def check(self):
258  
-		if self.discover():
  259
+		if self.discover() and self.width():
259 260
 			return True
260 261
 		return False
261 262
 
@@ -766,6 +767,7 @@ class dstat_net(dstat):
766 767
 				l = l2[1:] + l[1:]
767 768
 			else:
768 769
 				l = l[1:]
  770
+			if len(l) < 9: continue
769 771
 			if name in (self.vars) :
770 772
 				self.cn2[name] = ( long(l[0]), long(l[8]) )
771 773
 			if not re.match('^(Inter-\||face|lo)$', name):
@@ -851,7 +853,7 @@ class dstat_proc(dstat):
851 853
 				self.val['processes'] = 0
852 854
 				self.cn2[name] = long(l[1])
853 855
 			elif name == 'procs_running':
854  
-				self.cn2[name] = self.cn2[name] + long(l[1]) - 1
  856
+				self.cn2[name] = self.cn2[name] + long(l[1]) - 2
855 857
 			elif name == 'procs_blocked':
856 858
 				self.cn2[name] = self.cn2[name] + long(l[1])
857 859
 		if update:
@@ -1281,7 +1283,7 @@ def main():
1281 1283
 		if update <= op.delay * op.count or op.count == -1:
1282 1284
 			signal.pause()
1283 1285
 
1284  
-		### The last step in a loop is to show the definitive line on a new line
  1286
+		### The last step in a loop is to show the definitive line on its own line
1285 1287
 		if step == op.delay:
1286 1288
 			sys.stdout.write('\n' + ansi['reset'] + ansi['clearline'] + ansi['save'])
1287 1289
 		else:
7  dstat.spec
@@ -9,7 +9,7 @@
9 9
 
10 10
 Summary: Versatile vmstat, iostat and ifstat replacement
11 11
 Name: dstat
12  
-Version: 0.5.6
  12
+Version: 0.5.7
13 13
 Release: 1
14 14
 License: GPL
15 15
 Group: System Environment/Base
@@ -72,7 +72,10 @@ interprete real-time data as easy as possible.
72 72
 %{_bindir}/dstat
73 73
 
74 74
 %changelog
75  
-* Wed Dec 08 2004 Dag Wieers <dag@wieers.com> - 0.5.6-1
  75
+* Tue Dec 21 2004 Dag Wieers <dag@wieers.com> - 0.5.7-1
  76
+- Updated to release 0.5.7.
  77
+
  78
+* Mon Dec 20 2004 Dag Wieers <dag@wieers.com> - 0.5.6-1
76 79
 - Updated to release 0.5.6.
77 80
 
78 81
 * Thu Dec 02 2004 Dag Wieers <dag@wieers.com> - 0.5.5-1
2  dstat15
@@ -19,7 +19,7 @@ import fcntl, struct, termios
19 19
 import os, sys, re, getopt, time, string
20 20
 import ConfigParser, urlparse, signal, resource
21 21
 
22  
-VERSION = '0.5.6'
  22
+VERSION = '0.5.7'
23 23
 
24 24
 enable = ('yes', 'on', 'true', '1')
25 25
 disable = ('no', 'off', 'false', '0')

0 notes on commit e827e29

Please sign in to comment.
Something went wrong with that request. Please try again.