git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
order incoming values before interval
[barcat.git]
/
barcat
diff --git
a/barcat
b/barcat
index 2c1104871194a4ae25395113c6a215599ddcf112..4c3cf8a763210ae3eb31fb7ecb41a25665da6ac0 100755
(executable)
--- a/
barcat
+++ b/
barcat
@@
-6,7
+6,7
@@
use List::Util qw( min max sum );
use open qw( :std :utf8 );
use experimental qw( lexical_subs );
use open qw( :std :utf8 );
use experimental qw( lexical_subs );
-our $VERSION = '1.0
3
';
+our $VERSION = '1.0
4
';
use Getopt::Long '2.33', qw( :config gnu_getopt );
sub podexit {
use Getopt::Long '2.33', qw( :config gnu_getopt );
sub podexit {
@@
-61,6
+61,8
@@
$opt{units} = [split //, ' kMGTPEZYyzafpnμm'] if $opt{'human-readable'};
$opt{anchor} //= qr/\A/;
$opt{'value-length'} = 6 if $opt{units};
$opt{anchor} //= qr/\A/;
$opt{'value-length'} = 6 if $opt{units};
+my (@lines, @values, @order);
+
if (defined $opt{interval}) {
$opt{interval} ||= 1;
$SIG{ALRM} = sub {
if (defined $opt{interval}) {
$opt{interval} ||= 1;
$SIG{ALRM} = sub {
@@
-68,16
+70,21
@@
if (defined $opt{interval}) {
alarm $opt{interval};
};
alarm $opt{interval};
alarm $opt{interval};
};
alarm $opt{interval};
+
+ eval {
+ require Tie::Array::Sorted;
+ tie @order, 'Tie::Array::Sorted', sub { $_[1] <=> $_[0] };
+ } or warn $@, "Expect slowdown with large datasets!\n";
}
$SIG{INT} = 'IGNORE'; # continue after assumed eof
}
$SIG{INT} = 'IGNORE'; # continue after assumed eof
-my (@lines, @values);
my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x;
while (readline) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
push @values, s/$valmatch/\n/ && $1;
my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x;
while (readline) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
push @values, s/$valmatch/\n/ && $1;
+ push @order, $1 if length $1;
if (defined $opt{trim}) {
my $trimpos = abs $opt{trim};
if ($trimpos <= 1) {
if (defined $opt{trim}) {
my $trimpos = abs $opt{trim};
if ($trimpos <= 1) {
@@
-92,8
+99,6
@@
while (readline) {
$SIG{INT} = 'DEFAULT';
$SIG{INT} = 'DEFAULT';
-my @order;
-
sub show_lines {
state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
sub show_lines {
state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
@@
-101,7
+106,7
@@
state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
@lines or return;
@lines > $nr or return unless $opt{hidemin};
@lines or return;
@lines > $nr or return unless $opt{hidemin};
-@order
= sort { $b <=> $a } grep { length } @values
;
+@order
= sort { $b <=> $a } @order unless tied @order
;
my $maxval = ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0;
my $minval = min $order[-1] // (), 0;
my $lenval = $opt{'value-length'} // max map { length } @order;
my $maxval = ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0;
my $minval = min $order[-1] // (), 0;
my $lenval = $opt{'value-length'} // max map { length } @order;
@@
-171,6
+176,11
@@
while ($nr <= $#lines) {
show_lines();
if ($opt{stat}) {
show_lines();
if ($opt{stat}) {
+ if ($opt{hidemin} or $opt{hidemax}) {
+ $opt{hidemin} ||= 1;
+ $opt{hidemax} ||= @lines;
+ printf '%s of ', sum(@values[$opt{hidemin} - 1 .. $opt{hidemax} - 1]) // 0;
+ }
my $total = sum @order;
printf '%s total', $total;
printf ' in %d values', scalar @values;
my $total = sum @order;
printf '%s total', $total;
printf ' in %d values', scalar @values;