]>
Commit | Line | Data |
---|---|---|
e024b032 | 1 | --- bs-0.97/uxmon/Config/memory.orig Wed Nov 22 21:34:15 2000 |
9c0b4352 JB |
2 | +++ bs-0.97/uxmon/Config/memory Fri Jun 7 14:20:54 2002 |
3 | @@ -39,30 +39,23 @@ | |
4 | ); | |
5 | $meminfo->sched_frequency($args{"frequency"}); | |
6 | } | |
7 | - @check = ( | |
8 | - "%swap free", sub { | |
9 | - my( $vars ) = @_; | |
10 | - return(undef) unless( defined $vars->{"linux.meminfo.%SwapFree"} ); | |
11 | - $vars->{"linux.meminfo.%SwapFree"}; | |
12 | - }, 10, | |
13 | - "avail swap MB", sub { | |
14 | - my( $vars ) = @_; | |
15 | - return(undef) unless( defined $vars->{"linux.meminfo.SwapFree"} ); | |
16 | - $vars->{"linux.meminfo.SwapFree"} /1024/1024; | |
17 | - }, 10 | |
18 | - ); | |
19 | + @check = ( | |
20 | + "%swap free", "linux.meminfo.%SwapFree", 1, 10, | |
21 | + "avail swap MB", "linux.meminfo.SwapFree", 1024*1024, 10 | |
22 | + ) | |
23 | } | |
24 | ||
25 | ||
26 | while( @check ) { | |
27 | my $text = shift( @check ); | |
28 | - my $val = shift( @check ); | |
29 | + my $valname = shift( @check ); | |
30 | + my $valdiv = shift( @check ); | |
31 | my $limit = shift( @check ); | |
e024b032 JB |
32 | $args{"_evaluator"}->add_check( ($args{"check"}?$args{"check"}:"cpu"), sub { |
33 | my( $vars ) = @_; | |
9c0b4352 | 34 | - |
e024b032 | 35 | - my $val = &$val($vars); |
9c0b4352 JB |
36 | - return( 2, "(no data available)" ) unless( defined $val ); |
37 | + return( 2, "(no data available)" ) unless( defined $vars->{$valname} ); | |
38 | + my $val = $vars->{$valname} / $valdiv; | |
39 | + | |
e024b032 JB |
40 | $val = int($val+0.5); |
41 | if( $val > $limit ) { | |
9c0b4352 | 42 | return( 3, $text." = $val" ); |