summaryrefslogtreecommitdiff
path: root/loadbars.pl
diff options
context:
space:
mode:
Diffstat (limited to 'loadbars.pl')
-rwxr-xr-xloadbars.pl292
1 files changed, 166 insertions, 126 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-08 14:03:35 +0000