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.24 by pjm2, Mon Feb 5 08:33:51 2001 UTC vs.
Revision 1.25 by pjm2, Mon Feb 5 17:05:22 2001 UTC

# Line 56 | Line 56 | sub print_ident() {
56  
57   # sub to print pairs of data, separated by a single space character.
58   # If the second argument is undefined, then the pair is still printed,
59 < # however, the value shall be displayed as the string "unknown".
60 < # If $type is non-zero, then "0" is printed instead of "unknown".
59 > # however, the value shall be displayed as the the 'default' value
60 > # if the passed value was undefined.
61   sub print_pair($$$) {
62 <    my($type, $name, $value) = @_;
62 >    my($default, $name, $value) = @_;
63  
64      if (!defined $value) {
65 <        if ($type) {
66 <            $value = "0.00";
67 <        }
68 <        else {
69 <            $value = "unknown";
70 <        }
65 >        $value = $default;
66      }
67  
68      # Remove the trailing linefeed if we've not already done so.
# Line 92 | Line 87 | sub include_disk() {
87          # $4 will not match unless everything before it does...
88          if (defined $5) {
89              my ($filesystem, $kbytes, $used, $avail, $mount) = ($1, $2, $3, $4, $5);
90 <            &print_pair(0, "packet.disk.p$partition_no.attributes.name", $filesystem);
91 <            &print_pair(1, "packet.disk.p$partition_no.attributes.kbytes", $kbytes);
92 <            &print_pair(1, "packet.disk.p$partition_no.attributes.used", $used);
93 <            &print_pair(1, "packet.disk.p$partition_no.attributes.avail", $avail);
94 <            &print_pair(0, "packet.disk.p$partition_no.attributes.mount", $mount);
90 >            &print_pair("unknown", "packet.disk.p$partition_no.attributes.name", $filesystem);
91 >            &print_pair(0, "packet.disk.p$partition_no.attributes.kbytes", $kbytes);
92 >            &print_pair(0, "packet.disk.p$partition_no.attributes.used", $used);
93 >            &print_pair(0, "packet.disk.p$partition_no.attributes.avail", $avail);
94 >            &print_pair("unknown", "packet.disk.p$partition_no.attributes.mount", $mount);
95              ++$partition_no;
96          }
97      }
# Line 115 | Line 110 | sub include_users() {
110      $users_count++ while $users =~ /\w+/g;
111      my($users_list) = $users." ";
112  
113 <    &print_pair(1, "packet.users.count", $users_count);
114 <    &print_pair(0, "packet.users.list", $users_list);
113 >    &print_pair(0, "packet.users.count", $users_count);
114 >    &print_pair("unknown", "packet.users.list", $users_list);
115   }
116  
117  
# Line 129 | Line 124 | sub include_top() {
124      my($top) = join(" ", @top);
125      $top =~ s/\n//g;
126  
127 <    &print_pair(1, "packet.load.load1", $top =~ /load averages:\s*([^\s]+?),/);
128 <    &print_pair(1, "packet.load.load5", $top =~ /load averages:\s*.+?,\s*([^\s]+?),/);
129 <    &print_pair(1, "packet.load.load15", $top =~ /load averages:\s*.+?,\s*.+?,\s*([^\s]+?)\s/);
130 <    &print_pair(1, "packet.processes.total", $top =~ /([^\s]+?) processes:/);
131 <    &print_pair(1, "packet.processes.sleeping", $top =~ / ([^\s]+?) sleeping/);
132 <    &print_pair(1, "packet.processes.zombie", $top =~ / ([^\s]+?) zombie/);
133 <    &print_pair(1, "packet.processes.stopped", $top =~ / ([^\s]+?) stopped/);
134 <    &print_pair(1, "packet.processes.cpu", $top =~ /([^\s]+?)\s*on cpu/);
135 <    &print_pair(1, "packet.cpu.idle", $top =~ /([^\s]+?)% idle/);
136 <    &print_pair(1, "packet.cpu.user", $top =~ /([^\s]+?)% user/);
137 <    &print_pair(1, "packet.cpu.kernel", $top =~ /([^\s]+?)% kernel/);
138 <    &print_pair(1, "packet.cpu.iowait", $top =~ /([^\s]+?)% iowait/);
139 <    &print_pair(1, "packet.cpu.swap", $top =~ /([^\s]+?)% swap/);
127 >    &print_pair(0, "packet.load.load1", $top =~ /load averages:\s*([^\s]+?),/);
128 >    &print_pair(0, "packet.load.load5", $top =~ /load averages:\s*.+?,\s*([^\s]+?),/);
129 >    &print_pair(0, "packet.load.load15", $top =~ /load averages:\s*.+?,\s*.+?,\s*([^\s]+?)\s/);
130 >    &print_pair(0, "packet.processes.total", $top =~ /([^\s]+?) processes:/);
131 >    &print_pair(0, "packet.processes.sleeping", $top =~ / ([^\s]+?) sleeping/);
132 >    &print_pair(0, "packet.processes.zombie", $top =~ / ([^\s]+?) zombie/);
133 >    &print_pair(0, "packet.processes.stopped", $top =~ / ([^\s]+?) stopped/);
134 >    &print_pair(0, "packet.processes.cpu", $top =~ /([^\s]+?)\s*on cpu/);
135 >    &print_pair(0, "packet.cpu.idle", $top =~ /([^\s]+?)% idle/);
136 >    &print_pair(0, "packet.cpu.user", $top =~ /([^\s]+?)% user/);
137 >    &print_pair(0, "packet.cpu.kernel", $top =~ /([^\s]+?)% kernel/);
138 >    &print_pair(0, "packet.cpu.iowait", $top =~ /([^\s]+?)% iowait/);
139 >    &print_pair(0, "packet.cpu.swap", $top =~ /([^\s]+?)% swap/);
140  
141      # The following need to be specified in megabytes.
142      # If they are preceeded by a G, then multiply by 1024.  
# Line 149 | Line 144 | sub include_top() {
144      $top =~ /([^\s]+?)([MG]) real/;
145      my($real) = $1;
146      $real*=1024 if $2 eq "G";
147 <    &print_pair(1, "packet.memory.real", $real);
147 >    &print_pair(0, "packet.memory.real", $real);
148  
149      $top =~ /([^\s]+?)([MG]) free/;
150      my($free) = $1;
151      $free*=1024 if $2 eq "G";
152 <    &print_pair(1, "packet.memory.free", $free);
152 >    &print_pair(0, "packet.memory.free", $free);
153  
154      $top =~ /([^\s]+?)([MG]) swap in use/;
155      my($swap_in_use) = $1;
# Line 164 | Line 159 | sub include_top() {
159      $top =~ /([^\s]+?)([MG]) swap free/;
160      my($swap_free) = $1;
161      $swap_free*=1024 if $2 eq "G";
162 <    &print_pair(1, "packet.memory.swap_free", $swap_free);
162 >    &print_pair(0, "packet.memory.swap_free", $swap_free);
163  
164      # AJ requested total swap instead of swap_in_use, so here we go!
165 <    &print_pair(1, "packet.memory.swap_total", $swap_free + $swap_in_use);
165 >    &print_pair(0, "packet.memory.swap_total", $swap_free + $swap_in_use);
166   }
167  
168   # sub to get details of the machine's operating system.
# Line 182 | Line 177 | sub include_osver() {
177      my($os_sysname) = `$unamebin -n`;
178      my($os_version) = `$unamebin -v`;
179  
180 <    &print_pair(0, "packet.os.name", $os_name);
181 <    &print_pair(0, "packet.os.release", $os_release);
182 <    &print_pair(0, "packet.os.platform", $os_platform);
183 <    &print_pair(0, "packet.os.sysname", $os_sysname);
184 <    &print_pair(0, "packet.os.version", $os_version);
180 >    &print_pair("unknown", "packet.os.name", $os_name);
181 >    &print_pair("unknown", "packet.os.release", $os_release);
182 >    &print_pair("unknown", "packet.os.platform", $os_platform);
183 >    &print_pair("unknown", "packet.os.sysname", $os_sysname);
184 >    &print_pair("unknown", "packet.os.version", $os_version);
185  
186   }
187  
# Line 219 | Line 214 | sub include_uptime() {
214      $uptime =~ /([0-9]+):([0-9]+):([0-9]+)/;
215      $uptime = $3 + ($2 + $1*24)*60;
216  
217 <    &print_pair(0, "packet.os.uptime", $uptime);
217 >    &print_pair("unknown", "packet.os.uptime", $uptime);
218  
219   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines