From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CBD8091177 for ; Tue, 13 Feb 2024 16:14:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 995C93831D for ; Tue, 13 Feb 2024 16:14:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 13 Feb 2024 16:14:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C502047D14 for ; Tue, 13 Feb 2024 16:14:13 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 13 Feb 2024 16:14:01 +0100 Message-ID: <20240213151405.1282639-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213151405.1282639-1-c.heiss@proxmox.com> References: <20240213151405.1282639-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [command.pm] Subject: [pve-devel] [PATCH installer v2 4/6] sys: command: allow terminating the process early from log subroutine X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2024 15:14:44 -0000 If the logging subroutine $func returns CMD_FINISHED after processing a line, the running subprocess is killed early. This mechanism can be used when e.g. only a certain part of the output of a (long-running) command is needed, avoiding the extra time it would take the command to finish properly. This is done in a entirely backwards-compatible way, i.e. existing usages don't need any modification. Signed-off-by: Christoph Heiss --- Changes since v1: * introduced constant for return value (thanks Thomas!) * added documentation Proxmox/Sys/Command.pm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Proxmox/Sys/Command.pm b/Proxmox/Sys/Command.pm index 6389b17..36e99c1 100644 --- a/Proxmox/Sys/Command.pm +++ b/Proxmox/Sys/Command.pm @@ -15,7 +15,9 @@ use Proxmox::Log; use Proxmox::UI; use base qw(Exporter); -our @EXPORT_OK = qw(run_command syscmd); +our @EXPORT_OK = qw(run_command syscmd CMD_FINISHED); + +use constant CMD_FINISHED => 1; my sub shellquote { my $str = shift; @@ -79,7 +81,8 @@ sub syscmd { # # Arguments: # * $cmd - The command to run, either a single string or array with individual arguments -# * $func - Logging subroutine to call, receives both stdout and stderr +# * $func - Logging subroutine to call, receives both stdout and stderr. Might return CMD_FINISHED +# to exit early and ignore the rest of the process output. # * $input - Stdin contents for the spawned subprocess # * $noout - Whether to append any process output to the return value sub run_command { @@ -163,7 +166,13 @@ sub run_command { $logout .= $buf; while ($logout =~ s/^([^\010\r\n]*)(\r|\n|(\010)+|\r\n)//s) { my $line = $1; - $func->($line) if $func; + if ($func) { + my $ret = $func->($line); + if (defined($ret) && $ret == CMD_FINISHED) { + wait_for_process($pid, kill => 1); + return $ostream; + } + }; } } elsif ($h eq $error) { -- 2.43.0