proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-27 10:01:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

run_command: improve performance for logging and long lines

Browse Source 
to call out/err/logfunc with each line, we search for a newline and call
outfunc/logfunc with everything before that

since we do a select/read (with 4096 size) in a loop, this means
that if we have very long lines, we search for a newline in an
ever growing buffer (for which we know does not contain a newline)

so instead, only search the new data for newlines

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-07-30 11:04:10 +02:00 committed by Thomas Lamprecht
parent 8fb28ab914
commit cb9db10c1a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PVE/Tools.pm
View File

@ -497,12 +497,13 @@ sub run_command {
if ($h eq $reader) { if ($h eq $reader) {
if ($outfunc || $logfunc) { if ($outfunc || $logfunc) {
eval { eval {
$outlog .= $buf; while ($buf =~ s/^([^\010\r\n]*)(\r|\n|(\010)+|\r\n)//) {
while ($outlog =~ s/^([^\010\r\n]*)(\r|\n|(\010)+|\r\n)//s) { my $line = $outlog . $1;
my $line = $1; $outlog = '';
&$outfunc($line) if $outfunc; &$outfunc($line) if $outfunc;
&$logfunc($line) if $logfunc; &$logfunc($line) if $logfunc;
} }
$outlog .= $buf;
}; };
my $err = $@; my $err = $@;
if ($err) { if ($err) {
@ -517,12 +518,13 @@ sub run_command {
} elsif ($h eq $error) { } elsif ($h eq $error) {
if ($errfunc || $logfunc) { if ($errfunc || $logfunc) {
eval { eval {
$errlog .= $buf; while ($buf =~ s/^([^\010\r\n]*)(\r|\n|(\010)+|\r\n)//s) {
while ($errlog =~ s/^([^\010\r\n]*)(\r|\n|(\010)+|\r\n)//s) { my $line = $errlog . $1;
my $line = $1; $errlog = '';
&$errfunc($line) if $errfunc; &$errfunc($line) if $errfunc;
&$logfunc($line) if $logfunc; &$logfunc($line) if $logfunc;
} }
$errlog .= $buf;
}; };
my $err = $@; my $err = $@;
if ($err) { if ($err) {