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 7A48093151 for ; Mon, 8 Apr 2024 14:18:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 536589A9F for ; Mon, 8 Apr 2024 14:18:30 +0200 (CEST) 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 ; Mon, 8 Apr 2024 14:18:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 139454408E for ; Mon, 8 Apr 2024 14:18:29 +0200 (CEST) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Mon, 8 Apr 2024 14:17:43 +0200 Message-ID: <20240408121742.236867-3-s.lendl@proxmox.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408121742.236867-2-s.lendl@proxmox.com> References: <20240408121742.236867-2-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ksm-control-scripts.new] Subject: [pve-devel] [PATCH v2 ksm-control-daemon 2/2] ksmtuned: fix formatting when summing up large numbers 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: Mon, 08 Apr 2024 12:18:30 -0000 awk internally uses float for every calculation, printing a large float with awk results in 1.233e+09 format which causes the script to fail afterwards. Instead I am printing the float without decimals. Signed-off-by: Stefan Lendl --- debian/patches/awk-printf.diff | 16 ++++++++++++++++ debian/patches/series | 1 + 2 files changed, 17 insertions(+) create mode 100644 debian/patches/awk-printf.diff diff --git a/debian/patches/awk-printf.diff b/debian/patches/awk-printf.diff new file mode 100644 index 0000000..8502068 --- /dev/null +++ b/debian/patches/awk-printf.diff @@ -0,0 +1,16 @@ +--- ksm-control-scripts/ksmtuned 2024-01-25 11:33:03.485039813 +0100 ++++ ksm-control-scripts.new/ksmtuned 2024-01-25 11:37:40.544751316 +0100 +@@ -72,11 +72,11 @@ + # calculate how much memory is committed to running qemu processes + local progname + progname=${1:-kvm} +- ps -C "$progname" -o rsz | awk '{ sum += $1 }; END { print sum }' ++ ps -C "$progname" -o rsz | awk '{ sum += $1 }; END { printf ("%.0f", sum) }' + } + + free_memory () { +- awk '/^(MemFree|Buffers|Cached):/ {free += $2}; END {print free}' \ ++ awk '/^(MemFree|Buffers|Cached):/ {free += $2}; END { printf ("%.0f", free) }' \ + /proc/meminfo + } + diff --git a/debian/patches/series b/debian/patches/series index 32d3a35..24e8678 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ init-script.diff ksmtuned.diff adjust-ksm-slepp.diff +awk-printf.diff -- 2.44.0