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 7CCDF41D52 for ; Thu, 23 Feb 2023 16:08:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B4ED432C5; Thu, 23 Feb 2023 16:08:35 +0100 (CET) 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 280C8432AD for ; Thu, 23 Feb 2023 16:08:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164913; 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=J5vcewVl0qcQRxfOZiG4OLYNMMIaxE4g26C0cVxax1U=; b=aZsX3EHu9VKpp8xeVsCb0ya8DJlTAVnGVbu9clofzgLEBdi1xMaTHCJUgeDm2+R+uxv06b 4THGC1ufnorelFbGxDDN/pRvvci2RKSUsHWxvbvDirolSm/jwB58Tns++SVeW8XQi72puX fQjazHpEgak5zgngbrWyJeQO6g09QiM= 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-5-v4ZlgPDUPkGsrziKF01Opw-1; Thu, 23 Feb 2023 10:08:32 -0500 X-MC-Unique: v4ZlgPDUPkGsrziKF01Opw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ABC58802C18; Thu, 23 Feb 2023 15:08:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id F14022166B31; Thu, 23 Feb 2023 15:08:30 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: dpdk stable Subject: patch 'app/compress-perf: fix some typos' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:16 +0000 Message-Id: <20230223150631.723699-85-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/23. 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/87689a74a4551198a8e2b4f61f88da6abe16ad84 Thanks. Kevin --- >From 87689a74a4551198a8e2b4f61f88da6abe16ad84 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 14 Feb 2023 19:40:27 +0200 Subject: [PATCH] app/compress-perf: fix some typos [ upstream commit 1643fc9b077ebb55b13a2c4469b75c251499acdc ] Fix some typos in comments and prints in this app. Fixes: e0b6287c035d ("app/compress-perf: add parser") Fixes: 2695db95a147 ("test/compress: add cycle-count mode to perf tool") Fixes: 971d89f5116b ("app/compress-perf: prevent output buffer overflow") Signed-off-by: Michael Baum --- app/test-compress-perf/comp_perf_options_parse.c | 4 ++-- app/test-compress-perf/comp_perf_test_cyclecount.c | 2 +- app/test-compress-perf/comp_perf_test_verify.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/test-compress-perf/comp_perf_options_parse.c b/app/test-compress-perf/comp_perf_options_parse.c index 019eddb7bd..9b9d4e6554 100644 --- a/app/test-compress-perf/comp_perf_options_parse.c +++ b/app/test-compress-perf/comp_perf_options_parse.c @@ -492,5 +492,5 @@ parse_huffman_enc(struct comp_test_data *test_data, const char *arg) RTE_DIM(huffman_namemap), arg); if (id < 0) { - RTE_LOG(ERR, USER1, "Invalid Huffmane encoding specified\n"); + RTE_LOG(ERR, USER1, "Invalid Huffman encoding specified\n"); return -1; } @@ -508,5 +508,5 @@ parse_level(struct comp_test_data *test_data, const char *arg) /* * Try parsing the argument as a range, if it fails, - * arse it as a list + * parse it as a list */ if (parse_range(arg, &test_data->level_lst.min, diff --git a/app/test-compress-perf/comp_perf_test_cyclecount.c b/app/test-compress-perf/comp_perf_test_cyclecount.c index a3f6404eb2..c37c1c1ba4 100644 --- a/app/test-compress-perf/comp_perf_test_cyclecount.c +++ b/app/test-compress-perf/comp_perf_test_cyclecount.c @@ -562,5 +562,5 @@ cperf_cyclecount_test_runner(void *test_ctx) " [D-d] - decompression dequeue\n" " - Cycles section: number of cycles per 'op' for the following operations:\n" - " setup/op - memory allocation, op configuration and memory dealocation\n" + " setup/op - memory allocation, op configuration and memory deallocation\n" " [C-e] - compression enqueue\n" " [C-d] - compression dequeue\n" diff --git a/app/test-compress-perf/comp_perf_test_verify.c b/app/test-compress-perf/comp_perf_test_verify.c index 7d06029488..2ab519e533 100644 --- a/app/test-compress-perf/comp_perf_test_verify.c +++ b/app/test-compress-perf/comp_perf_test_verify.c @@ -225,5 +225,5 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type) RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE) { RTE_LOG(ERR, USER1, -"Out of space error occurred due to uncompressible input data expanding to larger than destination buffer. Increase the EXPANSE_RATIO constant to use this data.\n"); +"Out of space error occurred due to incompressible input data expanding to larger than destination buffer. Increase the EXPANSE_RATIO constant to use this data.\n"); res = -1; goto end; @@ -310,5 +310,5 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type) RTE_COMP_OP_STATUS_OUT_OF_SPACE_RECOVERABLE) { RTE_LOG(ERR, USER1, -"Out of space error occurred due to uncompressible input data expanding to larger than destination buffer. Increase the EXPANSE_RATIO constant to use this data.\n"); +"Out of space error occurred due to incompressible input data expanding to larger than destination buffer. Increase the EXPANSE_RATIO constant to use this data.\n"); res = -1; goto end; -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.856391765 +0000 +++ 0085-app-compress-perf-fix-some-typos.patch 2023-02-23 14:46:23.871236318 +0000 @@ -1 +1 @@ -From 1643fc9b077ebb55b13a2c4469b75c251499acdc Mon Sep 17 00:00:00 2001 +From 87689a74a4551198a8e2b4f61f88da6abe16ad84 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1643fc9b077ebb55b13a2c4469b75c251499acdc ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -39 +40 @@ -index 7473cb6277..ce457fefbb 100644 +index a3f6404eb2..c37c1c1ba4 100644 @@ -42 +43 @@ -@@ -564,5 +564,5 @@ cperf_cyclecount_test_runner(void *test_ctx) +@@ -562,5 +562,5 @@ cperf_cyclecount_test_runner(void *test_ctx) @@ -50 +51 @@ -index 8964442891..6b61a9194f 100644 +index 7d06029488..2ab519e533 100644 @@ -53 +54 @@ -@@ -227,5 +227,5 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type) +@@ -225,5 +225,5 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type) @@ -60 +61 @@ -@@ -312,5 +312,5 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type) +@@ -310,5 +310,5 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type)