summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2012-02-25 20:11:22 +0100
committerPaul Buetow <paul@buetow.org>2012-02-25 20:11:22 +0100
commit27449f93e380bb93e05406cb3f45b98a3e032c30 (patch)
tree4388bf87bbbc86777edfdb7deacea274c51ce704
parent389f995ab4e1aec24f5e0da292a3e70ba12d4183 (diff)
parent1440e0d2e5065221cee0e4c6565842ee3dac7431 (diff)
Merge remote-tracking branch 'remotes/origin/devel'0.5.1
-rw-r--r--CHANGELOG13
-rw-r--r--HELP15
-rw-r--r--WISHLIST4
-rwxr-xr-xloadbars843
4 files changed, 482 insertions, 393 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5c4a36c..3733304 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+Sat Feb 25 20:09:02 CET 2012
+* Release v0.5.1
+* Add config file support (~/.loadbarsrc) and it's possible to configure
+ any option you find in --help but without leading '--'. For comments
+ just use the '#' sign. Sample config:
+ showcores=1 # Always show cores on startup
+ showtext=0 # Always don't display text on startup
+* Add hotkey 'w' which writes current settings to the configfile
+* Remove --title option (no need anyway)
+* Some code cleanups
+* Some bugfixes
+
Sat Feb 4 10:56:27 CET 2012
* Release v0.5.0
* Add stats for rudimentary memory and swap usage (--showmem option or m hotkey)
@@ -9,6 +21,7 @@ Sat Feb 4 10:56:27 CET 2012
* Key right increases window width by 100px and left decreases by 100px
* Key down increases window height by 100px and up decreases by 100px
* Set 'samples' default values from 1000 down to 500.
+* Displays a text warning on stdout if computer may be too slow
* No sporadic crashes on shutdown anymore
* Some internal tweaks, no separate event thread needed anymore. This fixes
some sporadic bugs.
diff --git a/HELP b/HELP
index 62205c9..e077c51 100644
--- a/HELP
+++ b/HELP
@@ -1,3 +1,8 @@
+==> Reading configuration from /home/pb/.loadbarsrc
+==> Setting showcores=1, it might be overwritten by command line params.
+==> Setting showtext=0, it might be overwritten by command line params.
+==> Setting extended=1, it might be overwritten by command line params.
+==> Setting showmem=1, it might be overwritten by command line params.
CPU stuff:
st = Steal in % [see man proc] (extended)
Color: Red
@@ -27,6 +32,14 @@ Memory stuff:
Color: Dark grey
Swp: System swap usage in %
Color: Grey
+Config file support:
+ Loadbars tries to read ~/.loadbarsrc and it's possible to configure any
+ option you find in --help but without leading '--'. For comments just use
+ the '#' sign. Sample config:
+ showcores=1 # Always show cores on startup
+ showtext=0 # Always don't display text on startup
+ extended=1 # Always use extended mode on startup
+ will always show all CPU cores in extended mode but no text display.
Examples:
loadbars --extended 1 --showcores 1 --height 300 --hosts localhost
loadbars --hosts localhost,server1.example.com,server2.example.com
@@ -38,7 +51,6 @@ Examples:
--factor <ARG> - Set graph scale factor (1.0 means 100%)
--height <ARG> - Set windows height
--hosts <ARG> - Comma sep. list of hosts; optional: user@ in front to each host
---inter <ARG> - Set update interval in seconds (default 0.1)
--maxwidth <ARG> - Set max width
--samples <ARG> - Set number of samples until ssh reconnects
--showcores <ARG> - Toggle core display (0 or 1)
@@ -46,4 +58,3 @@ Examples:
--showtexthost <ARG> - Toggle hostname/num text display (0 or 1)
--showtext <ARG> - Toggle text display (0 or 1)
--sshopts <ARG> - Set SSH options
---title <ARG> - Set the window title
diff --git a/WISHLIST b/WISHLIST
index a38f493..ea234ff 100644
--- a/WISHLIST
+++ b/WISHLIST
@@ -1,4 +1,6 @@
-* Local configuration file for default values
* More stats for memory
* Stats for network
* .deb for Debian and Ubuntu
+* Auto detect single core boxes
+* Make code modular (script is growing...)
+* Optimize code (too much cpu usage if there are too many hosts involved)
diff --git a/loadbars b/loadbars
index 25da511..8b241d1 100755
--- a/loadbars
+++ b/loadbars
@@ -26,29 +26,33 @@ use threads;
use threads::shared;
use constant {
- VERSION => 'loadbars v0.5.0',
- Copyright => '2010-2012 (c) Paul Buetow <loadbars@mx.buetow.org>',
- CSSH_CONFFILE => '/etc/clusters',
+ VERSION => 'loadbars v0.5.1',
+ COPYRIGHT => '2010-2012 (c) Paul Buetow <loadbars@mx.buetow.org>',
+ CONFFILE => $ENV{HOME} . '/.loadbarsrc',
+ CSSH_CONFFILE => '/etc/clusters',
CSSH_MAX_RECURSION => 10,
- COLOR_DEPTH => 8,
- BLACK => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0x00 ),
- BLUE0 => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0xff ),
- BLUE => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0x88 ),
- GREEN => SDL::Color->new( -r => 0x00, -g => 0x90, -b => 0x00 ),
- ORANGE => SDL::Color->new( -r => 0xff, -g => 0x70, -b => 0x00 ),
- PURPLE => SDL::Color->new( -r => 0xa0, -g => 0x20, -b => 0xf0 ),
- RED => SDL::Color->new( -r => 0xff, -g => 0x00, -b => 0x00 ),
- WHITE => SDL::Color->new( -r => 0xff, -g => 0xff, -b => 0xff ),
- GREY0 => SDL::Color->new( -r => 0x11, -g => 0x11, -b => 0x11 ),
- GREY => SDL::Color->new( -r => 0xaa, -g => 0xaa, -b => 0xaa ),
- DARK_GREY => SDL::Color->new( -r => 0x15, -g => 0x15, -b => 0x15 ),
- YELLOW0 => SDL::Color->new( -r => 0xff, -g => 0xa0, -b => 0x00 ),
- YELLOW => SDL::Color->new( -r => 0xff, -g => 0xc0, -b => 0x00 ),
- SYSTEM_BLUE0 => 30,
- USER_ORANGE => 70,
- USER_YELLOW0 => 50,
- INTERVAL => 0.1,
- INTERVAL_WARN => 1.0,
+ COLOR_DEPTH => 8,
+ BLACK => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0x00 ),
+ BLUE0 => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0xff ),
+ BLUE => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0x88 ),
+ GREEN => SDL::Color->new( -r => 0x00, -g => 0x90, -b => 0x00 ),
+ ORANGE => SDL::Color->new( -r => 0xff, -g => 0x70, -b => 0x00 ),
+ PURPLE => SDL::Color->new( -r => 0xa0, -g => 0x20, -b => 0xf0 ),
+ RED => SDL::Color->new( -r => 0xff, -g => 0x00, -b => 0x00 ),
+ WHITE => SDL::Color->new( -r => 0xff, -g => 0xff, -b => 0xff ),
+ GREY0 => SDL::Color->new( -r => 0x11, -g => 0x11, -b => 0x11 ),
+ GREY => SDL::Color->new( -r => 0xaa, -g => 0xaa, -b => 0xaa ),
+ DARK_GREY => SDL::Color->new( -r => 0x15, -g => 0x15, -b => 0x15 ),
+ YELLOW0 => SDL::Color->new( -r => 0xff, -g => 0xa0, -b => 0x00 ),
+ YELLOW => SDL::Color->new( -r => 0xff, -g => 0xc0, -b => 0x00 ),
+ SYSTEM_BLUE0 => 30,
+ USER_ORANGE => 70,
+ USER_YELLOW0 => 50,
+ INTERVAL => 0.1,
+ INTERVAL_WARN => 1.0,
+ SUCCESS => 0,
+ E_UNKNOWN => 1,
+ E_NOHOST => 2,
};
$| = 1;
@@ -62,24 +66,28 @@ my %MEMSTATS_HAS : shared;
# Global configuration hash
my %C : shared;
+# Global configuration hash for internal settings (not configurable)
+my %I : shared;
# Setting defaults
%C = (
- title => Loadbars::VERSION . ' (press h for help on stdout)',
- average => 15,
- showcores => 0,
- showmem => 0,
- cpuregexp => 'cpu',
- factor => 1,
- extended => 0,
- displaytxt => 1,
- displaytxtoff => 0,
- displaytxthost => 0,
- samples => 500,
- sshopts => '',
- barwidth => 35,
- maxwidth => 1280,
- height => 230,
+ average => 15,
+ barwidth => 35,
+ extended => 0,
+ factor => 1,
+ height => 230,
+ maxwidth => 1280,
+ samples => 500,
+ showcores => 0,
+ showmem => 0,
+ showtext => 1,
+ showtexthost => 0,
+ sshopts => '',
+);
+
+%I = (
+ cpuregexp => 'cpu',
+ showtextoff => 0,
);
# Quick n dirty helpers
@@ -89,14 +97,24 @@ sub debugsay (@) { say "Loadbars::DEBUG: $_" for @_; return undef }
sub sum (@) { my $sum = 0; $sum += $_ for @_; return $sum }
sub null ($) { defined $_[0] ? $_[0] : 0 }
sub notnull ($) { $_[0] != 0 ? $_[0] : 1 }
-sub set_showcores_regexp () { $C{cpuregexp} = $C{showcores} ? 'cpu' : 'cpu ' }
+sub set_showcores_regexp () { $I{cpuregexp} = $C{showcores} ? 'cpu' : 'cpu ' }
sub error ($) { die shift, "\n" }
sub display_info ($) { say "==> " . shift }
+sub display_warn ($) { say "!!! " . shift }
+
+sub trim (\$) {
+ my $str = shift;
+
+ $$str =~ s/^[\s\t]+//;
+ $$str =~ s/[\s\t]+$//;
+
+ return undef;
+}
sub percentage ($$) {
my ($total, $part) = @_;
- return int (null($part) / notnull ( null($total) / 100 ));
+ return int (null($part) / notnull ( null($total) / 100));
}
sub norm ($) {
@@ -108,29 +126,74 @@ sub norm ($) {
sub parse_cpu_line ($) {
my $line = shift;
- my ( $name, %load );
+ my ($name, %load);
( $name, @load{qw(user nice system idle iowait irq softirq steal guest)} ) =
split ' ', $line;
+ # Not all kernels support this
$load{steal} = 0 unless defined $load{steal};
$load{guest} = 0 unless defined $load{guest};
$load{TOTAL} =
sum @load{qw(user nice system idle iowait irq softirq steal guest)};
- return ( $name, \%load );
+ return ($name, \%load);
+}
+
+sub read_config () {
+ return unless -f CONFFILE;
+
+ display_info "Reading configuration from " . CONFFILE;
+ open my $conffile, CONFFILE or die "$!: " . CONFFILE . "\n";
+
+ while (<$conffile>) {
+ chomp;
+ s/[\t\s]*?#.*//;
+
+ next unless length;
+
+ my ($key, $val) = split '=';
+
+ unless (defined $val) {
+ display_warn "Could not parse config line: $_";
+ next;
+ }
+
+ trim $key; trim $val;
+
+ if (not exists $C{$key}) {
+ display_warn "There is no such config key: $key, ignoring";
+
+ } else {
+ display_info "Setting $key=$val, it might be overwritten by command line params.";
+ $C{$key} = $val;
+ }
+ }
+
+ close $conffile;
}
-sub thread_get_stats ($;$) {
+sub write_config () {
+ display_warn "Overwriting config file " . CONFFILE if -f CONFFILE;
+ open my $conffile, '>', CONFFILE or die "$!: " . CONFFILE . "\n";
+
+ for (keys %C) {
+ print $conffile "$_=$C{$_}\n";
+ }
+
+ close $conffile;
+}
+
+sub stats_thread ($;$) {
my ( $host, $user ) = @_;
$user = defined $user ? "-l $user" : '';
- my ( $sigusr1, $quit ) = ( 0, 0 );
+ my ($sigusr1, $quit) = (0,0);
my $loadavgexp = qr/(\d+\.\d{2}) (\d+\.\d{2}) (\d+\.\d{2})/;
my $inter = INTERVAL;
- for ( ; ; ) {
+ for (;;) {
my $bash = <<"BASH";
if [ -e /proc/stat ]; then
loadavg=/proc/loadavg
@@ -168,7 +231,7 @@ BASH
# Toggle CPUs
$SIG{USR1} = sub { $sigusr1 = 1 };
- my $cpuregexp = qr/$C{cpuregexp}/;
+ my $cpuregexp = qr/$I{cpuregexp}/;
# 1=cpu, 2=mem, 3=net
my $mode = 0;
@@ -194,6 +257,7 @@ BASH
} else {
for my $meminfo (qw(MemTotal MemFree Buffers Cached SwapTotal SwapFree)) {
+ # TODO: Precompile regexp
if (/^$meminfo: *(\d+)/) {
$MEMSTATS_HAS{$host} = 1;
$MEMSTATS{"$host;$meminfo"} = $1;
@@ -203,7 +267,8 @@ BASH
}
if ($sigusr1) {
- $cpuregexp = qr/$C{cpuregexp}/;
+ # TODO: Use index instead of regexp for cpuregexp
+ $cpuregexp = qr/$I{cpuregexp}/;
$sigusr1 = 0;
}
}
@@ -225,15 +290,15 @@ sub normalize_loads (%) {
return %loads unless exists $loads{TOTAL};
my $total = $loads{TOTAL} == 0 ? 1 : $loads{TOTAL};
- return map { $_ => $loads{$_} / ( $total / 100 ) } keys %loads;
+ return map { $_ => $loads{$_} / ($total / 100) } keys %loads;
}
sub get_cpuaverage ($@) {
- my ( $factor, @loads ) = @_;
- my ( %cpumax, %cpuaverage );
+ my ($factor, @loads) = @_;
+ my (%cpumax, %cpuaverage);
for my $l (@loads) {
- for ( keys %$l ) {
+ for (keys %$l) {
$cpuaverage{$_} += $l->{$_};
$cpumax{$_} = $l->{$_}
@@ -244,50 +309,48 @@ sub get_cpuaverage ($@) {
my $div = @loads / $factor;
- for ( keys %cpuaverage ) {
+ for (keys %cpuaverage) {
$cpuaverage{$_} /= $div;
- $cpumax{$_} /= $factor;
+ $cpumax{$_} /= $factor;
}
- return ( \%cpumax, \%cpuaverage );
+ return (\%cpumax, \%cpuaverage);
}
sub draw_background ($$) {
- my ( $app, $rects ) = @_;
+ my ($app, $rects) = @_;
my $rect = get_rect $rects, 'background';
- $rect->width( $C{width} );
- $rect->height( $C{height} );
- $app->fill( $rect, Loadbars::BLACK );
+ $rect->width($C{width});
+ $rect->height($C{height});
+ $app->fill($rect, Loadbars::BLACK);
$app->update($rect);
return undef;
}
sub create_threads (@) {
- return map {
- $_->detach();
- $_;
-
- } map {
- threads->create( 'thread_get_stats', split /:/ );
-
- } @_;
+ return
+ map { $_->detach(); $_ }
+ map { threads->create( 'stats_thread', split ':' ) } @_;
}
sub auto_off_text ($) {
my ($barwidth) = @_;
- if ($barwidth < $C{barwidth} - 1 && $C{displaytxtoff} == 0) {
- display_info 'Disabling text display, text does not fit into window. Use \'t\' to re-enable.';
- $C{displaytxtoff} = 1;
- $C{displaytxt} = 0;
+ if ($barwidth < $C{barwidth} - 1 && $I{showtextoff} == 0) {
+ return unless $C{showtext};
+ display_warn 'Disabling text display, text does not fit into window. Use \'t\' to re-enable.';
+ $I{showtextoff} = 1;
+ $C{showtext} = 0;
- } elsif ($C{displaytxtoff} && $barwidth >= $C{barwidth} - 1) {
+ } elsif ($I{showtextoff} == 1 && $barwidth >= $C{barwidth} - 1) {
display_info 'Re-enabling text display, text fits into window now.';
- $C{displaytxt} = 1;
- $C{displaytxtoff} = 0;
+ $C{showtext} = 1;
+ $I{showtextoff} = 0;
}
+
+ return undef;
}
sub set_dimensions ($$) {
@@ -319,8 +382,8 @@ sub main_loop ($@) {
$C{width} = $C{barwidth};
my $app = SDL::App->new(
- -title => $C{title},
- -icon_title => $C{title},
+ -title => Loadbars::VERSION . ' (press h for help on stdout)',
+ -icon_title => Loadbars::VERSION,
-width => $C{width},
-height => $C{height},
-depth => Loadbars::COLOR_DEPTH,
@@ -344,7 +407,9 @@ sub main_loop ($@) {
my ( $t1, $t2 ) = ( Time::HiRes::time(), undef );
+ # Closure for event handling
my $event_handler = sub {
+ # While there are events to poll, poll them all!
while ($event->poll() == 1) {
next if $event->type() != 2;
my $key_name = $event->key_name();
@@ -357,347 +422,337 @@ sub main_loop ($@) {
%CPUSTATS = ();
display_info 'Toggled CPUs';
- }
- elsif ( $key_name eq 'e' ) {
+ } elsif ( $key_name eq 'e' ) {
$C{extended} = !$C{extended};
display_info 'Toggled extended display';
- }
- elsif ( $key_name eq 'h' ) {
+ } elsif ( $key_name eq 'h' ) {
say '=> Hotkeys to use in the SDL interface';
say $dispatch->('hotkeys');
display_info 'Hotkeys help printed on terminal stdout';
- }
- elsif ( $key_name eq 'm' ) {
+ } elsif ( $key_name eq 'm' ) {
$C{showmem} = !$C{showmem};
display_info 'Toggled show mem';
- }
- elsif ( $key_name eq 't' ) {
- $C{displaytxt} = !$C{displaytxt};
+ } elsif ( $key_name eq 't' ) {
+ $C{showtext} = !$C{showtext};
display_info 'Toggled text display';
- }
- elsif ( $key_name eq 'u' ) {
- $C{displaytxthost} = !$C{displaytxthost};
+ } elsif ( $key_name eq 'u' ) {
+ $C{showtexthost} = !$C{showtexthost};
display_info 'Toggled number/hostname display';
- }
- elsif ( $key_name eq 'q' ) {
+ } elsif ( $key_name eq 'q' ) {
$quit = 1;
return;
+ } elsif ( $key_name eq 'w' ) {
+ write_config;
+
+ } elsif ( $key_name eq 'a' ) {
+ ++$C{average};
+ display_info "Set sample average to $C{average}";
+ } elsif ( $key_name eq 'y' or $key_name eq 'z' ) {
+ my $avg = $C{average};
+ --$avg;
+ $C{average} = $avg > 1 ? $avg : 2;
+ display_info "Set sample average to $C{average}";
+
+ } elsif ( $key_name eq 's' ) {
+ $C{factor} += 0.1;
+ display_info "Set scale factor to $C{factor}";
+ } elsif ( $key_name eq 'x' or $key_name eq 'z' ) {
+ $C{factor} -= 0.1;
+ display_info "Set scale factor to $C{factor}";
+
+ } elsif ( $key_name eq 'left') {
+ $newsize{width} = $C{width} - 100;
+ $newsize{height} = $C{height};
+ $resize_window = 1;
+ } elsif ( $key_name eq 'right' ) {
+ $newsize{width} = $C{width} + 100;
+ $newsize{height} = $C{height};
+ $resize_window = 1;
+
+ } elsif ( $key_name eq 'up' ) {
+ $newsize{width} = $C{width};
+ $newsize{height} = $C{height} - 100;
+ $resize_window = 1;
+ } elsif ( $key_name eq 'down' ) {
+ $newsize{width} = $C{width};
+ $newsize{height} = $C{height} + 100;
+ $resize_window = 1;
+ }
}
- elsif ( $key_name eq 'a' ) {
- ++$C{average};
- display_info "Set sample average to $C{average}";
- }
- elsif ( $key_name eq 'y' or $key_name eq 'z' ) {
- my $avg = $C{average};
- --$avg;
- $C{average} = $avg > 1 ? $avg : 2;
- display_info "Set sample average to $C{average}";
-
- }
- elsif ( $key_name eq 's' ) {
- $C{factor} += 0.1;
- display_info "Set scale factor to $C{factor}";
- }
- elsif ( $key_name eq 'x' or $key_name eq 'z' ) {
- $C{factor} -= 0.1;
- display_info "Set scale factor to $C{factor}";
-
- }
- elsif ( $key_name eq 'left') {
- $newsize{width} = $C{width} - 100;
- $newsize{height} = $C{height};
- $resize_window = 1;
- }
- elsif ( $key_name eq 'right' ) {
- $newsize{width} = $C{width} + 100;
- $newsize{height} = $C{height};
- $resize_window = 1;
- }
- elsif ( $key_name eq 'up' ) {
- $newsize{width} = $C{width};
- $newsize{height} = $C{height} - 100;
- $resize_window = 1;
- }
- elsif ( $key_name eq 'down' ) {
- $newsize{width} = $C{width};
- $newsize{height} = $C{height} + 100;
- $resize_window = 1;
- }
- }
- };
+ };
+
+ do {
+ my ( $x, $y ) = ( 0, 0 );
- do {
- my ( $x, $y ) = ( 0, 0 );
+ # Also substract 1 (each bar is followed by an 1px separator bar)
+ my $width = $C{width} / notnull($num_stats) - 1;
- # Also substract 1 (each bar is followed by an 1px separator bar)
- my $width = $C{width} / notnull($num_stats) - 1;
+ my ( $current_barnum, $current_corenum ) = ( -1, -1 );
- my ( $current_barnum, $current_corenum ) = ( -1, -1 );
+ for my $key ( sort keys %CPUSTATS ) {
+ last if (++$current_barnum > $num_stats);
+ ++$current_corenum;
+ my ( $host, $name ) = split ';', $key;
- for my $key ( sort keys %CPUSTATS ) {
- last if (++$current_barnum > $num_stats);
- ++$current_corenum;
- my ( $host, $name ) = split ';', $key;
+ next unless defined $CPUSTATS{$key};
- next unless defined $CPUSTATS{$key};
+ my %stat = map {
+ my ( $k, $v ) = split '=';
+ $k => $v
- my %stat = map {
- my ( $k, $v ) = split '=';
- $k => $v
+ } split ';', $CPUSTATS{$key};
+
+ unless ( exists $prev_stats{$key} ) {
+ $prev_stats{$key} = \%stat;
+ next;
+ }
- } split ';', $CPUSTATS{$key};
+ my $prev_stat = $prev_stats{$key};
+ my %loads =
+ null $stat{TOTAL} == null $prev_stat->{TOTAL}
+ ? %stat
+ : map { $_ => $stat{$_} - $prev_stat->{$_} } keys %stat;
- unless ( exists $prev_stats{$key} ) {
$prev_stats{$key} = \%stat;
- next;
- }
- my $prev_stat = $prev_stats{$key};
- my %loads =
- null $stat{TOTAL} == null $prev_stat->{TOTAL}
- ? %stat
- : map { $_ => $stat{$_} - $prev_stat->{$_} } keys %stat;
-
- $prev_stats{$key} = \%stat;
-
- %loads = normalize_loads %loads;
- push @{ $last_loads{$key} }, \%loads;
- shift @{ $last_loads{$key} }
- while @{ $last_loads{$key} } >= $C{average};
-
- my ( $cpumax, $cpuaverage ) = get_cpuaverage $C{factor},
- @{ $last_loads{$key} };
-
- my %heights = map {
- $_ => defined $cpuaverage->{$_}
- ? $cpuaverage->{$_} * ( $C{height} / 100 )
- : 1
- } keys %$cpuaverage;
-
- my $is_host_summary = $name eq 'cpu' ? 1 : 0;
-
- my $rect_separator = undef;
-
- my $rect_idle = get_rect $rects, "$key;idle";
- my $rect_steal = get_rect $rects, "$key;steal";
- my $rect_guest = get_rect $rects, "$key;guest";
- my $rect_irq = get_rect $rects, "$key;irq";
- my $rect_softirq = get_rect $rects, "$key;softirq";
- my $rect_nice = get_rect $rects, "$key;nice";
- my $rect_iowait = get_rect $rects, "$key;iowait";
- my $rect_user = get_rect $rects, "$key;user";
- my $rect_system = get_rect $rects, "$key;system";
-
- my $rect_peak;
-
- $y = $C{height} - $heights{system};
- $rect_system->width($width);
- $rect_system->height( $heights{system} );
- $rect_system->x($x);
- $rect_system->y($y);
-
- $y -= $heights{user};
- $rect_user->width($width);
- $rect_user->height( $heights{user} );
- $rect_user->x($x);
- $rect_user->y($y);
-
- $y -= $heights{nice};
- $rect_nice->width($width);
- $rect_nice->height( $heights{nice} );
- $rect_nice->x($x);
- $rect_nice->y($y);
-
- $y -= $heights{idle};
- $rect_idle->width($width);
- $rect_idle->height( $heights{idle} );
- $rect_idle->x($x);
- $rect_idle->y($y);
-
- $y -= $heights{iowait};
- $rect_iowait->width($width);
- $rect_iowait->height( $heights{iowait} );
- $rect_iowait->x($x);
- $rect_iowait->y($y);
-
- $y -= $heights{irq};
- $rect_irq->width($width);
- $rect_irq->height( $heights{irq} );
- $rect_irq->x($x);
- $rect_irq->y($y);
-
- $y -= $heights{softirq};
- $rect_softirq->width($width);
- $rect_softirq->height( $heights{softirq} );
- $rect_softirq->x($x);
- $rect_softirq->y($y);
-
- $y -= $heights{guest};
- $rect_guest->width($width);
- $rect_guest->height( $heights{guest} );
- $rect_guest->x($x);
- $rect_guest->y($y);
-
- $y -= $heights{steal};
- $rect_steal->width($width);
- $rect_steal->height( $heights{steal} );
- $rect_steal->x($x);
- $rect_steal->y($y);
-
- my $all = 100 - $cpuaverage->{idle};
- my $max_all = 0;
-
- $app->fill( $rect_idle, Loadbars::BLACK );
- $app->fill( $rect_steal, Loadbars::RED );
- $app->fill( $rect_guest, Loadbars::RED );
- $app->fill( $rect_irq, Loadbars::WHITE );
- $app->fill( $rect_softirq, Loadbars::WHITE );
- $app->fill( $rect_nice, Loadbars::GREEN );
- $app->fill( $rect_iowait, Loadbars::PURPLE );
-
- my $add_x = 0;
- my $rect_memused = get_rect $rects, "$host;memused";
- my $rect_memfree = get_rect $rects, "$host;memfree";
- my $rect_buffers = get_rect $rects, "$host;buffers";
- my $rect_cached = get_rect $rects, "$host;cached";
- my $rect_swapused = get_rect $rects, "$host;swapused";
- my $rect_swapfree = get_rect $rects, "$host;swapfree";
-
- my %meminfo;
- if ( $is_host_summary ) {
- if ( $C{showmem} ) {
- $add_x = $width + 1;
-
- my $ram_per = percentage $MEMSTATS{"$host;MemTotal"}, $MEMSTATS{"$host;MemFree"};
- my $swap_per = percentage $MEMSTATS{"$host;SwapTotal"}, $MEMSTATS{"$host;SwapFree"};
-
- %meminfo = (
- ram_per => $ram_per,
- swap_per => $swap_per,
- );
-
- my %heights = (
- MemFree => $ram_per * ( $C{height} / 100 ),
- MemUsed => (100 - $ram_per) * ( $C{height} / 100 ),
- SwapFree => $swap_per * ( $C{height} / 100 ),
- SwapUsed => (100 - $swap_per) * ( $C{height} / 100 ),
- );
-
- my $half_width = $width / 2;
- $y = $C{height} - $heights{MemUsed};
- $rect_memused->width($half_width);
- $rect_memused->height( $heights{MemUsed} );
- $rect_memused->x($x+$add_x);
- $rect_memused->y($y);
-
- $y -= $heights{MemFree};
- $rect_memfree->width($half_width);
- $rect_memfree->height( $heights{MemFree} );
- $rect_memfree->x($x+$add_x);
- $rect_memfree->y($y);
-
- $y = $C{height} - $heights{SwapUsed};
- $rect_swapused->width($half_width);
- $rect_swapused->height( $heights{SwapUsed} );
- $rect_swapused->x($x+$add_x+$half_width);
- $rect_swapused->y($y);
-
- $y -= $heights{SwapFree};
- $rect_swapfree->width($half_width);
- $rect_swapfree->height( $heights{SwapFree} );
- $rect_swapfree->x($x+$add_x+$half_width);
- $rect_swapfree->y($y);
-
- $app->fill( $rect_memused, Loadbars::DARK_GREY );
- $app->fill( $rect_memfree, Loadbars::BLACK );
-
- $app->fill( $rect_swapused, Loadbars::GREY );
- $app->fill( $rect_swapfree, Loadbars::BLACK );
- }
+ %loads = normalize_loads %loads;
+ push @{ $last_loads{$key} }, \%loads;
+ shift @{ $last_loads{$key} }
+ while @{ $last_loads{$key} } >= $C{average};
- if ( $C{showcores} ) {
- $current_corenum = 0;
- $rect_separator = get_rect $rects, "$key;separator";
- $rect_separator->width(1);
- $rect_separator->height( $C{height} );
- $rect_separator->x( $x - 1 );
- $rect_separator->y(0);
- $app->fill( $rect_separator, Loadbars::GREY );
- }
- }
+ my ( $cpumax, $cpuaverage ) = get_cpuaverage $C{factor},
+ @{ $last_loads{$key} };
- if ( $C{extended} ) {
- my %maxheights = map {
- $_ => defined $cpumax->{$_}
- ? $cpumax->{$_} * ( $C{height} / 100 )
+ my %heights = map {
+ $_ => defined $cpuaverage->{$_}
+ ? $cpuaverage->{$_} * ( $C{height} / 100 )
: 1
- } keys %$cpumax;
-
- $rect_peak = get_rect $rects, "$key;max";
- $rect_peak->width($width);
- $rect_peak->height(1);
- $rect_peak->x($x);
- $rect_peak->y( $C{height} - $maxheights{system} - $maxheights{user} );
+ } keys %$cpuaverage;
+
+ my $is_host_summary = $name eq 'cpu' ? 1 : 0;
+
+ my $rect_separator = undef;
+
+ my $rect_idle = get_rect $rects, "$key;idle";
+ my $rect_steal = get_rect $rects, "$key;steal";
+ my $rect_guest = get_rect $rects, "$key;guest";
+ my $rect_irq = get_rect $rects, "$key;irq";
+ my $rect_softirq = get_rect $rects, "$key;softirq";
+ my $rect_nice = get_rect $rects, "$key;nice";
+ my $rect_iowait = get_rect $rects, "$key;iowait";
+ my $rect_user = get_rect $rects, "$key;user";
+ my $rect_system = get_rect $rects, "$key;system";
+
+ my $rect_peak;
+
+ $y = $C{height} - $heights{system};
+ $rect_system->width($width);
+ $rect_system->height( $heights{system} );
+ $rect_system->x($x);
+ $rect_system->y($y);
+
+ $y -= $heights{user};
+ $rect_user->width($width);
+ $rect_user->height( $heights{user} );
+ $rect_user->x($x);
+ $rect_user->y($y);
+
+ $y -= $heights{nice};
+ $rect_nice->width($width);
+ $rect_nice->height( $heights{nice} );
+ $rect_nice->x($x);
+ $rect_nice->y($y);
+
+ $y -= $heights{idle};
+ $rect_idle->width($width);
+ $rect_idle->height( $heights{idle} );
+ $rect_idle->x($x);
+ $rect_idle->y($y);
+
+ $y -= $heights{iowait};
+ $rect_iowait->width($width);
+ $rect_iowait->height( $heights{iowait} );
+ $rect_iowait->x($x);
+ $rect_iowait->y($y);
+
+ $y -= $heights{irq};
+ $rect_irq->width($width);
+ $rect_irq->height( $heights{irq} );
+ $rect_irq->x($x);
+ $rect_irq->y($y);
+
+ $y -= $heights{softirq};
+ $rect_softirq->width($width);
+ $rect_softirq->height( $heights{softirq} );
+ $rect_softirq->x($x);
+ $rect_softirq->y($y);
+
+ $y -= $heights{guest};
+ $rect_guest->width($width);
+ $rect_guest->height( $heights{guest} );
+ $rect_guest->x($x);
+ $rect_guest->y($y);
+
+ $y -= $heights{steal};
+ $rect_steal->width($width);
+ $rect_steal->height( $heights{steal} );
+ $rect_steal->x($x);
+ $rect_steal->y($y);
+
+ my $all = 100 - $cpuaverage->{idle};
+ my $max_all = 0;
+
+ $app->fill( $rect_idle, Loadbars::BLACK );
+ $app->fill( $rect_steal, Loadbars::RED );
+ $app->fill( $rect_guest, Loadbars::RED );
+ $app->fill( $rect_irq, Loadbars::WHITE );
+ $app->fill( $rect_softirq, Loadbars::WHITE );
+ $app->fill( $rect_nice, Loadbars::GREEN );
+ $app->fill( $rect_iowait, Loadbars::PURPLE );
+
+ my $add_x = 0;
+ my $rect_memused = get_rect $rects, "$host;memused";
+ my $rect_memfree = get_rect $rects, "$host;memfree";
+ my $rect_buffers = get_rect $rects, "$host;buffers";
+ my $rect_cached = get_rect $rects, "$host;cached";
+ my $rect_swapused = get_rect $rects, "$host;swapused";
+ my $rect_swapfree = get_rect $rects, "$host;swapfree";
+
+ my %meminfo;
+ if ( $is_host_summary ) {
+ if ( $C{showmem} ) {
+ $add_x = $width + 1;
+
+ my $ram_per = percentage $MEMSTATS{"$host;MemTotal"}, $MEMSTATS{"$host;MemFree"};
+ my $swap_per = percentage $MEMSTATS{"$host;SwapTotal"}, $MEMSTATS{"$host;SwapFree"};
+
+ %meminfo = (
+ ram_per => $ram_per,
+ swap_per => $swap_per,
+ );
+
+ my %heights = (
+ MemFree => $ram_per * ( $C{height} / 100 ),
+ MemUsed => (100 - $ram_per) * ( $C{height} / 100 ),
+ SwapFree => $swap_per * ( $C{height} / 100 ),
+ SwapUsed => (100 - $swap_per) * ( $C{height} / 100 ),
+ );
+
+ my $half_width = $width / 2;
+ $y = $C{height} - $heights{MemUsed};
+ $rect_memused->width($half_width);
+ $rect_memused->height( $heights{MemUsed} );
+ $rect_memused->x($x+$add_x);
+ $rect_memused->y($y);
+
+ $y -= $heights{MemFree};
+ $rect_memfree->width($half_width);
+ $rect_memfree->height( $heights{MemFree} );
+ $rect_memfree->x($x+$add_x);
+ $rect_memfree->y($y);
+
+ $y = $C{height} - $heights{SwapUsed};
+ $rect_swapused->width($half_width);
+ $rect_swapused->height( $heights{SwapUsed} );
+ $rect_swapused->x($x+$add_x+$half_width);
+ $rect_swapused->y($y);
+
+ $y -= $heights{SwapFree};
+ $rect_swapfree->width($half_width);
+ $rect_swapfree->height( $heights{SwapFree} );
+ $rect_swapfree->x($x+$add_x+$half_width);
+ $rect_swapfree->y($y);
+
+ $app->fill( $rect_memused, Loadbars::DARK_GREY );
+ $app->fill( $rect_memfree, Loadbars::BLACK );
+
+ $app->fill( $rect_swapused, Loadbars::GREY );
+ $app->fill( $rect_swapfree, Loadbars::BLACK );
+ }
- $max_all = sum @{$cpumax} {qw(user system iowait irq softirq steal guest)};
+ if ( $C{showcores} ) {
+ $current_corenum = 0;
+ $rect_separator = get_rect $rects, "$key;separator";
+ $rect_separator->width(1);
+ $rect_separator->height( $C{height} );
+ $rect_separator->x( $x - 1 );
+ $rect_separator->y(0);
+ $app->fill( $rect_separator, Loadbars::GREY );
+ }
+ }
- $app->fill( $rect_peak, $max_all > Loadbars::USER_ORANGE ? Loadbars::ORANGE
- : ( $max_all > Loadbars::USER_YELLOW0 ? Loadbars::YELLOW0 : (Loadbars::YELLOW)));
- }
+ if ( $C{extended} ) {
+ my %maxheights = map {
+ $_ => defined $cpumax->{$_}
+ ? $cpumax->{$_} * ( $C{height} / 100 )
+ : 1
+ } keys %$cpumax;
+
+ $rect_peak = get_rect $rects, "$key;max";
+ $rect_peak->width($width);
+ $rect_peak->height(1);
+ $rect_peak->x($x);
+ $rect_peak->y( $C{height} - $maxheights{system} - $maxheights{user} );
+
+ $max_all = sum @{$cpumax} {qw(user system iowait irq softirq steal guest)};
+
+ $app->fill( $rect_peak, $max_all > Loadbars::USER_ORANGE ? Loadbars::ORANGE
+ : ( $max_all > Loadbars::USER_YELLOW0 ? Loadbars::YELLOW0 : (Loadbars::YELLOW)));
+ }
- $app->fill( $rect_user, $all > Loadbars::USER_ORANGE ? Loadbars::ORANGE
- : ( $all > Loadbars::USER_YELLOW0 ? Loadbars::YELLOW0 : (Loadbars::YELLOW)));
- $app->fill( $rect_system, $cpuaverage->{system} > Loadbars::SYSTEM_BLUE0
- ? Loadbars::BLUE0 : Loadbars::BLUE );
+ $app->fill( $rect_user, $all > Loadbars::USER_ORANGE ? Loadbars::ORANGE
+ : ( $all > Loadbars::USER_YELLOW0 ? Loadbars::YELLOW0 : (Loadbars::YELLOW)));
+ $app->fill( $rect_system, $cpuaverage->{system} > Loadbars::SYSTEM_BLUE0
+ ? Loadbars::BLUE0 : Loadbars::BLUE );
- my ( $y, $space ) = ( 5, $font_height );
+ my ( $y, $space ) = ( 5, $font_height );
- my @loadavg = split ';', $AVGSTATS{$host};
+ my @loadavg = split ';', $AVGSTATS{$host};
- if ( $C{displaytxt} ) {
- if ( $C{showmem} && $is_host_summary ) {
- my $y_ = $y;
- $app->print( $x+$add_x, $y_, 'Ram:');
- $app->print( $x+$add_x, $y_ += $space, sprintf '%02d', (100-$meminfo{ram_per}));
- $app->print( $x+$add_x, $y_ += $space, 'Swp:');
- $app->print( $x+$add_x, $y_ += $space, sprintf '%02d', (100-$meminfo{swap_per}));
- }
- if ( $C{displaytxthost} && $is_host_summary ) {
- # If hostname is printed don't use FQDN
- # because of its length.
- $host =~ /([^\.]*)/;
- $app->print( $x, $y, sprintf '%s:', $1 );
+ if ( $C{showtext} ) {
+ if ( $C{showmem} && $is_host_summary ) {
+ my $y_ = $y;
+ $app->print( $x+$add_x, $y_, 'Ram:');
+ $app->print( $x+$add_x, $y_ += $space, sprintf '%02d', (100-$meminfo{ram_per}));
+ $app->print( $x+$add_x, $y_ += $space, 'Swp:');
+ $app->print( $x+$add_x, $y_ += $space, sprintf '%02d', (100-$meminfo{swap_per}));
+ }
+ if ( $C{showtexthost} && $is_host_summary ) {
+ # If hostname is printed don't use FQDN
+ # because of its length.
+ $host =~ /([^\.]*)/;
+ $app->print( $x, $y, sprintf '%s:', $1 );
- }
- else {
- $app->print( $x, $y, sprintf '%i:', $C{showcores} ? $current_corenum : $current_barnum + 1 );
- }
+ }
+ else {
+ $app->print( $x, $y, sprintf '%i:', $C{showcores} ? $current_corenum : $current_barnum + 1 );
+ }
- if ( $C{extended} ) {
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{steal}, 'st');
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{guest}, 'gt');
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{softirq}, 'sr');
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{irq}, 'ir');
- }
+ if ( $C{extended} ) {
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{steal}, 'st');
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{guest}, 'gt');
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{softirq}, 'sr');
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{irq}, 'ir');
+ }
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{iowait}, 'io');
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{iowait}, 'io');
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{idle}, 'id') if $C{extended};
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{idle}, 'id') if $C{extended};
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{nice}, 'ni');
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{user}, 'us');
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{system}, 'sy');
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $all, 'to');
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{nice}, 'ni');
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{user}, 'us');
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $cpuaverage->{system}, 'sy');
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $all, 'to');
- $app->print( $x, $y += $space, sprintf '%02d%s', norm $max_all, 'pk') if $C{extended};
+ $app->print( $x, $y += $space, sprintf '%02d%s', norm $max_all, 'pk') if $C{extended};
- if ($is_host_summary) {
+ if ($is_host_summary) {
if ( defined $loadavg[0] ) {
$app->print( $x, $y += $space, 'Avg:' );
$app->print( $x, $y += $space, sprintf "%.2f", $loadavg[0]);
@@ -727,14 +782,14 @@ sub main_loop ($@) {
if ( INTERVAL > $t_diff ) {
usleep 10000;
- # Goto is OK if you don't produce spaghetti code
+ # Goto is OK as long you don't produce spaghetti code
goto TIMEKEEPER;
} elsif ( INTERVAL_WARN < $t_diff ) {
- display_info "WARN: Loop is behind $t_diff seconds, your computer may be too slow";
+ display_warn "WARN: Loop is behind $t_diff seconds, your computer may be too slow";
}
- $t1 = $t2;
+ $t1 = $t2;
$event_handler->();
my $new_num_stats = keys %CPUSTATS;
@@ -768,7 +823,7 @@ sub main_loop ($@) {
say "Good bye";
- exit 0;
+ exit SUCCESS;
}
sub dispatch_table () {
@@ -804,16 +859,24 @@ Memory stuff:
Color: Dark grey
Swp: System swap usage in %
Color: Grey
+Config file support:
+ Loadbars tries to read ~/.loadbarsrc and it's possible to configure any
+ option you find in --help but without leading '--'. For comments just use
+ the '#' sign. Sample config:
+ showcores=1 # Always show cores on startup
+ showtext=0 # Always don't display text on startup
+ extended=1 # Always use extended mode on startup
+ will always show all CPU cores in extended mode but no text display.
Examples:
loadbars --extended 1 --showcores 1 --height 300 --hosts localhost
loadbars --hosts localhost,server1.example.com,server2.example.com
loadbars --cluster foocluster (foocluster is in /etc/clusters [ClusterSSH])
END
- # mode 1: Option is shown in the online help menu (stdout not sdl)
- # mode 2: Option is shown in the 'usage' screen from the command line
- # mode 4: Option is used to generate the GetOptions parameters for Getopt::Long
- # Combinations: Like chmod(1)
+ # mode 1: Option is shown in the online help menu (stdout not sdl)
+ # mode 2: Option is shown in the 'usage' screen from the command line
+ # mode 4: Option is used to generate the GetOptions parameters for Getopt::Long
+ # Combinations: Like chmod(1)
my %d = (
average => {
@@ -943,6 +1006,7 @@ END
},
quit_hot => { menupos => 16, cmd => 'q', help => 'Quits', mode => 1 },
+ writeconfig_hot => { menupos => 16, cmd => 'w', help => 'Write config to config file', mode => 1 },
samples => {
menupos => 17,
@@ -997,14 +1061,6 @@ END
sshopts =>
{ menupos => 20, help => 'Set SSH options', mode => 6, type => 's' },
- title => {
- menupos => 21,
- help => 'Set the window title',
- var => \$C{title},
- mode => 6,
- type => 's'
- },
-
);
my %d_by_short = map {
@@ -1109,7 +1165,7 @@ sub get_cluster_hosts ($;$) {
$recursion = 1;
}
- elsif ( $recursion > CSSH_MAX_RECURSION ) {
+ elsif ( $recursion > CSSH_MAX_RECURSION ) {
error "CSSH_MAX_RECURSION reached. Infinite circle loop in "
. CSSH_CONFFILE . "?";
}
@@ -1136,6 +1192,7 @@ sub get_cluster_hosts ($;$) {
my @hosts;
push @hosts, get_cluster_hosts $_, ( $recursion + 1 )
for ( split /\s+/, $hosts );
+
return @hosts;
}
@@ -1143,11 +1200,15 @@ sub main () {
my ( $hosts, $dispatch ) = dispatch_table;
my $usage;
+ say VERSION . ' ' . COPYRIGHT;
+
+ read_config;
+
GetOptions( 'help|?' => \$usage, $dispatch->('options') );
if ( defined $usage ) {
say $dispatch->('usage');
- exit 1;
+ exit SUCCESS;
}
set_showcores_regexp;
@@ -1164,11 +1225,13 @@ sub main () {
}
else {
say $dispatch->('usage');
- exit 1;
+ exit E_NOHOST;
}
my @threads = create_threads @hosts;
main_loop $dispatch, @threads;
+
+ exit SUCCESS;
}
main;