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.21 by tdb, Sun Feb 4 23:40:39 2001 UTC vs.
Revision 1.24 by pjm2, Mon Feb 5 08:33:51 2001 UTC

# Line 131 | Line 131 | sub include_top() {
131  
132      &print_pair(1, "packet.load.load1", $top =~ /load averages:\s*([^\s]+?),/);
133      &print_pair(1, "packet.load.load5", $top =~ /load averages:\s*.+?,\s*([^\s]+?),/);
134 <    &print_pair(1, "packet.load.load15", $top =~ /load averages:\s*.+?,\s*.+?,\s*([^\s]+?)\s.*/);
134 >    &print_pair(1, "packet.load.load15", $top =~ /load averages:\s*.+?,\s*.+?,\s*([^\s]+?)\s/);
135      &print_pair(1, "packet.processes.total", $top =~ /([^\s]+?) processes:/);
136      &print_pair(1, "packet.processes.sleeping", $top =~ / ([^\s]+?) sleeping/);
137      &print_pair(1, "packet.processes.zombie", $top =~ / ([^\s]+?) zombie/);
# Line 199 | Line 199 | sub include_uptime() {
199      # work out the days, hours, and minutes
200      if ($uptime =~ /hr/) {
201        # 0 minutes
202 <        $uptime =~ /up ([0-9]+) .*, ([0-9]+) .*,/;
203 <        $uptime = "$1:$2:0";
202 >        $uptime =~ s/up ([0-9]+) .*, ([0-9]+) .*,/$1:$2:0/;
203      }
204      elsif ($uptime =~ /min/) {
205        # 0 hours
206 <        $uptime =~ /up ([0-9]+) .*, ([0-9]+) .*,/;
208 <        $uptime = "$1:0:$2";
206 >        $uptime =~ s/up ([0-9]+) .*, ([0-9]+) .*,/$1:0:$2/;
207      }
208      elsif ($uptime =~ /day/) {
209        # normal
210 <        $uptime =~ /up ([0-9]+) .*, ([0-9]+):([0-9]+)/;
213 <        $uptime = "$1:$2:$3";
210 >        $uptime =~ s/up ([0-9]+) .*, ([0-9]+):([0-9]+)/$1:$2:$3/;
211      }
212      else {
213        # 0 days
214 <        $uptime =~ /up ([0-9]+):([0-9]+)/;
218 <        $uptime = "0:$1:$2";
214 >        $uptime =~ s/up ([0-9]+):([0-9]+)/0:$1:$2/;
215      }
216  
217      # turn into minutes

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines