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 B70C9A0503 for ; Wed, 18 May 2022 12:18:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF23442B9A; Wed, 18 May 2022 12:18: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 82216410D3 for ; Wed, 18 May 2022 12:18:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652869104; 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=LA10iG6lJdOGqsX75jLkP5aBiAcSyrwWxaX2eGOrcyc=; b=cu+KDBxt1IPnQ2CYwnsScjvoRrd7hFuos+xu75rjEVIAfKapA8+OXzZf3Fgr4jglQJgE44 66TUgUGNeGqpvU1EScYIqhkOpbFP+kpds6rG3vdH+gPjKu8zJmUa4c5gLegZl+MysiR76r C8ugGTEvhMF4cDRbfbGZq9TYlEVmym4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-mTpKFnx3Me6sJ_TJEngChw-1; Wed, 18 May 2022 06:18:21 -0400 X-MC-Unique: mTpKFnx3Me6sJ_TJEngChw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 867173802B94; Wed, 18 May 2022 10:18:20 +0000 (UTC) Received: from fchome.home (unknown [10.40.195.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8A1A492C14; Wed, 18 May 2022 10:18:17 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, ferruh.yigit@xilinx.com, stable@dpdk.org, Wisam Jaddo Subject: [PATCH 11/12] app/flow-perf: fix build with GCC 12 Date: Wed, 18 May 2022 12:16:56 +0200 Message-Id: <20220518101657.1230416-12-david.marchand@redhat.com> In-Reply-To: <20220518101657.1230416-1-david.marchand@redhat.com> References: <20220518101657.1230416-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@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 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. Cc: stable@dpdk.org Signed-off-by: David Marchand --- 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..3922e92ded 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -16,6 +16,7 @@ * gives packet per second measurement. */ +#include #include #include #include @@ -1713,36 +1714,6 @@ do_tx(struct lcore_info *li, uint16_t cnt, uint16_t tx_port, rte_pktmbuf_free(li->pkts[i]); } -/* - * 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) { @@ -1764,7 +1735,6 @@ packet_per_second_stats(void) uint64_t total_rx_pkts = 0; uint64_t total_tx_drops = 0; uint64_t tx_delta, rx_delta, drops_delta; - char buf[3][32]; int nr_valid_core = 0; sleep(1); @@ -1789,10 +1759,8 @@ packet_per_second_stats(void) tx_delta = li->tx_pkts - oli->tx_pkts; 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.3"PRId64" %'16.3"PRId64" %'16.3"PRId64"\n", + i, tx_delta, drops_delta, rx_delta); total_tx_pkts += tx_delta; total_rx_pkts += rx_delta; @@ -1803,10 +1771,9 @@ 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.3"PRId64" %'16.3"PRId64" %'16.3"PRId64"\n", + "total", total_tx_pkts, total_tx_drops, + total_rx_pkts); nr_lines += 1; } @@ -2139,6 +2106,9 @@ main(int argc, char **argv) if (argc > 1) args_parse(argc, argv); + /* For more fancy, localised integer formatting. */ + setlocale(LC_NUMERIC, ""); + init_port(); nb_lcores = rte_lcore_count(); -- 2.36.1