diff options
| author | Paul Buetow <paul@buetow.org> | 2012-06-23 12:17:45 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2012-06-23 12:17:45 +0200 |
| commit | df544c6d247661daaa1002a32fb281bf453058ba (patch) | |
| tree | e5fd31f3ef41d332c0eb4ac581a33a3fbbd3beec /lib/Loadbars/Main.pm | |
| parent | 6d48029a215f90482777db4a9f169c404f26167a (diff) | |
set INTERVAL to 1.13
Diffstat (limited to 'lib/Loadbars/Main.pm')
| -rw-r--r-- | lib/Loadbars/Main.pm | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/Loadbars/Main.pm b/lib/Loadbars/Main.pm index ab953f5..6314b07 100644 --- a/lib/Loadbars/Main.pm +++ b/lib/Loadbars/Main.pm @@ -91,6 +91,14 @@ sub stats_thread ($;$) { my ( $sigusr1, $sigterm ) = ( 0, 0 ); my $inter = Loadbars::Constants->INTERVAL; + # Precompile some regexp + my $loadavg_re = qr/^(\d+\.\d{2}) (\d+\.\d{2}) (\d+\.\d{2})/; + my $cpu_re = qr/$I{cpuregexp}/; + my @meminfo = + map { [$_, qr/^$_: *(\d+)/] } + (qw(MemTotal MemFree Buffers Cached SwapTotal SwapFree)); + my $whitespace_re = qr/ +/; + until ($sigterm) { my $bash = <<"BASH"; loadavg=/proc/loadavg @@ -126,13 +134,6 @@ BASH $SIG{USR1} = sub { $sigusr1 = 1 }; $SIG{TERM} = sub { $sigterm = 1 }; - # Precompile some regexp - my $loadavg_re = qr/^(\d+\.\d{2}) (\d+\.\d{2}) (\d+\.\d{2})/; - my $cpu_re = qr/$I{cpuregexp}/; - my @meminfo = - map { [$_, qr/^$_: *(\d+)/] } - (qw(MemTotal MemFree Buffers Cached SwapTotal SwapFree)); - # 0=cpu, 1=mem, 2=net my $mode = 0; @@ -164,8 +165,8 @@ BASH for my $meminfo (@meminfo) { if ($_ =~ $meminfo->[1]) { - $MEMSTATS_HAS{$host} = 1; $MEMSTATS{"$host;$meminfo->[0]"} = $1; + $MEMSTATS_HAS{$host} = 1 unless defined $MEMSTATS_HAS{$host}; } } } @@ -176,6 +177,10 @@ BASH } else { + my @split = split $whitespace_re, $_; + for (@split) { + } + $NETSTATS_HAS{$host} = 1 unless defined $NETSTATS_HAS{$host}; } } |