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 8819CA0542 for ; Wed, 21 Sep 2022 14:04:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69BEC42B85; Wed, 21 Sep 2022 14:04:34 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6461542B84 for ; Wed, 21 Sep 2022 14:04:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663761872; 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=5Jvh6sg2MjdeHM79WAUZLpj3b6arsrFv/J9jbFxp3VA=; b=DPeM76S8GqjaMUn6xe1aZRNVNv+lab7EFdjmHVmT3wNx+TvHtZKNdahM7vRHZfOewsXkg+ 1zN0NHNTvSgz/u72TenvJ3pLC+yRrzb28Jix1npR5yrYv9ticHoKMEXihEpuiTz+5VLn56 yTd9jMSAQEfrdNI4ZZo9dGiiD4h8xMU= 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-246-BUPjsCfXPn-B296VmtJqPA-1; Wed, 21 Sep 2022 08:04:31 -0400 X-MC-Unique: BUPjsCfXPn-B296VmtJqPA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A69787B2A1; Wed, 21 Sep 2022 12:04:31 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DEAB40C83DA; Wed, 21 Sep 2022 12:04:30 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: stable@dpdk.org, Jerin Jacob , Sunil Kumar Kori Subject: [PATCH 6/8] trace: fix metadata dump Date: Wed, 21 Sep 2022 14:03:57 +0200 Message-Id: <20220921120359.2201131-7-david.marchand@redhat.com> In-Reply-To: <20220921120359.2201131-1-david.marchand@redhat.com> References: <20220921120359.2201131-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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 The API does not describe that metadata dump is conditioned to enabling any trace points. While at it, merge dump unit tests into the generic trace_autotest to enhance coverage. Fixes: f6b2d65dcd5d ("trace: implement debug dump") Cc: stable@dpdk.org Signed-off-by: David Marchand --- app/test/test_trace.c | 44 +++++++++------------------ lib/eal/common/eal_common_trace_ctf.c | 3 -- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/app/test/test_trace.c b/app/test/test_trace.c index 2660f52f1d..6bedf14024 100644 --- a/app/test/test_trace.c +++ b/app/test/test_trace.c @@ -20,20 +20,6 @@ test_trace(void) return TEST_SKIPPED; } -static int -test_trace_dump(void) -{ - printf("trace_dump not supported on Windows, skipping test\n"); - return TEST_SKIPPED; -} - -static int -test_trace_metadata_dump(void) -{ - printf("trace_metadata_dump not supported on Windows, skipping test\n"); - return TEST_SKIPPED; -} - #else static int32_t @@ -214,6 +200,19 @@ test_generic_trace_points(void) return TEST_SUCCESS; } +static int +test_trace_dump(void) +{ + rte_trace_dump(stdout); + return 0; +} + +static int +test_trace_metadata_dump(void) +{ + return rte_trace_metadata_dump(stdout); +} + static struct unit_test_suite trace_tests = { .suite_name = "trace autotest", .setup = NULL, @@ -226,6 +225,8 @@ static struct unit_test_suite trace_tests = { TEST_CASE(test_trace_point_globbing), TEST_CASE(test_trace_point_regex), TEST_CASE(test_trace_points_lookup), + TEST_CASE(test_trace_dump), + TEST_CASE(test_trace_metadata_dump), TEST_CASES_END() } }; @@ -236,21 +237,6 @@ test_trace(void) return unit_test_suite_runner(&trace_tests); } -static int -test_trace_dump(void) -{ - rte_trace_dump(stdout); - return 0; -} - -static int -test_trace_metadata_dump(void) -{ - return rte_trace_metadata_dump(stdout); -} - #endif /* !RTE_EXEC_ENV_WINDOWS */ REGISTER_TEST_COMMAND(trace_autotest, test_trace); -REGISTER_TEST_COMMAND(trace_dump, test_trace_dump); -REGISTER_TEST_COMMAND(trace_metadata_dump, test_trace_metadata_dump); diff --git a/lib/eal/common/eal_common_trace_ctf.c b/lib/eal/common/eal_common_trace_ctf.c index 3b83bcdf57..eb7f71af8b 100644 --- a/lib/eal/common/eal_common_trace_ctf.c +++ b/lib/eal/common/eal_common_trace_ctf.c @@ -357,9 +357,6 @@ rte_trace_metadata_dump(FILE *f) char *ctf_meta = trace->ctf_meta; int rc; - if (!rte_trace_is_enabled()) - return 0; - if (ctf_meta == NULL) return -EINVAL; -- 2.37.3