git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exponent fallback in case of unit overflow
[barcat.git]
/
barcat
diff --git
a/barcat
b/barcat
index db630abb6ba6d92bf0ef0d2043c61e97a840f379..89b110fe2ca04ecbf8fb4421190346020687a02d 100755
(executable)
--- a/
barcat
+++ b/
barcat
@@
-51,7
+51,7
@@
GetOptions(\%opt,
$opt{width} ||= $ENV{COLUMNS} || 80;
$opt{color} //= -t *STDOUT; # enable on tty
$opt{trim} *= $opt{width} / 100 if $opt{trimpct};
$opt{width} ||= $ENV{COLUMNS} || 80;
$opt{color} //= -t *STDOUT; # enable on tty
$opt{trim} *= $opt{width} / 100 if $opt{trimpct};
-$opt{units} = $opt{'human-readable'} && ['', qw( k M G T
<>
n μ m )];
+$opt{units} = $opt{'human-readable'} && ['', qw( k M G T
P E Z Y y z a f p
n μ m )];
if (defined $opt{interval}) {
$opt{interval} ||= 1;
if (defined $opt{interval}) {
$opt{interval} ||= 1;
@@
-125,6
+125,12
@@
if ($opt{markers} // 1 and $size > 0) {
}
}
}
}
+sub sival {
+ my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
+ sprintf "%3.1f%1s", $_[0] / 1000 ** $unit,
+ $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit];
+}
+
while ($nr <= $#lines) {
$nr >= $opt{hidemax} and last if $opt{hidemax};
my $val = $values[$nr];
while ($nr <= $#lines) {
$nr >= $opt{hidemax} and last if $opt{hidemax};
my $val = $values[$nr];
@@
-133,9
+139,7
@@
while ($nr <= $#lines) {
$val == $order[0] ? 32 : # max
$val == $order[-1] ? 31 : # min
90;
$val == $order[0] ? 32 : # max
$val == $order[-1] ? 31 : # min
90;
- $val = sprintf "%3.1f%1s", $val / 1000**$_, $opt{units}->[$_]
- for $opt{units} ? int(log($val) / log(1000)) : ();
- $val = sprintf "%*s", $lenval, $val;
+ $val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
$val = "\e[${color}m$val\e[0m" if $color;
}
my $line = $lines[$nr] =~ s/\n/$val/r;
$val = "\e[${color}m$val\e[0m" if $color;
}
my $line = $lines[$nr] =~ s/\n/$val/r;