--- trunk/dwm-status.pl	2007/05/27 08:54:17	34
+++ trunk/dwm-status.pl	2007/05/27 09:14:14	35
@@ -13,6 +13,8 @@
 my $dt = 3;
 my $acpi_every = 10;
 
+my $disk_blk_size = 512;
+
 my $debug = shift @ARGV;
 
 $|=1;
@@ -36,7 +38,7 @@
 
 	warn "unit( $v )\n" if ($debug);
 
-	my @units = qw/b k m g/;
+	my @units = qw/b k M G/;
 	my $o = 0;
 
 	while ( ( $v / 1024 ) >= 1 ) {
@@ -54,6 +56,7 @@
 }
 
 my ( $lrx, $ltx ) = ( 0, 0 );
+my ( $ld_r, $ld_w ) = ( 0, 0 );
 my $bat;
 
 my $i = 0;
@@ -114,11 +117,35 @@
 	}
 	warn "rx: $rx tx: $tx\n" if ($debug);
 
-	my $r = ( $rx - $lrx ) / $dt;
-	my $t = ( $tx - $ltx ) / $dt;
+	my $net_rx = ( $rx - $lrx ) / $dt;
+	my $net_tx = ( $tx - $ltx ) / $dt;
 	( $lrx, $ltx ) = ( $rx, $tx );
 
-	printf "%s | %s |%5s > %-5s| %s%s\n", $s, $load, unit( $r ), unit( $t ), $bat, $temp;
+	my $disk = read_file('/proc/diskstats');
+	my ( $d_r, $d_w ) = ( 0,0 );
+
+	foreach ( split(/\n/, $disk) ) {
+		s/^\s+//;
+		my @d = split(/\s+/, $_, 17);
+		next unless ( $d[2] =~ m/^[sh]d\w$/ );
+
+		warn dump( @d ) if ($debug);
+		$d_r += $d[5] * $disk_blk_size;
+		$d_w += $d[7] * $disk_blk_size;
+	}
+	warn "d_r: $d_r d_w: $d_w\n" if ($debug);
+
+	my $d_read = ( $d_r - $ld_r ) / $dt;
+	my $d_write = ( $d_w - $ld_w ) / $dt;
+	( $ld_r, $ld_w ) = ( $d_r, $d_w );
+
+	printf("%s | %s |%5s D %-5s|%5s > %-5s| %s%s\n",
+		$s,
+		$load,
+		unit( $d_read ), unit( $d_write ),
+		unit( $net_rx ), unit( $net_tx ),
+		$bat, $temp,
+	);
 
 	sleep $dt;
 }