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.10 by pjm2, Mon Jan 22 17:17:48 2001 UTC vs.
Revision 1.13 by tdb, Mon Jan 22 23:21:34 2001 UTC

# Line 21 | Line 21 | $| = 1;
21   # You'd be silly not to use this ;)
22   use strict;
23  
24 + # Path's
25 + my($topbin) = "/usr/local/sbin/top";
26 + my($dfbin) = "/usr/bin/df";
27 + my($usersbin) = "/usr/ucb/users";
28 + my($unamebin) = "/usr/bin/uname";
29 +
30   # Run the following components: -
31   &print_ident();
32   &include_osver();
# Line 74 | Line 80 | sub print_pair($$$) {
80   sub include_disk() {
81      
82      # Run the df program.
83 <    my(@df) = `df -ak`;
83 >    my(@df) = `$dfbin -ak`;
84  
85      # Go through each line of the program, looking for each thing we want.
86      my($partition_no) = 0;
# Line 100 | Line 106 | sub include_disk() {
106   sub include_users() {
107  
108      # Find out all users on this machine.
109 <    my($users) = `users`;
109 >    my($users) = `$usersbin`;
110      my(@users) = split(/\s+/, $users);
111  
112      my($users_count) = $#users + 1;
# Line 116 | Line 122 | sub include_users() {
122   sub include_top() {
123  
124      # Find out some numbers from top.
125 <    my(@top) = `top -d2 -s1 0`;
125 >    my(@top) = `$topbin -d2 -s1 0`;
126      my($top) = join(" ", @top);
127      $top =~ s/\n//g;
128  
# Line 138 | Line 144 | sub include_top() {
144      # If they are preceeded by a G, then multiply by 1024.  
145  
146      $top =~ /([^\s]+?)([MG]) real/;
147 <    my($real) = $1*1024 if $2 eq "G";
147 >    my($real) = $1;
148 >    $real*=1024 if $2 eq "G";
149      &print_pair(1, "packet.memory.real", $real);
150  
151      $top =~ /([^\s]+?)([MG]) free/;
152 <    my($free) = $1*1024 if $2 eq "G";
152 >    my($free) = $1;
153 >    $free*=1024 if $2 eq "G";
154      &print_pair(1, "packet.memory.free", $free);
155  
156      $top =~ /([^\s]+?)([MG]) swap in use/;
157 <    my($swap_in_use) = $1*1024 if $2 eq "G";
158 <    &print_pair(1, "packet.memory.swap_in_use", $swap_in_use);
157 >    my($swap_in_use) = $1;
158 >    $swap_in_use*=1024 if $2 eq "G";
159 >    # DO NOT print this one out... save it for in a moment...
160  
161      $top =~ /([^\s]+?)([MG]) swap free/;
162 <    my($swap_free) = $1*1024 if $2 eq "G";
162 >    my($swap_free) = $1;
163 >    $swap_free*=1024 if $2 eq "G";
164      &print_pair(1, "packet.memory.swap_free", $swap_free);
165 +
166 +    # AJ requested total swap instead of swap_in_use, so here we go!
167 +    &print_pair(1, "packet.memory.swap_total", $swap_free + $swap_in_use);
168   }
169  
170   # sub to get details of the machine's operating system.
# Line 160 | Line 173 | sub include_osver() {
173      # Find out details about the operating system
174      # If these values remain undefined, then the print_pair
175      # function shall show the value to be the string "unknown".
176 <    my($os_name) = `uname -s`;
177 <    my($os_release) = `uname -r`;
178 <    my($os_platform) = `uname -m`;
179 <    my($os_sysname) = `uname -n`;
180 <    my($os_version) = `uname -v`;
176 >    my($os_name) = `$unamebin -s`;
177 >    my($os_release) = `$unamebin -r`;
178 >    my($os_platform) = `$unamebin -m`;
179 >    my($os_sysname) = `$unamebin -n`;
180 >    my($os_version) = `$unamebin -v`;
181  
182      &print_pair(0, "packet.os.name", $os_name);
183      &print_pair(0, "packet.os.release", $os_release);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines