ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/host/generic/statgrab.pl
(Generate patch)

Comparing projects/cms/source/host/generic/statgrab.pl (file contents):
Revision 1.42 by pjm2, Wed Mar 21 10:51:32 2001 UTC vs.
Revision 1.45 by tdb, Tue Oct 16 10:48:08 2001 UTC

# Line 105 | Line 105 | sub print_pair($$$) {
105   sub include_disk() {
106      
107      # Run the df program.
108 <    my(@df) = `$dfbin -ak`;
108 >    my(@df) = `$dfbin -akl`;
109  
110      # Go through each line of the program, looking for each thing we want.
111      my($partition_no) = 0;
# Line 268 | Line 268 | sub include_top() {
268          # The following need to be specified in megabytes.
269          # If they are preceeded by a G, then multiply by 1024.  
270          
271 <        $top =~ /Mem:.*?([0-9]+)([KMG])\s+av/;
271 >        $top =~ /Mem:.*?([0-9]+)([KMG])\s+(av|total)/;
272          my($real) = $1;
273          $real*=1024 if $2 eq "G";
274          $real/=1024 if $2 eq "K";
# Line 280 | Line 280 | sub include_top() {
280          $free/=1024 if $2 eq "K";
281          &print_pair(0, "packet.memory.free", int($free));
282          
283 <        $top =~ /Swap:.*?([0-9]]+)([KMG])\s+av/;
283 >        $top =~ /Swap:.*?([0-9]+)([KMG])\s+(av|total)/;
284          my($swap_total) = $1;
285          $swap_total*=1024 if $2 eq "G";
286          $swap_total/=1024 if $2 eq "K";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines