summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.version2
-rw-r--r--Makefile6
-rw-r--r--debian/changelog6
-rw-r--r--debian/files2
-rw-r--r--debian/loadbars.debhelper.log6
-rw-r--r--docs/loadbars.14
-rw-r--r--docs/loadbars.pod4
-rw-r--r--docs/wishlist2
-rw-r--r--lib/Loadbars/Constants.pm35
-rw-r--r--lib/Loadbars/HelpDispatch.pm26
-rw-r--r--lib/Loadbars/Main.pm497
-rw-r--r--lib/Loadbars/Shared.pm3
-rwxr-xr-xloadbars4
13 files changed, 213 insertions, 384 deletions
diff --git a/.version b/.version
index cd97ca3..0fb09cc 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.6.0.5
+0.6.0.99
diff --git a/Makefile b/Makefile
index ec553e1..5e44f7d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ NAME=loadbars
all: version documentation perltidy
version:
cut -d' ' -f2 debian/changelog | head -n 1 | sed 's/(//;s/)//' > .version
+profile:
+ perl -d:NYTProf loadbars --hosts localhost
+ nytprofhtml nytprof.out
perltidy:
find . -name \*.pm | xargs perltidy -b
perltidy -b $(NAME)
@@ -22,6 +25,9 @@ deinstall:
test ! -z "$(DESTDIR)/usr/share/$(NAME)" && -d $(DESTDIR)/usr/share/$(NAME) && rm -r $(DESTDIR)/usr/share/$(NAME) || exit 0
clean:
test -f .version && rm .version
+ test -f nytprof.out && rm nytprof.out
+ test -f tmon.out && rm tmon.out
+ test -d nytprof && rm -Rf nytprof
deb:
dpkg-buildpackage
clean-top:
diff --git a/debian/changelog b/debian/changelog
index 3b647c6..0711375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loadbars (0.6.0.99) precise; urgency=low
+
+ * New dev branch
+
+ -- Paul Buetow <pb@venus> Thu, 26 Jul 2012 08:24:11 +0200
+
loadbars (0.6.0.5) stable; urgency=low
* Introducing network stats. Network stats toggle button is 3
diff --git a/debian/files b/debian/files
index 4348924..285dadc 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-loadbars_0.6.0.5_all.deb utils optional
+loadbars_0.6.0.99_all.deb utils optional
diff --git a/debian/loadbars.debhelper.log b/debian/loadbars.debhelper.log
index 2d06fcd..545a50f 100644
--- a/debian/loadbars.debhelper.log
+++ b/debian/loadbars.debhelper.log
@@ -27,7 +27,9 @@ dh_installppp
dh_installudev
dh_installwm
dh_installxfonts
+dh_installgsettings
dh_bugfiles
+dh_ucf
dh_lintian
dh_gconf
dh_icons
@@ -36,10 +38,8 @@ dh_usrlocal
dh_link
dh_compress
dh_fixperms
-dh_strip
-dh_makeshlibs
-dh_shlibdeps
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
+dh_builddeb
diff --git a/docs/loadbars.1 b/docs/loadbars.1
index 02050e0..86590ef 100644
--- a/docs/loadbars.1
+++ b/docs/loadbars.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "LOADBARS 1"
-.TH LOADBARS 1 "2012-07-23" "loadbars 0.6.0.5" "User Commands"
+.TH LOADBARS 1 "2013-04-08" "loadbars 0.6.0.99" "User Commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/docs/loadbars.pod b/docs/loadbars.pod
index dca2d75..ca5b193 100644
--- a/docs/loadbars.pod
+++ b/docs/loadbars.pod
@@ -4,6 +4,10 @@ loadbars - A small and humble tool to observe server loads
=head1 SYNOPSIS
+=head2 Tested platforms
+
+This version of loadbars has only been tested on Debian GNU/Linux Squeeze.
+
=head2 I like flying elephants
For any startup params help check out --help on command line or 'h' during program
diff --git a/docs/wishlist b/docs/wishlist
index 40ff11b..9d981cd 100644
--- a/docs/wishlist
+++ b/docs/wishlist
@@ -1,6 +1,6 @@
* Optimize data polling intervals and make it configurable
* Optimize code (too much cpu usage if there are too many hosts involved).
- E.g. do more stuff on the remote side (preparing the data).
+ E.g. do more stuff on the remote side (preparing the data).
* Fast hostnum display
* --tiny switch
* More stats for memory
diff --git a/lib/Loadbars/Constants.pm b/lib/Loadbars/Constants.pm
index cb76295..4421c4a 100644
--- a/lib/Loadbars/Constants.pm
+++ b/lib/Loadbars/Constants.pm
@@ -10,23 +10,24 @@ use constant {
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 ),
- LIGHT_BLUE => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0xdd ),
- LIGHT_BLUE0 => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0xcc ),
- BLUE => SDL::Color->new( -r => 0x00, -g => 0x00, -b => 0x88 ),
- GREEN => SDL::Color->new( -r => 0x00, -g => 0x90, -b => 0x00 ),
- LIGHT_GREEN => SDL::Color->new( -r => 0x00, -g => 0xf0, -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 ),
+ COLOR_DEPTH => 32,
+ BLACK => [ 0x00, 0x00, 0x00 ],
+ BLUE0 => [ 0x00, 0x00, 0xff ],
+ LIGHT_BLUE => [ 0x00, 0x00, 0xdd ],
+ LIGHT_BLUE0 => [ 0x00, 0x00, 0xcc ],
+ BLUE => [ 0x00, 0x00, 0x88 ],
+ GREEN => [ 0x00, 0x90, 0x00 ],
+ LIGHT_GREEN => [ 0x00, 0xf0, 0x00 ],
+ ORANGE => [ 0xff, 0x70, 0x00 ],
+ PURPLE => [ 0xa0, 0x20, 0xf0 ],
+ RED => [ 0xff, 0x00, 0x00 ],
+ WHITE => [ 0xff, 0xff, 0xff ],
+ GREY0 => [ 0x11, 0x11, 0x11 ],
+ GREY => [ 0xaa, 0xaa, 0xaa ],
+ DARK_GREY => [ 0x15, 0x15, 0x15 ],
+ YELLOW0 => [ 0xff, 0xa0, 0x00 ],
+ YELLOW => [ 0xff, 0xc0, 0x00 ],
+ COLOR_WHITE => SDL::Color->new(0xff, 0xff, 0xff),
SYSTEM_BLUE0 => 30,
USER_ORANGE => 70,
USER_YELLOW0 => 50,
diff --git a/lib/Loadbars/HelpDispatch.pm b/lib/Loadbars/HelpDispatch.pm
index 24f4afc..bc58ce8 100644
--- a/lib/Loadbars/HelpDispatch.pm
+++ b/lib/Loadbars/HelpDispatch.pm
@@ -219,32 +219,6 @@ END
shownet_hot =>
{ menupos => 17, cmd => '3', help => 'Toggle show net', mode => 1 },
- showtexthost => {
- menupos => 18,
- help => 'Toggle hostname/num text display (0 or 1)',
- mode => 7,
- type => 'i'
- },
- showtexthost_hot => {
- menupos => 18,
- cmd => 'u',
- help => 'Toggle hostname/num text display',
- mode => 1
- },
-
- showtext => {
- menupos => 19,
- help => 'Toggle text display (0 or 1)',
- mode => 7,
- type => 'i'
- },
- showtext_hot => {
- menupos => 19,
- cmd => 't',
- help => 'Toggle text display',
- mode => 1
- },
-
sshopts =>
{ menupos => 20, help => 'Set SSH options', mode => 6, type => 's' },
diff --git a/lib/Loadbars/Main.pm b/lib/Loadbars/Main.pm
index 4f34c9e..8faa60f 100644
--- a/lib/Loadbars/Main.pm
+++ b/lib/Loadbars/Main.pm
@@ -2,16 +2,18 @@ package Loadbars::Main;
use strict;
use warnings;
+use v5.14;
+use autodie;
use SDL;
-use SDL::App;
-use SDL::Rect;
use SDL::Event;
-
+use SDL::Events;
+use SDL::Rect;
use SDL::Surface;
-use SDL::Font;
+use SDL::Video;
+use SDLx::App;
-use Time::HiRes qw(usleep gettimeofday);
+use Time::HiRes qw(gettimeofday);
use Proc::ProcessTable;
@@ -23,6 +25,9 @@ use Loadbars::Constants;
use Loadbars::Shared;
use Loadbars::Utils;
+use Carp;
+$SIG{__DIE__} = sub { Carp::confess(@_) };
+
$| = 1;
sub cpu_set_showcores_re () {
@@ -85,8 +90,11 @@ sub threads_terminate_pids (@) {
print $pid . ' ';
kill 'TERM', $pid;
+
+ #$_->join() for @threads;
}
+
say '';
display_info 'Terminating done. I\'ll be back!';
@@ -188,7 +196,7 @@ REMOTECODE
# Toggle CPUs
$SIG{USR1} = sub { $sigusr1 = 1 };
- $SIG{TERM} = sub { $sigterm = 1 };
+ $SIG{TERM} = sub { $sigterm = 1; threads->exit(); };
my $mode = 0;
@@ -261,7 +269,7 @@ sub sdl_get_rect ($$) {
my ( $rects, $name ) = @_;
return $rects->{$name} if exists $rects->{$name};
- return $rects->{$name} = SDL::Rect->new();
+ return $rects->{$name} = SDL::Rect->new( 0, 0, 0, 0 );
}
sub cpu_normalize_loads ($) {
@@ -364,14 +372,22 @@ sub net_diff ($$) {
return \%diff;
}
+sub sdl_fill_rect {
+ my ( $app, $rect, $color ) = @_;
+
+ my $mapped_color = SDL::Video::map_RGB( $app->format(), @$color );
+ SDL::Video::fill_rect( $app, $rect, $mapped_color );
+
+ return undef;
+}
+
sub sdl_draw_background ($$) {
my ( $app, $rects ) = @_;
my $rect = sdl_get_rect $rects, 'background';
- $rect->width( $C{width} );
- $rect->height( $C{height} );
- $app->fill( $rect, Loadbars::Constants->BLACK );
- $app->update($rect);
+ $rect->w( $C{width} );
+ $rect->h( $C{height} );
+ sdl_fill_rect( $app, $rect, Loadbars::Constants->BLACK );
return undef;
}
@@ -381,26 +397,6 @@ sub threads_create (@) {
map { threads->create( 'threads_stats', split ':' ) } @_;
}
-sub auto_off_text ($) {
- my ($barwidth) = @_;
-
- if ( $barwidth < $C{barwidth} - 1 && $I{showtextoff} == 0 ) {
- return unless $C{showtext};
- display_warn
-'Disabling text display, text does not fit into window. Press t to re-enable.';
- $I{showtextoff} = 1;
- $C{showtext} = 0;
-
- }
- elsif ( $I{showtextoff} == 1 && $barwidth >= $C{barwidth} - 1 ) {
- display_info 'Re-enabling text display, text fits into window now.';
- $C{showtext} = 1;
- $I{showtextoff} = 0;
- }
-
- return undef;
-}
-
sub set_dimensions ($$) {
my ( $width, $height ) = @_;
my $display_info = 0;
@@ -441,28 +437,15 @@ sub loop ($@) {
}
};
- my $app = SDL::App->new(
- -title => $title,
- -icon_title => Loadbars::Constants->VERSION,
- -width => $C{width},
- -height => $C{height},
- -depth => Loadbars::Constants->COLOR_DEPTH,
- -resizeable => 1,
+ my $app = SDLx::App->new(
+ title => $title,
+ icon_title => Loadbars::Constants->VERSION,
+ width => $C{width},
+ height => $C{height},
+ depth => Loadbars::Constants->COLOR_DEPTH,
+ resizeable => 1,
);
- my $font = do {
- my $fontbase = 'fonts/font.png';
-
- if ( -f "./$fontbase" ) {
- "./$fontbase";
- }
- elsif ( -f "/usr/share/loadbars/$fontbase" ) {
- "/usr/share/loadbars/$fontbase";
- }
- };
-
- SDL::Font->new($font)->use();
-
my $rects = {};
my %cpu_history;
my %cpu_max;
@@ -490,11 +473,13 @@ sub loop ($@) {
my $event_handler = sub {
# While there are events to poll, poll them all!
- while ( $event->poll() == 1 ) {
+ while ( SDL::Events::poll_event($event) ) {
next if $event->type() != 2;
- my $key_name = $event->key_name();
+ my $key_sym = $event->key_sym();
+
+ if ( $key_sym == 49 ) {
- if ( $key_name eq '1' ) {
+ # 1 pressed
$C{showcores} = !$C{showcores};
cpu_set_showcores_re;
$_->kill('USR1') for @threads;
@@ -502,12 +487,16 @@ sub loop ($@) {
display_info "Toggled CPUs $C{showcores}";
}
- elsif ( $key_name eq '2' ) {
+ elsif ( $key_sym == 50 ) {
+
+ # 2 pressed
$C{showmem} = !$C{showmem};
display_info "Toggled show mem";
}
- elsif ( $key_name eq '3' ) {
+ elsif ( $key_sym == 51 ) {
+
+ # 3 pressed
$C{shownet} = !$C{shownet};
display_info "Toggled show net $C{shownet}";
display_info "Net interface speed reference is "
@@ -516,24 +505,32 @@ sub loop ($@) {
if $C{shownet};
}
- elsif ( $key_name eq 'e' ) {
+ elsif ( $key_sym == 101 ) {
+
+ # e pressed
$C{extended} = !$C{extended};
$sdl_redraw_background = 1;
display_info "Toggled extended display $C{extended}";
}
- elsif ( $key_name eq 'h' ) {
+ elsif ( $key_sym == 104 ) {
+
+ # h pressed
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_sym == 109 ) {
+
+ # m pressed
display_warn
"Toggled show mem hotkey m is deprecated. Press 2 hotkey instead";
}
- elsif ( $key_name eq 'n' ) {
+ elsif ( $key_sym == 110 ) {
+
+ # n pressed
if ( $C{shownet} ) {
$net_int = net_next_int ++$net_int_number;
$sdl_redraw_background = 1;
@@ -545,58 +542,61 @@ sub loop ($@) {
}
}
- elsif ( $key_name eq 't' ) {
- $C{showtext} = !$C{showtext};
- $sdl_redraw_background = 1;
- display_info "Toggled text display $C{showtext}";
-
- }
- elsif ( $key_name eq 'u' ) {
- $C{showtexthost} = !$C{showtexthost};
- $sdl_redraw_background = 1;
- display_info "Toggled number/hostname display $C{showtexthost}";
+ elsif ( $key_sym == 113 ) {
- }
- elsif ( $key_name eq 'q' ) {
+ # q pressed
threads_terminate_pids @threads;
$quit = 1;
return;
}
- elsif ( $key_name eq 'w' ) {
+ elsif ( $key_sym == 119 ) {
+
+ # w pressed
Loadbars::Config::write;
}
- elsif ( $key_name eq 'a' ) {
+ elsif ( $key_sym == 97 ) {
+
+ # a pressed
++$C{cpuaverage};
display_info "Set sample cpu average $C{cpuaverage}";
}
- elsif ( $key_name eq 'y' or $key_name eq 'z' ) {
+ elsif ( $key_sym == 121 or $key_sym == 122 ) {
+
+ # y or z pressed
my $avg = $C{cpuaverage};
--$avg;
$C{cpuaverage} = $avg > 1 ? $avg : 2;
display_info "Set sample cpu average $C{cpuaverage}";
}
+ elsif ( $key_sym == 100 ) {
- elsif ( $key_name eq 'd' ) {
+ # d pressed
++$C{netaverage};
display_info "Set sample net average $C{netaverage}";
}
- elsif ( $key_name eq 'c' ) {
+ elsif ( $key_sym == 99 ) {
+
+ # c pressed
my $avg = $C{netaverage};
--$avg;
$C{netaverage} = $avg > 1 ? $avg : 2;
display_info "Set sample net average $C{netaverage}";
}
- elsif ( $key_name eq 'f' ) {
+ elsif ( $key_sym == 102 ) {
+
+ # f pressed
$net_max_bytes *= 10;
display_info "Set net interface speed reference to "
. ( $net_max_bytes / $I{bytes_mbit} )
. 'mbit/s';
}
- elsif ( $key_name eq 'v' ) {
+ elsif ( $key_sym == 118 ) {
+
+ # v pressed
$net_max_bytes = int( $net_max_bytes / 10 );
$net_max_bytes = $I{bytes_mbit}
if $net_max_bytes < $I{bytes_mbit};
@@ -605,23 +605,31 @@ sub loop ($@) {
. 'mbit/s';
}
- elsif ( $key_name eq 'left' ) {
+ elsif ( $key_sym == 276 ) {
+
+ # left pressed
$newsize{width} = $C{width} - 100;
$newsize{height} = $C{height};
$resize_window = 1;
}
- elsif ( $key_name eq 'right' ) {
+ elsif ( $key_sym == 275 ) {
+
+ # right pressed
$newsize{width} = $C{width} + 100;
$newsize{height} = $C{height};
$resize_window = 1;
}
- elsif ( $key_name eq 'up' ) {
+ elsif ( $key_sym == 273 ) {
+
+ # up pressed
$newsize{width} = $C{width};
$newsize{height} = $C{height} - 100;
$resize_window = 1;
}
- elsif ( $key_name eq 'down' ) {
+ elsif ( $key_sym == 274 ) {
+
+ # down pressed
$newsize{width} = $C{width};
$newsize{height} = $C{height} + 100;
$resize_window = 1;
@@ -689,69 +697,69 @@ sub loop ($@) {
my $rect_peak;
$y = $C{height} - $heights{system};
- $rect_system->width($width);
- $rect_system->height( $heights{system} );
+ $rect_system->w($width);
+ $rect_system->h( $heights{system} );
$rect_system->x($x);
$rect_system->y($y);
$y -= $heights{user};
- $rect_user->width($width);
- $rect_user->height( $heights{user} );
+ $rect_user->w($width);
+ $rect_user->h( $heights{user} );
$rect_user->x($x);
$rect_user->y($y);
$y -= $heights{nice};
- $rect_nice->width($width);
- $rect_nice->height( $heights{nice} );
+ $rect_nice->w($width);
+ $rect_nice->h( $heights{nice} );
$rect_nice->x($x);
$rect_nice->y($y);
$y -= $heights{idle};
- $rect_idle->width($width);
- $rect_idle->height( $heights{idle} );
+ $rect_idle->w($width);
+ $rect_idle->h( $heights{idle} );
$rect_idle->x($x);
$rect_idle->y($y);
$y -= $heights{iowait};
- $rect_iowait->width($width);
- $rect_iowait->height( $heights{iowait} );
+ $rect_iowait->w($width);
+ $rect_iowait->h( $heights{iowait} );
$rect_iowait->x($x);
$rect_iowait->y($y);
$y -= $heights{irq};
- $rect_irq->width($width);
- $rect_irq->height( $heights{irq} );
+ $rect_irq->w($width);
+ $rect_irq->h( $heights{irq} );
$rect_irq->x($x);
$rect_irq->y($y);
$y -= $heights{softirq};
- $rect_softirq->width($width);
- $rect_softirq->height( $heights{softirq} );
+ $rect_softirq->w($width);
+ $rect_softirq->h( $heights{softirq} );
$rect_softirq->x($x);
$rect_softirq->y($y);
$y -= $heights{guest};
- $rect_guest->width($width);
- $rect_guest->height( $heights{guest} );
+ $rect_guest->w($width);
+ $rect_guest->h( $heights{guest} );
$rect_guest->x($x);
$rect_guest->y($y);
$y -= $heights{steal};
- $rect_steal->width($width);
- $rect_steal->height( $heights{steal} );
+ $rect_steal->w($width);
+ $rect_steal->h( $heights{steal} );
$rect_steal->x($x);
$rect_steal->y($y);
my $all = 100 - $cpu_loads_r->{idle};
my $max_all = 0;
- $app->fill( $rect_idle, Loadbars::Constants->BLACK );
- $app->fill( $rect_steal, Loadbars::Constants->RED );
- $app->fill( $rect_guest, Loadbars::Constants->RED );
- $app->fill( $rect_irq, Loadbars::Constants->WHITE );
- $app->fill( $rect_softirq, Loadbars::Constants->WHITE );
- $app->fill( $rect_nice, Loadbars::Constants->GREEN );
- $app->fill( $rect_iowait, Loadbars::Constants->PURPLE );
+ sdl_fill_rect( $app, $rect_idle, Loadbars::Constants->BLACK );
+ sdl_fill_rect( $app, $rect_steal, Loadbars::Constants->RED );
+ sdl_fill_rect( $app, $rect_guest, Loadbars::Constants->RED );
+ sdl_fill_rect( $app, $rect_irq, Loadbars::Constants->WHITE );
+ sdl_fill_rect( $app, $rect_softirq, Loadbars::Constants->WHITE );
+ sdl_fill_rect( $app, $rect_nice, Loadbars::Constants->GREEN );
+ sdl_fill_rect( $app, $rect_iowait, Loadbars::Constants->PURPLE );
my $rect_memused = sdl_get_rect $rects, "$host;memused";
my $rect_memfree = sdl_get_rect $rects, "$host;memfree";
@@ -793,53 +801,38 @@ sub loop ($@) {
);
$y = $C{height} - $heights{MemUsed};
- $rect_memused->width($half_width);
- $rect_memused->height( $heights{MemUsed} );
+ $rect_memused->w($half_width);
+ $rect_memused->h( $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->w($half_width);
+ $rect_memfree->h( $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->w($half_width);
+ $rect_swapused->h( $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->w($half_width);
+ $rect_swapfree->h( $heights{SwapFree} );
$rect_swapfree->x( $x + $add_x + $half_width );
$rect_swapfree->y($y);
- $app->fill( $rect_memused, Loadbars::Constants->DARK_GREY );
- $app->fill( $rect_memfree, Loadbars::Constants->BLACK );
-
- $app->fill( $rect_swapused, Loadbars::Constants->GREY );
- $app->fill( $rect_swapfree, Loadbars::Constants->BLACK );
+ sdl_fill_rect( $app, $rect_memused,
+ Loadbars::Constants->DARK_GREY );
+ sdl_fill_rect( $app, $rect_memfree,
+ Loadbars::Constants->BLACK );
- if ( $C{showtext} ) {
- my $y_ = 5;
- $app->print( $x + $add_x, $y_, 'Ram:' );
- $app->print(
- $x + $add_x,
- $y_ += $sdl_font_height,
- sprintf '%02d',
- ( 100 - $meminfo{ram_per} )
- );
- $app->print( $x + $add_x,
- $y_ += $sdl_font_height, 'Swp:' );
- $app->print(
- $x + $add_x,
- $y_ += $sdl_font_height,
- sprintf '%02d',
- ( 100 - $meminfo{swap_per} )
- );
- }
+ sdl_fill_rect( $app, $rect_swapused,
+ Loadbars::Constants->GREY );
+ sdl_fill_rect( $app, $rect_swapfree,
+ Loadbars::Constants->BLACK );
}
if ( $C{shownet} && exists $NETSTATS_HAS{$host} ) {
@@ -909,82 +902,59 @@ sub loop ($@) {
);
$y = $C{height} - $heights{NetFree};
- $rect_netused->width($half_width);
- $rect_netused->height( $heights{NetFree} );
+ $rect_netused->w($half_width);
+ $rect_netused->h( $heights{NetFree} );
$rect_netused->x( $x + $add_x );
$rect_netused->y($y);
$y -= $heights{NetUsed};
- $rect_netfree->width($half_width);
- $rect_netfree->height( $heights{NetUsed} );
+ $rect_netfree->w($half_width);
+ $rect_netfree->h( $heights{NetUsed} );
$rect_netfree->x( $x + $add_x );
$rect_netfree->y($y);
$y = $C{height} - $heights{TNetFree};
- $rect_tnetused->width($half_width);
- $rect_tnetused->height( $heights{TNetFree} );
+ $rect_tnetused->w($half_width);
+ $rect_tnetused->h( $heights{TNetFree} );
$rect_tnetused->x( $x + $add_x + $half_width );
$rect_tnetused->y($y);
$y -= $heights{TNetUsed};
- $rect_tnetfree->width($half_width);
- $rect_tnetfree->height( $heights{TNetUsed} );
+ $rect_tnetfree->w($half_width);
+ $rect_tnetfree->h( $heights{TNetUsed} );
$rect_tnetfree->x( $x + $add_x + $half_width );
$rect_tnetfree->y($y);
- $app->fill( $rect_netused, Loadbars::Constants->BLACK );
- $app->fill( $rect_netfree,
+ sdl_fill_rect( $app, $rect_netused,
+ Loadbars::Constants->BLACK );
+ sdl_fill_rect( $app, $rect_netfree,
$net_per > 100
? Loadbars::Constants->GREEN
: Loadbars::Constants->LIGHT_GREEN );
- $app->fill( $rect_tnetused,
+ sdl_fill_rect( $app, $rect_tnetused,
$tnet_per > 100
? Loadbars::Constants->GREEN
: Loadbars::Constants->LIGHT_GREEN );
- $app->fill( $rect_tnetfree,
+ sdl_fill_rect( $app, $rect_tnetfree,
Loadbars::Constants->BLACK );
- if ( $C{showtext} ) {
- my $y_ = 5;
- $app->print( $x + $add_x, $y_, $net_int );
- $app->print( $x + $add_x,
- $y_ += $sdl_font_height, 'Rxb:' );
- $app->print(
- $x + $add_x,
- $y_ += $sdl_font_height,
- sprintf '%02d',
- ($net_per)
- );
- $app->print( $x + $add_x,
- $y_ += $sdl_font_height, 'Trb:' );
- $app->print(
- $x + $add_x,
- $y_ += $sdl_font_height,
- sprintf '%02d',
- ($tnet_per)
- );
- }
-
# No netstats available for this host;device pair.
}
else {
- $rect_netused->width($width);
- $rect_netused->height( $C{height} );
+ $rect_netused->w($width);
+ $rect_netused->h( $C{height} );
$rect_netused->x( $x + $add_x );
$rect_netused->y($y);
- $app->fill( $rect_netused, Loadbars::Constants->RED );
- $app->fill( $rect_tnetused, Loadbars::Constants->RED );
- $app->fill( $rect_netfree, Loadbars::Constants->RED );
- $app->fill( $rect_tnetfree, Loadbars::Constants->RED );
-
- if ( $C{showtext} ) {
- my $y_ = 5;
- $app->print( $x + $add_x, $y_, $net_int );
- $app->print( $x + $add_x,
- $y_ += $sdl_font_height, 'n/a' );
- }
+ sdl_fill_rect( $app, $rect_netused,
+ Loadbars::Constants->RED );
+ sdl_fill_rect( $app, $rect_tnetused,
+ Loadbars::Constants->RED );
+ sdl_fill_rect( $app, $rect_netfree,
+ Loadbars::Constants->RED );
+ sdl_fill_rect( $app, $rect_tnetfree,
+ Loadbars::Constants->RED );
}
}
@@ -992,11 +962,12 @@ sub loop ($@) {
if ( $C{showcores} ) {
$current_corenum = 0;
$rect_separator = sdl_get_rect $rects, "$key;separator";
- $rect_separator->width(1);
- $rect_separator->height( $C{height} );
+ $rect_separator->w(1);
+ $rect_separator->h( $C{height} );
$rect_separator->x( $x - 1 );
$rect_separator->y(0);
- $app->fill( $rect_separator, Loadbars::Constants->GREY );
+ sdl_fill_rect( $app, $rect_separator,
+ Loadbars::Constants->GREY );
}
}
@@ -1011,12 +982,13 @@ sub loop ($@) {
my $maxheight = $max_val * ( $C{height} / 100 );
$rect_peak = sdl_get_rect $rects, "$key;max";
- $rect_peak->width($width);
- $rect_peak->height(1);
+ $rect_peak->w($width);
+ $rect_peak->h(1);
$rect_peak->x($x);
$rect_peak->y( $C{height} - $maxheight );
- $app->fill(
+ sdl_fill_rect(
+ $app,
$rect_peak,
$max_val > Loadbars::Constants->USER_ORANGE
? Loadbars::Constants->ORANGE
@@ -1028,7 +1000,8 @@ sub loop ($@) {
);
}
- $app->fill(
+ sdl_fill_rect(
+ $app,
$rect_user,
$all > Loadbars::Constants->USER_ORANGE
? Loadbars::Constants->ORANGE
@@ -1038,7 +1011,7 @@ sub loop ($@) {
: ( Loadbars::Constants->YELLOW )
)
);
- $app->fill( $rect_system,
+ sdl_fill_rect( $app, $rect_system,
$cpu_loads_r->{system} > Loadbars::Constants->SYSTEM_BLUE0
? Loadbars::Constants->BLUE0
: Loadbars::Constants->BLUE );
@@ -1054,140 +1027,8 @@ sub loop ($@) {
}
};
- if ( $C{showtext} ) {
- 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 );
- }
-
- if ( $C{extended} ) {
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{steal}, 'st'
- );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{guest}, 'gt'
- );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{softirq}, 'sr'
- );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{irq}, 'ir'
- );
- }
-
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{iowait}, 'io'
- );
-
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{idle}, 'id'
- ) if $C{extended};
-
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{nice}, 'ni'
- );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{user}, 'us'
- );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $cpu_loads_r->{system}, 'sy'
- );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $all, 'to'
- );
-
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf '%02d%s',
- norm $max_all, 'pk'
- ) if $C{extended};
-
- if ($is_host_summary) {
- if ( defined $loadavg[2] ) {
- $app->print( $x, $y += $sdl_font_height, 'Avg:' );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf "%.2f",
- $loadavg[0]
- );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf "%.2f",
- $loadavg[1]
- );
- $app->print(
- $x,
- $y += $sdl_font_height,
- sprintf "%.2f",
- $loadavg[2]
- );
- }
- }
- }
-
- $app->update(
- $rect_idle, $rect_iowait, $rect_irq,
- $rect_nice, $rect_softirq, $rect_steal,
- $rect_guest, $rect_system, $rect_user,
- );
-
- $app->update(
- $rect_memfree, $rect_memused,
- $rect_swapused, $rect_swapfree
- ) if $C{showmem};
-
- $app->update(
- $rect_netfree, $rect_netused,
- $rect_tnetfree, $rect_tnetused
- ) if $C{shownet};
-
- $app->update($rect_separator) if defined $rect_separator;
-
+ $app->sync();
$x += $width + 1 + $add_x;
-
}
TIMEKEEPER:
@@ -1195,7 +1036,7 @@ sub loop ($@) {
my $t_diff = $t2 - $t1;
if ( Loadbars::Constants->INTERVAL_SDL > $t_diff ) {
- usleep 10000;
+ SDL::delay(10);
# Goto is OK as long you don't produce spaghetti code
goto TIMEKEEPER;
@@ -1238,8 +1079,6 @@ sub loop ($@) {
%CPUSTATS = ();
}
- auto_off_text $width;
-
} until $quit;
say "Good bye";
diff --git a/lib/Loadbars/Shared.pm b/lib/Loadbars/Shared.pm
index 2079461..79c2229 100644
--- a/lib/Loadbars/Shared.pm
+++ b/lib/Loadbars/Shared.pm
@@ -53,14 +53,11 @@ our %I : shared;
showcores => 0,
showmem => 0,
shownet => 0,
- showtext => 1,
- showtexthost => 0,
sshopts => '',
);
%I = (
cpustring => 'cpu',
- showtextoff => 0,
bytes_mbit => 125000,
bytes_10mbit => 1250000,
bytes_100mbit => 12500000,
diff --git a/loadbars b/loadbars
index f71950d..2a3aaeb 100755
--- a/loadbars
+++ b/loadbars
@@ -1,11 +1,13 @@
#!/usr/bin/perl
-# loadbars (c) 2010 - 2012, Dipl.-Inform. (FH) Paul Buetow
+# loadbars (c) 2010 - 2013, Dipl.-Inform. (FH) Paul Buetow
# E-Mail: loadbars@mx.buetow.org WWW: http://loadbars.buetow.org
# For legal informations see COPYING and COPYING.FONT
use strict;
use warnings;
+use v5.14;
+use autodie;
use Getopt::Long;
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-17 11:41:39 +0000