diff options
| -rw-r--r-- | CHANGELOG | 20 | ||||
| -rw-r--r-- | COPYING | 311 | ||||
| -rw-r--r-- | COPYING.FONT | 9 | ||||
| -rw-r--r-- | README | 20 | ||||
| -rw-r--r-- | WISHLIST | 3 | ||||
| -rwxr-xr-x | loadbars.pl | 292 |
6 files changed, 491 insertions, 164 deletions
@@ -1,6 +1,26 @@ +Sat Nov 19 11:54:51 CET 2011 +* Released v0.2.2 +* Added a 1px horizontal line to each bar which represent the max. peak + of user and system cpu load of the last N samples (max. of the last 15 + samples by default, it can be configured using --average) +* Default value for --average has been decreased from 30 to 15 sample + values + +Fr 12. Aug 21:41:46 CEST 2011 +* Released v0.2.1 + Di 9. Aug 20:42:43 CEST 2011 * Released v0.2.0.2 (Bugfixes only; Bar width was wrong by 1px) +So 7. Aug 15:53:08 CEST 2011 +* Added grey separator lines between each hosts during CPU toggle mode +* More intelligent CPU core numbering during CPU toggle mode +* FreeBSD server support for CPU graphs has been tested and is working using + linprocfs mounted on /compat/linux/proc. +* Changed licence to GPL 2 +* Some more documentation +* Some minor bugfixes + So 7. Aug 14:06:45 CEST 2011 * Released v0.2.0.1 (Bugfixes only) @@ -1,31 +1,280 @@ -# loadbars (c) 2010, 2011 Dipl.-Inform. (FH) Paul Buetow -# -# E-Mail: loadbars@mx.buetow.org WWW: http://loadbars.buetow.org -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of buetow.org nor the names of its contributors may -# be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED Paul Buetow ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT Paul C. Buetow BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -The font.png has its own license (see COPYING.FONT). It has been taken -from the freedroid project (www.freedroid.org). +GNU GENERAL PUBLIC LICENSE Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + diff --git a/COPYING.FONT b/COPYING.FONT index 84c2682..d4b4b89 100644 --- a/COPYING.FONT +++ b/COPYING.FONT @@ -1,8 +1,7 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -225,7 +224,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,4 +277,4 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + @@ -2,12 +2,26 @@ For general program informations see http://loadbars.buetow.org For legal informations see COPYING and COPYING.FONT -For any program help check out --help or 'h' and 'H' commands +For any program help check out --help on command line or 'h' during program +execution. For a list of features which might be added in the future see WHISHLIST For a changelog see CHANGELOG +For a list of all known bugs see BUGS + +Supported platforms are: Linux and FreeBSD (the latter with linprocfs mounted) + +Versioning schema: a.b.c[.d], where + d = Optional, bugfixes only release + c = Minor release (new features or minor code refactoring) + b = Major release (new features or major code refactoring) + a = Don't know yet. Maybe will stay forever 0. + + It's not a release if there is a -devel suffix. It's a development + version (in the trunk) then. + Explanation colors: Blue: System cpu usage Purple: System usage if it's >30% @@ -22,6 +36,8 @@ Explanation text display: us = User cpu usage in % sy = System cpu sage in % su = System & user cpu usage in % - avg = System load average (desc. order: 1, 5 and 15 min. avg.) + avg = System load average (desc. order: 1, 5 and 15 min. avg.) + + @@ -2,3 +2,6 @@ * Dynamic/online resizing of the window * Rudimentary support for /etc/clusters, the Cluster-SSH configuration file * Adding and removing hosts online +* Toggle cpu core vs. hostname vs. nothing option +* .deb for Debian and Ubuntu +* Allow sshusername@hostname in --hosts diff --git a/loadbars.pl b/loadbars.pl index 92caeb1..9136911 100755 --- a/loadbars.pl +++ b/loadbars.pl @@ -1,33 +1,10 @@ #!/usr/bin/perl -# loadbars (c) 2010-2011, Dipl.-Inform. (FH) Paul Buetow -# -# E-Mail: loadbars@mx.buetow.org WWW: http://loadbars.buetow.org -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of buetow.org nor the names of its contributors may -# be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED Paul Buetow ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT Paul Buetow BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. +# loadbars (c) 2010 - 2011, Dipl.-Inform. (FH) Paul Buetow +# E-Mail: loadbars@mx.buetow.org WWW: http://loadbars.buetow.org +# For legal informations see COPYING and COPYING.FONT + +package Loadbars; use strict; use warnings; @@ -49,8 +26,8 @@ use threads::shared; use constant { DEPTH => 8, - VERSION => 'loadbars v0.2.0.2', - COPYRIGHT => '2010-2011 (c) Paul Buetow <loadbars@mx.buetow.org>', + VERSION => 'loadbars v0.2.2', + Copyright => '2010-2011 (c) Paul Buetow <loadbars@mx.buetow.org>', BLACK => SDL::Color->new(-r => 0x00, -g => 0x00, -b => 0x00), BLUE => SDL::Color->new(-r => 0x00, -g => 0x00, -b => 0xff), GREEN => SDL::Color->new(-r => 0x00, -g => 0x90, -b => 0x00), @@ -58,6 +35,7 @@ use constant { 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), + GREY => SDL::Color->new(-r => 0xaa, -g => 0xaa, -b => 0xaa), YELLOW0 => SDL::Color->new(-r => 0xff, -g => 0xa0, -b => 0x00), YELLOW => SDL::Color->new(-r => 0xff, -g => 0xc0, -b => 0x00), SYSTEM_PURPLE => 30, @@ -73,12 +51,14 @@ $| = 1; my %AVGSTATS : shared; my %CPUSTATS : shared; -my %CONF : shared; + +# Global configuration hash +my %C : shared; # Setting defaults -%CONF = ( - title => VERSION . ' (press h for help)', - average => 30, +%C = ( + title => Loadbars::VERSION . ' (press h for help)', + average => 15, togglecpu => 1, cpuregexp => 'cpu', factor => 1, @@ -87,17 +67,17 @@ my %CONF : shared; inter => 0.1, samples => 1000, sshopts => '', - width => 1200, - height => 200, + width => 1250, + height => 150, ); # Quick n dirty helpers sub say (@) { print "$_\n" for @_; return undef } sub newline () { say ''; return undef } -sub debugsay (@) { say "DEBUG: $_" for @_; return undef } +sub debugsay (@) { say "Loadbars::DEBUG: $_" for @_; return undef } sub sum (@) { my $sum = 0; $sum += $_ for @_; return $sum } sub null ($) { my $arg = shift; return defined $arg ? $arg : 0 } -sub set_togglecpu_regexp () { $CONF{cpuregexp} = $CONF{togglecpu} ? 'cpu ' : 'cpu' } +sub set_togglecpu_regexp () { $C{cpuregexp} = $C{togglecpu} ? 'cpu ' : 'cpu' } sub parse_cpu_line ($) { my ($name, %load); @@ -111,7 +91,7 @@ sub parse_cpu_line ($) { sub thread_get_stats ($) { my $host = shift; - my $sigusr1 = 0; + my ($sigusr1, $quit) = (0, 0); my $loadavgexp = qr/(\d+\.\d{2}) (\d+\.\d{2}) (\d+\.\d{2})/; for (;;) { @@ -119,18 +99,23 @@ sub thread_get_stats ($) { if [ -e /proc/stat ]; then loadavg=/proc/loadavg stat=/proc/stat + + for i in \$(seq $C{samples}); do + cat \$loadavg \$stat + sleep $C{inter} + done else loadavg=/compat/linux/proc/loadavg stat=/compat/linux/proc/stat + + for i in \$(jot $C{samples}); do + cat \$loadavg \$stat + sleep $C{inter} + done fi - - for i in \$(seq $CONF{samples}); do - cat \$loadavg \$stat - sleep $CONF{inter} - done BASH my $cmd = $host eq 'localhost' ? $bash - : "ssh -o StrictHostKeyChecking=no $CONF{sshopts} $host '$bash'"; + : "ssh -o StrictHostKeyChecking=no $C{sshopts} $host '$bash'"; my $pid = open my $pipe, "$cmd |" or do { say "Warning: $!"; @@ -140,7 +125,9 @@ BASH # Toggle CPUs $SIG{USR1} = sub { $sigusr1 = 1 }; - my $cpuregexp = qr/$CONF{cpuregexp}/; + my $cpuregexp = qr/$C{cpuregexp}/; + + # $SIG{STOP} = sub { debugsay kill 9, $pid; $quit = 1 }; while (<$pipe>) { if (/^$loadavgexp/) { @@ -149,11 +136,12 @@ BASH } elsif (/$cpuregexp/) { my ($name, $load) = parse_cpu_line $_; $CPUSTATS{"$host;$name"} = join ';', - map { $_ . '=' . $load->{$_} } keys %$load; + map { $_ . '=' . $load->{$_} } + grep { defined $load->{$_} } keys %$load; } if ($sigusr1) { - $cpuregexp = qr/$CONF{cpuregexp}/; + $cpuregexp = qr/$C{cpuregexp}/; $sigusr1 = 0; } } @@ -181,32 +169,48 @@ sub normalize_loads (%) { sub get_cpuaverage ($@) { my ($factor, @loads) = @_; - my %cpuaverage; + my (%cpumax, %cpuaverage); for my $l (@loads) { - $cpuaverage{$_} += $l->{$_} for keys %$l; + for (keys %$l) { + $cpuaverage{$_} += $l->{$_}; + + $cpumax{$_} = $l->{$_} + if not exists $cpumax{$_} or $cpumax{$_} < $l->{$_}; + } } my $div = @loads / $factor; - $cpuaverage{$_} /= $div for keys %cpuaverage; - return %cpuaverage; + for (keys %cpuaverage) { + $cpuaverage{$_} /= $div; + $cpumax{$_} /= $factor; + } + + return (\%cpumax, \%cpuaverage); } sub draw_background ($$) { my ($app, $rects) = @_; my $rect = get_rect $rects, 'background'; - $rect->width($CONF{width}); - $rect->height($CONF{height}); - $app->fill($rect, 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', $_) } @_; + return map { + $_->detach(); + $_; + + } map { + threads->create('thread_get_stats', $_); + + } @_; } sub main_loop ($@) { @@ -216,11 +220,11 @@ sub main_loop ($@) { my $statusbar_height = 0; my $app = SDL::App->new( - -title => $CONF{title}, - -icon_title => $CONF{title}, - -width => $CONF{width}, - -height => $CONF{height}+$statusbar_height, - -depth => DEPTH, + -title => $C{title}, + -icon_title => $C{title}, + -width => $C{width}, + -height => $C{height}+$statusbar_height, + -depth => Loadbars::DEPTH, -resizeable => 0, ); @@ -241,8 +245,6 @@ sub main_loop ($@) { my $infotxt : shared = ''; my $quit : shared = 0; - $SIG{STOP} = sub { $quit = 1 }; - my ($t1, $t2) = (Time::HiRes::time(), undef); my $event = SDL::Event->new(); @@ -255,11 +257,11 @@ sub main_loop ($@) { my $type = $event->type(); my $key_name = $event->key_name(); - debugsay "Event type=$type key_name=$key_name" if DEBUG; + debugsay "Event type=$type key_name=$key_name" if Loadbars::DEBUG; next if $type != 2; if ($key_name eq '1') { - $CONF{togglecpu} = !$CONF{togglecpu}; + $C{togglecpu} = !$C{togglecpu}; set_togglecpu_regexp; $_->kill('USR1') for @threads; %AVGSTATS = (); @@ -272,11 +274,11 @@ sub main_loop ($@) { $displayinfo = 'Hotkeys help printed on terminal stdout'; } elsif ($key_name eq 't') { - $CONF{displaytxt} = !$CONF{displaytxt}; + $C{displaytxt} = !$C{displaytxt}; $displayinfo = 'Toggled text display'; } elsif ($key_name eq 'u') { - $CONF{displaytxthost} = !$CONF{displaytxthost}; + $C{displaytxthost} = !$C{displaytxthost}; $displayinfo = 'Toggled number/hostname display'; } elsif ($key_name eq 'q') { @@ -285,29 +287,29 @@ sub main_loop ($@) { # Increase and decrease pairs } elsif ($key_name eq 'a') { - ++$CONF{average}; - $displayinfo = "Set sample average to $CONF{average}"; + ++$C{average}; + $displayinfo = "Set sample average to $C{average}"; } elsif ($key_name eq 'y' or $key_name eq 'z') { - my $avg = $CONF{average}; + my $avg = $C{average}; --$avg; - $CONF{average} = $avg > 1 ? $avg : 2; - $displayinfo = "Set sample average to $CONF{average}"; + $C{average} = $avg > 1 ? $avg : 2; + $displayinfo = "Set sample average to $C{average}"; } elsif ($key_name eq 's') { - $CONF{factor} += 0.1; - $displayinfo = "Set scale factor to $CONF{factor}"; + $C{factor} += 0.1; + $displayinfo = "Set scale factor to $C{factor}"; } elsif ($key_name eq 'x' or $key_name eq 'z') { - $CONF{factor} -= 0.1; - $displayinfo = "Set scale factor to $CONF{factor}"; + $C{factor} -= 0.1; + $displayinfo = "Set scale factor to $C{factor}"; } elsif ($key_name eq 'd') { - $CONF{inter} += 0.1; - $displayinfo = "Set graph update interval to $CONF{inter}"; + $C{inter} += 0.1; + $displayinfo = "Set graph update interval to $C{inter}"; } elsif ($key_name eq 'c' or $key_name eq 'z') { - my $int = $CONF{inter}; + my $int = $C{inter}; $int -= 0.1; - $CONF{inter} = $int > 0 ? $int : 0.1; - $displayinfo = "Set graph update interval to $CONF{inter}"; + $C{inter} = $int > 0 ? $int : 0.1; + $displayinfo = "Set graph update interval to $C{inter}"; } } }; @@ -327,11 +329,14 @@ sub main_loop ($@) { } # Avoid division by null - my $width = $CONF{width} / ($num_stats ? $num_stats : 1) - 1; + # Also substract 1 (each bar is followed by an 1px separator bar) + my $width = $C{width} / ($num_stats ? $num_stats : 1) - 1; + + my ($current_barnum, $current_corenum) = (-1, -1); - my $barnum = -1; for my $key (sort keys %CPUSTATS) { - ++$barnum; + ++$current_barnum; + ++$current_corenum; my ($host, $name) = split ';', $key; next unless defined $CPUSTATS{$key}; @@ -356,21 +361,40 @@ sub main_loop ($@) { %loads = normalize_loads %loads; push @{$last_loads{$key}}, \%loads; - shift @{$last_loads{$key}} while @{$last_loads{$key}} >= $CONF{average}; + shift @{$last_loads{$key}} while @{$last_loads{$key}} >= $C{average}; - my %cpuaverage = get_cpuaverage $CONF{factor}, @{$last_loads{$key}}; + my ($cpumax, $cpuaverage) = get_cpuaverage $C{factor}, @{$last_loads{$key}}; my %heights = map { - $_ => defined $cpuaverage{$_} ? $cpuaverage{$_} * ($CONF{height}/100) : 1 + $_ => defined $cpuaverage->{$_} ? $cpuaverage->{$_} * ($C{height}/100) : 1 + + } keys %$cpuaverage; - } keys %cpuaverage; + my %maxheights = map { + $_ => defined $cpumax->{$_} ? $cpumax->{$_} * ($C{height}/100) : 1 + + } keys %$cpumax; + + my $is_host_summary = exists $is_host_summary{$host}; + my $rect_separator = undef; my $rect_user = get_rect $rects, "$key;user"; my $rect_system = get_rect $rects, "$key;system"; my $rect_iowait = get_rect $rects, "$key;iowait"; my $rect_nice = get_rect $rects, "$key;nice"; + my $rect_max = get_rect $rects, "$key;max"; + + unless ($is_host_summary || $C{togglecpu}) { + $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); + } - $y = $CONF{height} - $heights{system}; + $y = $C{height} - $heights{system}; $rect_system->width($width); $rect_system->height($heights{system}); $rect_system->x($x); @@ -393,44 +417,58 @@ sub main_loop ($@) { $rect_iowait->height($heights{iowait}); $rect_iowait->x($x); $rect_iowait->y($y); + + $rect_max->width($width); + $rect_max->height(1); + $rect_max->x($x); + $rect_max->y($C{height} - $maxheights{system} - $maxheights{user}); + + my $system_n_user = sum @{$cpuaverage}{qw(user system)}; + my $max_system_n_user = sum @{$cpumax}{qw(user system)}; - my $system_n_user = sum @cpuaverage{qw(user system)}; - - $app->fill($rect_iowait, BLACK); - $app->fill($rect_nice, GREEN); - $app->fill($rect_system, BLUE); - $app->fill($rect_system, $cpuaverage{system} > SYSTEM_PURPLE - ? PURPLE - : BLUE); - $app->fill($rect_user, $system_n_user > USER_WHITE ? WHITE - : ($system_n_user > USER_RED ? RED - : ($system_n_user > USER_ORANGE ? ORANGE - : ($system_n_user > USER_YELLOW0 ? YELLOW0 - : (YELLOW))))); + $app->fill($rect_iowait, Loadbars::BLACK); + $app->fill($rect_nice, Loadbars::GREEN); + $app->fill($rect_max, $max_system_n_user > Loadbars::USER_WHITE ? Loadbars::WHITE + : ($max_system_n_user > Loadbars::USER_RED ? Loadbars::RED + : ($max_system_n_user > Loadbars::USER_ORANGE ? Loadbars::ORANGE + : ($max_system_n_user > Loadbars::USER_YELLOW0 ? Loadbars::YELLOW0 + : (Loadbars::YELLOW))))); + $app->fill($rect_user, $system_n_user > Loadbars::USER_WHITE ? Loadbars::WHITE + : ($system_n_user > Loadbars::USER_RED ? Loadbars::RED + : ($system_n_user > Loadbars::USER_ORANGE ? Loadbars::ORANGE + : ($system_n_user > Loadbars::USER_YELLOW0 ? Loadbars::YELLOW0 + : (Loadbars::YELLOW))))); + $app->fill($rect_system, $cpuaverage->{system} > Loadbars::SYSTEM_PURPLE + ? Loadbars::PURPLE + : Loadbars::BLUE); + $app->fill($rect_user, $system_n_user > Loadbars::USER_WHITE ? Loadbars::WHITE + : ($system_n_user > Loadbars::USER_RED ? Loadbars::RED + : ($system_n_user > Loadbars::USER_ORANGE ? Loadbars::ORANGE + : ($system_n_user > Loadbars::USER_YELLOW0 ? Loadbars::YELLOW0 + : (Loadbars::YELLOW))))); - my ($y, $space) = (5, $font_height); - if ($CONF{displaytxt}) { - my $is_host_summary = exists $is_host_summary{$host}; + my @loadavg = split ';', $AVGSTATS{$host}; + $is_host_summary{$host} = 1 if defined $loadavg[0]; - if ($CONF{displaytxthost} && not $is_host_summary) { + if ($C{displaytxt}) { + if ($C{displaytxthost} && not $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:', $barnum); + $app->print($x, $y, sprintf '%i:', + $C{togglecpu} ? $current_barnum + 1: $current_corenum); } - $app->print($x, $y+=$space, sprintf '%d%s', $cpuaverage{nice}, 'ni'); - $app->print($x, $y+=$space, sprintf '%d%s', $cpuaverage{user}, 'us'); - $app->print($x, $y+=$space, sprintf '%d%s', $cpuaverage{system}, 'sy'); + $app->print($x, $y+=$space, sprintf '%d%s', $cpuaverage->{nice}, 'ni'); + $app->print($x, $y+=$space, sprintf '%d%s', $cpuaverage->{user}, 'us'); + $app->print($x, $y+=$space, sprintf '%d%s', $cpuaverage->{system}, 'sy'); $app->print($x, $y+=$space, sprintf '%d%s', $system_n_user, 'su'); unless ($is_host_summary) { - my @loadavg = split ';', $AVGSTATS{$host}; - if (defined $loadavg[0]) { $app->print($x, $y+=$space, 'avg:'); $app->print($x, $y+=$space, sprintf "%.2f", $loadavg[0]); @@ -438,15 +476,15 @@ sub main_loop ($@) { $app->print($x, $y+=$space, sprintf "%.2f", $loadavg[2]); } - $is_host_summary{$host} = 1; } } # Display an informational text message if any $app->print(0, $y+=$space, $displayinfo) if length $displayinfo; - - $app->update($_) for $rect_nice, $rect_iowait, $rect_system, $rect_user; + $app->update($rect_nice, $rect_iowait, $rect_system, $rect_user); + $app->update($rect_separator) if defined $rect_separator; + $x += $width + 1; } @@ -465,7 +503,7 @@ TIMEKEEPER: } } - if ($CONF{inter} > $t2 - $t1) { + if ($C{inter} > $t2 - $t1) { usleep 10000; # Goto is OK if you don't produce spaghetti code with it goto TIMEKEEPER; @@ -481,6 +519,7 @@ TIMEKEEPER: } until $quit; say "Good bye"; + # $_->kill('STOP') for @threads; $event_thread->join(); exit 0; } @@ -498,6 +537,7 @@ Explanation colors: Orange: User usage if system & user cpu is >70% White: Usage usage if system & user cpu is >99% Green: Nice cpu usage + 1px horizontal line: Maximum sy+us cpu of last 'avg' samples Explanation text display: ni = Nice cpu usage in % us = User cpu usage in % @@ -515,7 +555,7 @@ END togglecpu => { menupos => 1, help => 'Toggle CPUs (0 or 1)', mode => 7, type => 'i' }, togglecpu_hot => { menupos => 2, cmd => '1', help => 'Toggle CPUs', mode => 1 }, - average => { menupos => 3, help => 'Set number of samples for calculating avg.', mode => 6, type => 'i' }, + average => { menupos => 3, help => 'Num of samples for avg. (more fluent animations)', mode => 6, type => 'i' }, average_hot_up => { menupos => 4, cmd => 'a', help => 'Increases number of samples for calculating avg. by 1', mode => 1 }, average_hot_dn => { menupos => 5, cmd => 'y', help => 'Decreases number of samples for calculating avg. by 1', mode => 1 }, @@ -539,7 +579,7 @@ END samples => { menupos => 17, help => 'Set number of samples until ssh reconnects', mode => 6, type => 'i' }, sshopts => { menupos => 18, help => 'Set SSH options', mode => 6, type => 's' }, - title => { menupos => 19, help => 'Set the window title', var => \$CONF{title}, mode => 6, type => 's' }, + title => { menupos => 19, help => 'Set the window title', var => \$C{title}, mode => 6, type => 's' }, toggletxthost => { menupos => 20, help => 'Toggle hostname/num text display (0 or 1)', mode => 7, type => 'i' }, toggletxthost_hot => { menupos => 21, cmd => 'u', help => 'Toggle hostname/num text display', mode => 1 }, @@ -579,17 +619,16 @@ END } } elsif ($arg eq 'hotkeys') { - (join "\n", map { + $textdesc . "Hotkeys:\n" . (join "\n", map { "$_\t- $d_by_short{$_}{help}" } grep { $d_by_short{$_}{mode} & 1 and exists $d_by_short{$_}{help}; - } sort { $d_by_short{$a}{menupos} <=> $d_by_short{$b}{menupos} } sort keys %d_by_short) - . "\n$textdesc"; + } sort { $d_by_short{$a}{menupos} <=> $d_by_short{$b}{menupos} } sort keys %d_by_short); } elsif ($arg eq 'usage') { - (join "\n", map { + $textdesc . (join "\n", map { if ($_ eq 'help') { "--$_\t\t- $d{$_}{help}" } else { @@ -599,12 +638,11 @@ END } grep { $d{$_}{mode} & 2 and exists $d{$_}{help} - } sort { $d{$a}{menupos} <=> $d{$b}{menupos} } sort keys %d) - . "\n$textdesc"; + } sort { $d{$a}{menupos} <=> $d{$b}{menupos} } sort keys %d); } elsif ($arg eq 'options') { map { - "$_=".$d{$_}{type} => (defined $d{$_}{var} ? $d{$_}{var} : \$CONF{$_}); + "$_=".$d{$_}{type} => (defined $d{$_}{var} ? $d{$_}{var} : \$C{$_}); } grep { $d{$_}{mode} & 4 and exists $d{$_}{type}; @@ -621,7 +659,7 @@ END defined $_->[1] } map { - [$_ => exists $d{$_}{var} ? ${$d{$_}{var}} : $CONF{$_}] + [$_ => exists $d{$_}{var} ? ${$d{$_}{var}} : $C{$_}] } keys %d }; @@ -656,3 +694,5 @@ sub main () { } main; + +1; |