From patchwork Thu Nov 29 20:31:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dharmik Thakkar X-Patchwork-Id: 48422 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 92C821B518; Thu, 29 Nov 2018 21:32:30 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id AF9F61B51C for ; Thu, 29 Nov 2018 21:32:28 +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 D800880D; Thu, 29 Nov 2018 12:32:27 -0800 (PST) Received: from 2p2660v4-1.austin.arm.com (2p2660v4-1.austin.arm.com [10.118.12.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 83C3C3F5A0; Thu, 29 Nov 2018 12:32:27 -0800 (PST) From: Dharmik Thakkar To: byron.marohn@intel.com, pablo.de.lara.guarch@intel.com, bruce.richardson@intel.com, rsanford@akamai.com Cc: dev@dpdk.org, Dharmik Thakkar Date: Thu, 29 Nov 2018 14:31:10 -0600 Message-Id: <20181129203112.12222-2-dharmik.thakkar@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129203112.12222-1-dharmik.thakkar@arm.com> References: <20181129203112.12222-1-dharmik.thakkar@arm.com> Subject: [dpdk-dev] [PATCH 1/3] test/hash: replace macro with log-level approach 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" Need to set hash log type to debug to print debug information, using following eal parameter: --log-type=hash,8 Suggested-by: Thomas Monjalon Signed-off-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Phil Yang --- test/test/test_hash.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/test/test_hash.c b/test/test/test_hash.c index fe607fadf262..67b8e54bdf13 100644 --- a/test/test/test_hash.c +++ b/test/test/test_hash.c @@ -80,14 +80,13 @@ static uint32_t pseudo_hash(__attribute__((unused)) const void *keys, return 3; } -#define UNIT_TEST_HASH_VERBOSE 0 /* * Print out result of unit test hash operation. */ static void print_key_info(const char *msg, const struct flow_key *key, int32_t pos) { - if (UNIT_TEST_HASH_VERBOSE) { + if (rte_log_get_level(RTE_LOGTYPE_HASH) == RTE_LOG_DEBUG) { const uint8_t *p = (const uint8_t *)key; unsigned int i; From patchwork Thu Nov 29 20:31:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dharmik Thakkar X-Patchwork-Id: 48423 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 BD4301B523; Thu, 29 Nov 2018 21:32:32 +0100 (CET) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 00ED21B4F7 for ; Thu, 29 Nov 2018 21:32:28 +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 4058AEBD; Thu, 29 Nov 2018 12:32:28 -0800 (PST) Received: from 2p2660v4-1.austin.arm.com (2p2660v4-1.austin.arm.com [10.118.12.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DFFEB3F5A0; Thu, 29 Nov 2018 12:32:27 -0800 (PST) From: Dharmik Thakkar To: byron.marohn@intel.com, pablo.de.lara.guarch@intel.com, bruce.richardson@intel.com, rsanford@akamai.com Cc: dev@dpdk.org, Dharmik Thakkar Date: Thu, 29 Nov 2018 14:31:11 -0600 Message-Id: <20181129203112.12222-3-dharmik.thakkar@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129203112.12222-1-dharmik.thakkar@arm.com> References: <20181129203112.12222-1-dharmik.thakkar@arm.com> Subject: [dpdk-dev] [PATCH 2/3] test/efd: 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 enables compilation of print_key_info() always using log-level based approach instead of a macro. Need to set efd log type to debug to print debug information, using the following eal parameter: --log-type=efd,8 Suggested-by: Thomas Monjalon Signed-off-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Phil Yang --- test/test/test_efd.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/test/test/test_efd.c b/test/test/test_efd.c index ced091aab63d..3b6f9db13565 100644 --- a/test/test/test_efd.c +++ b/test/test/test_efd.c @@ -34,28 +34,20 @@ struct flow_key { /* * Print out result of unit test efd operation. */ -#if defined(UNIT_TEST_EFD_VERBOSE) - static void print_key_info(const char *msg, const struct flow_key *key, efd_value_t val) { - const uint8_t *p = (const uint8_t *) key; - unsigned int i; + if (rte_log_get_level(RTE_LOGTYPE_EFD) == RTE_LOG_DEBUG) { + const uint8_t *p = (const uint8_t *) key; + unsigned int i; - printf("%s key:0x", msg); - for (i = 0; i < sizeof(struct flow_key); i++) - printf("%02X", p[i]); - - printf(" @ val %d\n", val); -} -#else + printf("%s key:0x", msg); + for (i = 0; i < sizeof(struct flow_key); i++) + printf("%02X", p[i]); -static void print_key_info(__attribute__((unused)) const char *msg, - __attribute__((unused)) const struct flow_key *key, - __attribute__((unused)) efd_value_t val) -{ + printf(" @ val %d\n", val); + } } -#endif /* Keys used by unit test functions */ static struct flow_key keys[5] = { From patchwork Thu Nov 29 20:31:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dharmik Thakkar X-Patchwork-Id: 48424 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 A87E91B52B; Thu, 29 Nov 2018 21:32:34 +0100 (CET) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 743C51B4F7 for ; Thu, 29 Nov 2018 21:32:29 +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 9D01D1596; Thu, 29 Nov 2018 12:32:28 -0800 (PST) Received: from 2p2660v4-1.austin.arm.com (2p2660v4-1.austin.arm.com [10.118.12.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4822D3F5A0; Thu, 29 Nov 2018 12:32:28 -0800 (PST) From: Dharmik Thakkar To: byron.marohn@intel.com, pablo.de.lara.guarch@intel.com, bruce.richardson@intel.com, rsanford@akamai.com Cc: dev@dpdk.org, Dharmik Thakkar Date: Thu, 29 Nov 2018 14:31:12 -0600 Message-Id: <20181129203112.12222-4-dharmik.thakkar@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129203112.12222-1-dharmik.thakkar@arm.com> References: <20181129203112.12222-1-dharmik.thakkar@arm.com> Subject: [dpdk-dev] [PATCH 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=timer,8 Suggested-by: Thomas Monjalon Signed-off-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Phil Yang --- test/test/test_timer_racecond.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/test/test/test_timer_racecond.c b/test/test/test_timer_racecond.c index d29048eaf1bf..5ac248b2d90b 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 @@ -70,13 +68,12 @@ 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 + if (rte_log_get_level(RTE_LOGTYPE_TIMER) == RTE_LOG_DEBUG) { + if (tim == &timer[0]) + printf("------------------------------------------------\n"); + printf("%s: core %u timer %lu\n", __func__, + rte_lcore_id(), tim - timer); + } (void)reload_timer(tim); } @@ -96,10 +93,10 @@ 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_lcore_id(), tim - timer); -#endif + if (rte_log_get_level(RTE_LOGTYPE_TIMER) == RTE_LOG_DEBUG) { + printf("- core %u failed to reset timer %lu (OK)\n", + rte_lcore_id(), tim - timer); + } RTE_PER_LCORE(n_reset_collisions) += 1; } return ret;