From patchwork Sat Feb 8 06:44:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: jiang.kun2@zte.com.cn X-Patchwork-Id: 13966279 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A15D7C02198 for ; Sat, 8 Feb 2025 06:44:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C57696B0092; Sat, 8 Feb 2025 01:44:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BE08B6B0095; Sat, 8 Feb 2025 01:44:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A803E280001; Sat, 8 Feb 2025 01:44:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 8700F6B0092 for ; Sat, 8 Feb 2025 01:44:12 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A9834121A76 for ; Sat, 8 Feb 2025 06:44:11 +0000 (UTC) X-FDA: 83095837902.14.5F1BEAD Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by imf27.hostedemail.com (Postfix) with ESMTP id BED2B40004 for ; Sat, 8 Feb 2025 06:44:08 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of jiang.kun2@zte.com.cn designates 183.62.165.209 as permitted sender) smtp.mailfrom=jiang.kun2@zte.com.cn; dmarc=pass (policy=none) header.from=zte.com.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738997050; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references; bh=aVFeMQMAQ/bpjRVgTBYEAMo8S2Rg1SyEz8i0Rdvpd14=; b=G03oGqVquJQe4acsGAYoGRzr3HmZXYNqz8xLLMhhebBcIQQu/ZnPfS5HibUqCur3io9j0I GJgiFs4va4RMw/CRFikubW5RQ+Pv9szjkio8hz5PkWzu3t2qQzHR5kjuXpxGUHd/2gmael rRp4CWAFEeoYv4JzYq2+i6zibCnDxC0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of jiang.kun2@zte.com.cn designates 183.62.165.209 as permitted sender) smtp.mailfrom=jiang.kun2@zte.com.cn; dmarc=pass (policy=none) header.from=zte.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738997050; a=rsa-sha256; cv=none; b=egUZBipD+77FDt99V3tTeTQJIsqLo3uZv5PNcCjlFoghOr/5iI6nNqy9JqthWNT4eFM4vj Ug3XtMsxfI0B5loZ2AUVt821+DoDi3xC2Gmg1pcgb9JaK5rVpDO5uAk/zGU/RAe8T0Csm0 WjlqR8lireCZOkvhH8z2bBNcRGar34Q= Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4YqhBq049Dz4xVcS; Sat, 8 Feb 2025 14:44:03 +0800 (CST) Received: from njy2app01.zte.com.cn ([10.40.12.136]) by mse-fl1.zte.com.cn with SMTP id 5186hwHP094495; Sat, 8 Feb 2025 14:43:58 +0800 (+08) (envelope-from jiang.kun2@zte.com.cn) Received: from mapi (njb2app07[null]) by mapi (Zmail) with MAPI id mid204; Sat, 8 Feb 2025 14:44:00 +0800 (CST) Date: Sat, 8 Feb 2025 14:44:00 +0800 (CST) X-Zmail-TransId: 2aff67a6fd30ffffffff805-3f613 X-Mailer: Zmail v1.0 Message-ID: <20250208144400544RduNRhwIpT3m2JyRBqskZ@zte.com.cn> Mime-Version: 1.0 From: To: , , Cc: , , , , , , , , , , , Subject: =?utf-8?q?=5BPATCH_linux_next=5D_getdelays=3A_fix_error_format_char?= =?utf-8?q?acters?= X-MAIL: mse-fl1.zte.com.cn 5186hwHP094495 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 67A6FD33.000/4YqhBq049Dz4xVcS X-Rspamd-Queue-Id: BED2B40004 X-Stat-Signature: gd1x54635rqr7njppidk3f8qq5bx46qr X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1738997048-661827 X-HE-Meta: U2FsdGVkX1+wrDqyCtII7dmqUoXOM+W+lmNtDAPQocGvMNKdtRjHW2HI4DXBij8U1PJMQAyYnX1Eto/jr+kbJiFe7/FWsIj97kaUFstY2YxrpYtztTk/MJrnul4IC2a2ioYqyy7oLNEqUncSh8UmRFaNRQv8OToYCTh9+qqRg0CDND54yOOYJMLu0WZgjigQQz8MhSkvqN5Z4nZ3HTN9guZhKSisDj/ZKvlK6r9MJ8uMoMt+UD86rdXL683bTACcP11yi5aoJIxIy/DGvt7aH2aMFar/27ZQ+TcZ+yTyuUJM2cqvRz6LD0y2f6eSe+VDfMQ07g4RD8W2V9Eo5yChNYg8iEkQq25rw3YTLmHjhdzKfdTPIk3M7NMC234q8rP20NVQ3KHCUFb1l6BPn+FCCGGUHW4H2kYjXYcyEpnGJgtjnOTFrz4FGyNIcpb0M719EetrmqifDA65860EF56VpBEFeiOFxYT7aGJtcBQqHqO1q8roeJemMApJwx2KHSRwFuksToNYVLgi/46Y4/JbCa/PjPkqO4SrUSnQH+L88TEXafNw/ry7Sv+VrwmXROr5ac12c5Vjxy6Sb1miNb5vkenwyszDhhvKl7WzRpT5vbZRqSM8UeKjYja+O41Z1Wg9KB41zirf28MQyJj4TYedJvOzKsOUrnadT8Av9lGk4jU9jOT8zJHkNlCXFXH/1zq/nx70ZDf11mpv4UhEezTE9BjVppjCr5c2nU2dfllOj1UaYpoMcIghYnFt4tUpX3gofAv7+0GpRDa8guH6/8CJ84f8wbofV/Q3UEoC72DaGLnvTR57xBsf6nuUmJjWRLyVVga5ZiZqptSCv/VZ9F5Wqxi6LwKhdDhOqDZ8uR4AcG6lyeQHwq/ZxLdyIyVXq2f9dd5VOeVvXGHn03kgmVxEs/LYK8VEMbwkmbXZELNJH8Wl9B2oEO5BMlKDDlY7DTCnwu0gl7IsQNb9jh60hFY kIp/SwPQ V3AWVD8CM+xFx0yevrpHM4mjSRS24ZEUaEYQmezlDLohCkeO01jMoQ40644CUzkWrYuXTbm8oBg/hGfFhIhlrYNdC88AWeK8hM6p5xXfjWtqK0oN3eoImjU176YJdeVmiLIE3m0I1cvBDGLY50Wu3CcPqFYuVc8CFY6W2Ygd9lsotJ0GJixYLFZ4NWYVE1PU7FjuPQlzt6jBmPG+OmRhnwo26UZPLj3GgoUrBaZbeVbCJWLShlNZELFnf1fky0+TtgwPp240ViiUQv33PWY0L7xPiylzy+HG1TQPKN5lbs7AJ2TE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Wang Yaxin The getdelays had a compilation issue because the format string was not updated when the "delay min" was added. For example, after adding the "delay min" in printf, there were 7 strings but only 6 "%s" format specifiers. Similarly, after adding the 't->cpu_delay_total', there were 7 variables but only 6 format characters specifiers, causing compilation issues as follows. This commit fixes these issues to ensure that getdelays compiles correctly. root@xx:~/linux-next/tools/accounting$ make getdelays.c:199:9: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 8 has type ‘char *’ [-Wformat=] 199 | printf("\n\nCPU %15s%15s%15s%15s%15s%15s\n" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ..... 216 | "delay total", "delay average", "delay max", "delay min", | ~~~~~~~~~~~ | | | char * getdelays.c:200:21: note: format string is defined here 200 | " %15llu%15llu%15llu%15llu%15.3fms%13.6fms\n" | ~~~~~^ | | | long long unsigned int | %15s getdelays.c:199:9: warning: format ‘%f’ expects argument of type ‘double’, but argument 12 has type ‘long long unsigned int’ [-Wformat=] 199 | printf("\n\nCPU %15s%15s%15s%15s%15s%15s\n" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ..... 220 | (unsigned long long)t->cpu_delay_total, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | long long unsigned int ..... Fixes: 0c3576943441 ("delayacct: add delay min to record delay peak") Signed-off-by: Wang Yaxin Signed-off-by: Kun Jiang Reviewed-by: xu xin --- tools/accounting/getdelays.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/accounting/getdelays.c b/tools/accounting/getdelays.c index 100ad3dc091a..3feac0482fe9 100644 --- a/tools/accounting/getdelays.c +++ b/tools/accounting/getdelays.c @@ -196,22 +196,22 @@ static int get_family_id(int sd) static void print_delayacct(struct taskstats *t) { - printf("\n\nCPU %15s%15s%15s%15s%15s%15s\n" - " %15llu%15llu%15llu%15llu%15.3fms%13.6fms\n" - "IO %15s%15s%15s%15s\n" - " %15llu%15llu%15.3fms%13.6fms\n" - "SWAP %15s%15s%15s%15s\n" - " %15llu%15llu%15.3fms%13.6fms\n" - "RECLAIM %12s%15s%15s%15s\n" - " %15llu%15llu%15.3fms%13.6fms\n" - "THRASHING%12s%15s%15s%15s\n" - " %15llu%15llu%15.3fms%13.6fms\n" - "COMPACT %12s%15s%15s%15s\n" - " %15llu%15llu%15.3fms%13.6fms\n" - "WPCOPY %12s%15s%15s%15s\n" - " %15llu%15llu%15.3fms%13.6fms\n" - "IRQ %15s%15s%15s%15s\n" - " %15llu%15llu%15.3fms%13.6fms\n", + printf("\n\nCPU %15s%15s%15s%15s%15s%15s%15s\n" + " %15llu%15llu%15llu%15llu%15.3fms%13.6fms%13.6fms\n" + "IO %15s%15s%15s%15s%15s\n" + " %15llu%15llu%15.3fms%13.6fms%13.6fms\n" + "SWAP %15s%15s%15s%15s%15s\n" + " %15llu%15llu%15.3fms%13.6fms%13.6fms\n" + "RECLAIM %12s%15s%15s%15s%15s\n" + " %15llu%15llu%15.3fms%13.6fms%13.6fms\n" + "THRASHING%12s%15s%15s%15s%15s\n" + " %15llu%15llu%15.3fms%13.6fms%13.6fms\n" + "COMPACT %12s%15s%15s%15s%15s\n" + " %15llu%15llu%15.3fms%13.6fms%13.6fms\n" + "WPCOPY %12s%15s%15s%15s%15s\n" + " %15llu%15llu%15.3fms%13.6fms%13.6fms\n" + "IRQ %15s%15s%15s%15s%15s\n" + " %15llu%15llu%15.3fms%13.6fms%13.6fms\n", "count", "real total", "virtual total", "delay total", "delay average", "delay max", "delay min", (unsigned long long)t->cpu_count,