From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1D4C2A0545 for ; Mon, 20 Jun 2022 11:48:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 17ACE40150; Mon, 20 Jun 2022 11:48:25 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9050A40150 for ; Mon, 20 Jun 2022 11:48:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718503; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VGJqcM+9Y5DblgKwVTuDPy0UBuuFyLywN/iJLJK6HRk=; b=PgWcy7nlbYXMtcFGPpM/cXh1PBLXV9+uXLPrEKM+3DyDupb7GGdN5dLc3scc/LJf12x/Ci 4hHuThLTekGK88kj+TKdmO8YWFWCgtt09Nk6wejLoRjjV1Q/Wvyd/jC/HzLq1h4uPHDObq qEXmjoeWvMLuW/GKmH78Il8cEpl1wAU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-283-ObmqXvbnMTyveOL2poH9rg-1; Mon, 20 Jun 2022 05:48:21 -0400 X-MC-Unique: ObmqXvbnMTyveOL2poH9rg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6737180B90D; Mon, 20 Jun 2022 09:48:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92D0D40C141F; Mon, 20 Jun 2022 09:48:20 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Bruce Richardson , Stephen Hemminger , dpdk stable Subject: patch 'app/flow-perf: fix build with GCC 12' has been queued to stable release 21.11.2 Date: Mon, 20 Jun 2022 10:47:50 +0100 Message-Id: <20220620094752.1027299-17-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/675b5bdf2c1434493f508f6cf909e33ed0e019b5 Thanks. Kevin --- >From 675b5bdf2c1434493f508f6cf909e33ed0e019b5 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 18 May 2022 12:16:56 +0200 Subject: [PATCH] app/flow-perf: fix build with GCC 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 5fc2eece8d4530988e5681fdc8a35e14d69b2a6f ] GCC 12 raises the following warning: ../app/test-flow-perf/main.c: In function ‘start_forwarding’: ../app/test-flow-perf/main.c:1737:28: error: ‘sprintf’ may write a terminating nul past the end of the destination [-Werror=format-overflow=] 1737 | sprintf(p[i++], "%d", (int)n); | ^ In function ‘pretty_number’, inlined from ‘packet_per_second_stats’ at ../app/test-flow-perf/main.c:1792:4, inlined from ‘start_forwarding’ at ../app/test-flow-perf/main.c:1831:3: [...] We can simplify this code and rely on libc integer formatting via this system locales. Bugzilla ID: 856 Signed-off-by: David Marchand Acked-by: Bruce Richardson Acked-by: Stephen Hemminger --- app/test-flow-perf/main.c | 48 ++++++++------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c index 56d43734e3..f375097028 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -17,4 +17,5 @@ */ +#include #include #include @@ -1714,34 +1715,4 @@ do_tx(struct lcore_info *li, uint16_t cnt, uint16_t tx_port, } -/* - * Method to convert numbers into pretty numbers that easy - * to read. The design here is to add comma after each three - * digits and set all of this inside buffer. - * - * For example if n = 1799321, the output will be - * 1,799,321 after this method which is easier to read. - */ -static char * -pretty_number(uint64_t n, char *buf) -{ - char p[6][4]; - int i = 0; - int off = 0; - - while (n > 1000) { - sprintf(p[i], "%03d", (int)(n % 1000)); - n /= 1000; - i += 1; - } - - sprintf(p[i++], "%d", (int)n); - - while (i--) - off += sprintf(buf + off, "%s,", p[i]); - buf[strlen(buf) - 1] = '\0'; - - return buf; -} - static void packet_per_second_stats(void) @@ -1765,5 +1736,4 @@ packet_per_second_stats(void) uint64_t total_tx_drops = 0; uint64_t tx_delta, rx_delta, drops_delta; - char buf[3][32]; int nr_valid_core = 0; @@ -1790,8 +1760,6 @@ packet_per_second_stats(void) rx_delta = li->rx_pkts - oli->rx_pkts; drops_delta = li->tx_drops - oli->tx_drops; - printf("%6d %16s %16s %16s\n", i, - pretty_number(tx_delta, buf[0]), - pretty_number(drops_delta, buf[1]), - pretty_number(rx_delta, buf[2])); + printf("%6d %'16"PRId64" %'16"PRId64" %'16"PRId64"\n", + i, tx_delta, drops_delta, rx_delta); total_tx_pkts += tx_delta; @@ -1804,8 +1772,7 @@ packet_per_second_stats(void) if (nr_valid_core > 1) { - printf("%6s %16s %16s %16s\n", "total", - pretty_number(total_tx_pkts, buf[0]), - pretty_number(total_tx_drops, buf[1]), - pretty_number(total_rx_pkts, buf[2])); + printf("%6s %'16"PRId64" %'16"PRId64" %'16"PRId64"\n", + "total", total_tx_pkts, total_tx_drops, + total_rx_pkts); nr_lines += 1; } @@ -2140,4 +2107,7 @@ main(int argc, char **argv) args_parse(argc, argv); + /* For more fancy, localised integer formatting. */ + setlocale(LC_NUMERIC, ""); + init_port(); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-20 10:46:28.149300271 +0100 +++ 0017-app-flow-perf-fix-build-with-GCC-12.patch 2022-06-20 10:46:27.796146856 +0100 @@ -1 +1 @@ -From 5fc2eece8d4530988e5681fdc8a35e14d69b2a6f Mon Sep 17 00:00:00 2001 +From 675b5bdf2c1434493f508f6cf909e33ed0e019b5 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 5fc2eece8d4530988e5681fdc8a35e14d69b2a6f ] + @@ -28 +29,0 @@ -Cc: stable@dpdk.org