From patchwork Tue Feb 26 23:02:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dharmik Thakkar X-Patchwork-Id: 50534 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3525A3798; Wed, 27 Feb 2019 00:03:14 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 1B8CA27D for ; Wed, 27 Feb 2019 00:03:08 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8490216A3; Tue, 26 Feb 2019 15:03:07 -0800 (PST) Received: from 2p2660v4-1.austin.arm.com (2p2660v4-1.austin.arm.com [10.118.12.58]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4BBC73F738; Tue, 26 Feb 2019 15:03:07 -0800 (PST) From: Dharmik Thakkar To: Robert Sanford Cc: dev@dpdk.org, Dharmik Thakkar Date: Tue, 26 Feb 2019 17:02:29 -0600 Message-Id: <20190226230229.25450-4-dharmik.thakkar@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190226230229.25450-1-dharmik.thakkar@arm.com> References: <20190220230023.17029-1-dharmik.thakkar@arm.com> <20190226230229.25450-1-dharmik.thakkar@arm.com> Subject: [dpdk-dev] [PATCH v4 3/3] test/timer: enable unit test compilation always X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch replaces macro with log-level based approach to print debug information. Need to set timer log type to debug using the following eal parameter: --log-level=test.timer:debug Suggested-by: Thomas Monjalon Signed-off-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Phil Yang Reviewed-by: Ferruh Yigit --- v4: * change to dynamic logging (Stephen Hemminger) --- v3: * Resolve coding style issues --- v2: * Add Reviewed-by tag --- test/test/test_timer_racecond.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/test/test/test_timer_racecond.c b/test/test/test_timer_racecond.c index d29048eaf1bf..62b73f886a1f 100644 --- a/test/test/test_timer_racecond.c +++ b/test/test/test_timer_racecond.c @@ -44,8 +44,6 @@ #include #include -#undef TEST_TIMER_RACECOND_VERBOSE - #ifdef RTE_EXEC_ENV_LINUXAPP #define usec_delay(us) usleep(us) #else @@ -65,18 +63,23 @@ static volatile unsigned stop_slaves; static int reload_timer(struct rte_timer *tim); +int timer_logtype_test; + +RTE_INIT(test_timer_init_log) +{ + timer_logtype_test = rte_log_register("test.timer"); +} + static void timer_cb(struct rte_timer *tim, void *arg __rte_unused) { /* Simulate slow callback function, 100 us. */ rte_delay_us(100); - -#ifdef TEST_TIMER_RACECOND_VERBOSE if (tim == &timer[0]) - printf("------------------------------------------------\n"); - printf("timer_cb: core %u timer %lu\n", - rte_lcore_id(), tim - timer); -#endif + rte_log(RTE_LOG_DEBUG, timer_logtype_test, + "------------------------------------------------\n"); + rte_log(RTE_LOG_DEBUG, timer_logtype_test, "%s: core %u timer %lu\n", + __func__, rte_lcore_id(), tim - timer); (void)reload_timer(tim); } @@ -96,10 +99,9 @@ reload_timer(struct rte_timer *tim) ret = rte_timer_reset(tim, ticks, PERIODICAL, master, timer_cb, NULL); if (ret != 0) { -#ifdef TEST_TIMER_RACECOND_VERBOSE - printf("- core %u failed to reset timer %lu (OK)\n", + rte_log(RTE_LOG_DEBUG, timer_logtype_test, + "- core %u failed to reset timer %lu (OK)\n", rte_lcore_id(), tim - timer); -#endif RTE_PER_LCORE(n_reset_collisions) += 1; } return ret;