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.32 by tdb, Tue Feb 13 11:57:48 2001 UTC vs.
Revision 1.36 by tdb, Sat Mar 3 21:26:55 2001 UTC

# Line 109 | Line 109 | sub include_disk() {
109      my($partition_no) = 0;
110      for (my($i) = 0; $i < $#df; $i++) {
111          my($line) = $df[$i];
112 <        $line =~ /^(\/[^\s]*)\s*([0-9]*)\s*([0-9]*)\s*([0-9]*)\s*[^\s]*\s*(\/[^\s]*)\s*/;
112 >        $line =~ /^([^\s]*)\s*([0-9]*)\s*([0-9]*)\s*([0-9]*)\s*[^\s]*\s*(\/[^\s]*)\s*/;
113          # $4 will not match unless everything before it does...
114          if (defined $5) {
115              my ($filesystem, $kbytes, $used, $avail, $mount) = ($1, $2, $3, $4, $5);
# Line 195 | Line 195 | sub include_top() {
195          &print_pair(0, "packet.processes.stopped", $top =~ / ([^\s]+?) stopped/);
196          &print_pair(0, "packet.processes.cpu", $top =~ /([^\s]+?)\s*running/);
197          &print_pair(0, "packet.cpu.idle", $top =~ /([^\s]+?)% idle/);
198        &print_pair(0, "packet.cpu.user", $top =~ /([^\s]+?)% user/);
198          &print_pair(0, "packet.cpu.kernel", $top =~ /([^\s]+?)% system/);
199          &print_pair(0, "packet.cpu.iowait", $top =~ /([^\s]+?)% interrupt/);
200          &print_pair(0, "packet.cpu.swap", $top =~ /([^\s]+?)% swap/);
201 +
202 +        # FreeBSD is a bit different, we need to get user and nice.
203 +        my($user) = 0;
204 +        if($top =~ /([^\s]+?)% user/) { $user += $1; }
205 +        if($top =~ /([^\s]+?)% nice/) { $user += $1; }
206 +        &print_pair(0, "packet.cpu.user", $user);
207          
208          # The following need to be specified in megabytes.
209          # If they are preceeded by a G, then multiply by 1024.  
# Line 225 | Line 230 | sub include_top() {
230          $swap_free*=1024 if $2 eq "G";
231          &print_pair(0, "packet.swap.free", $swap_free);
232      }
233 +    elsif ($ostype eq "Linux") {
234 +        &print_pair(0, "packet.processes.total", $top =~ /([^\s]+?) processes:/);
235 +        &print_pair(0, "packet.processes.sleeping", $top =~ / ([^\s]+?) sleeping/);
236 +        &print_pair(0, "packet.processes.zombie", $top =~ / ([^\s]+?) zombie/);
237 +        &print_pair(0, "packet.processes.stopped", $top =~ / ([^\s]+?) stopped/);
238 +        &print_pair(0, "packet.processes.cpu", $top =~ /([^\s]+?)\s*running/);
239 +        &print_pair(0, "packet.cpu.idle", $top =~ /([^\s]+?)% idle/);
240 +        &print_pair(0, "packet.cpu.user", $top =~ /([^\s]+?)% user/);
241 +        &print_pair(0, "packet.cpu.kernel", $top =~ /([^\s]+?)% system/);
242 +        &print_pair(0, "packet.cpu.iowait", $top =~ /([^\s]+?)% interrupt/);
243 +        &print_pair(0, "packet.cpu.swap", $top =~ /([^\s]+?)% swap/);
244 +        
245 +        # The following need to be specified in megabytes.
246 +        # If they are preceeded by a G, then multiply by 1024.  
247 +        
248 +        $top =~ / ([^\s]+?)([KMG]) av/;
249 +        my($real) = $1;
250 +        $real*=1024 if $2 eq "G";
251 +        $real/=1024 if $2 eq "K";
252 +        &print_pair(0, "packet.memory.total", int($real));
253 +        
254 +        $top =~ / ([^\s]+?)([KMG]) free/;
255 +        my($free) = $1;
256 +        $free*=1024 if $2 eq "G";
257 +        $free/=1024 if $2 eq "K";
258 +        &print_pair(0, "packet.memory.free", int($free));
259 +        
260 +        $top =~ /Swap:\s+([^\s]+?)([KMG]) av/;
261 +        my($swap_total) = $1;
262 +        $swap_total*=1024 if $2 eq "G";
263 +        $swap_total/=1024 if $2 eq "K";
264 +        &print_pair(0, "packet.swap.total", int($swap_total));
265 +        
266 +        $top =~ /Swap:.*, ([^\s]+?)([KMG]) free/;
267 +        my($swap_free) = $1;
268 +        $swap_free*=1024 if $2 eq "G";
269 +        $swap_free/=1024 if $2 eq "K";
270 +        &print_pair(0, "packet.swap.free", int($swap_free));
271 +    }
272      else {
273          # we could have some catchall here
274 +        # but as it stands this means we'll just skip top stuff
275 +        # for unknown systems
276      }
277   }
278  
# Line 281 | Line 327 | sub include_uptime() {
327  
328      if ($uptime =~ /day.*,\s+([0-9]+):([0-9]+)/) {
329        # normal
330 <        $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+):([0-9]+)/;
330 >        $uptime =~ /up\s+([0-9]+)\s+[^\s]+,\s+([0-9]+):([0-9]+)/;
331          $uptime = "$1:$2:$3";
332      }
333      else {
334          if ($uptime =~ /day/) {
335              if ($uptime =~ /hr/) {
336                # 0 minutes
337 <                $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+)\s+.*,/;
337 >                $uptime =~ /up\s+([0-9]+)\s+[^\s]+,\s+([0-9]+)\s+[^\s]+,/;
338                  $uptime = "$1:$2:0";
339              }
340              elsif ($uptime =~ /min/) {
341                # 0 hours
342 <                $uptime =~ /up\s+([0-9]+)\s+.*,\s+([0-9]+)\s+.*,/;
342 >                $uptime =~ /up\s+([0-9]+)\s+[^\s]+,\s+([0-9]+)\s+[^\s]+,/;
343                  $uptime = "$1:0:$2";
344              }
345              else {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines