From patchwork Tue Feb 26 23:02:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dharmik Thakkar X-Patchwork-Id: 50532 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 C0F0C3253; Wed, 27 Feb 2019 00:03:10 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 6A68A2BB8 for ; Wed, 27 Feb 2019 00:03:07 +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 BB55DEBD; Tue, 26 Feb 2019 15:03:06 -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 797EB3F738; Tue, 26 Feb 2019 15:03:06 -0800 (PST) From: Dharmik Thakkar To: Bruce Richardson , Pablo de Lara Cc: dev@dpdk.org, Dharmik Thakkar Date: Tue, 26 Feb 2019 17:02:27 -0600 Message-Id: <20190226230229.25450-2-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 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-level=test.hash: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_hash.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/test/test/test_hash.c b/test/test/test_hash.c index fe607fadf262..390fbef87f42 100644 --- a/test/test/test_hash.c +++ b/test/test/test_hash.c @@ -69,6 +69,8 @@ struct flow_key { uint8_t proto; } __attribute__((packed)); +int hash_logtype_test; + /* * Hash function that always returns the same value, to easily test what * happens when a bucket is full. @@ -80,22 +82,24 @@ static uint32_t pseudo_hash(__attribute__((unused)) const void *keys, return 3; } -#define UNIT_TEST_HASH_VERBOSE 0 +RTE_INIT(test_hash_init_log) +{ + hash_logtype_test = rte_log_register("test.hash"); +} + /* * 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) { - 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(" @ pos %d\n", pos); - } + const uint8_t *p = (const uint8_t *)key; + unsigned int i; + + rte_log(RTE_LOG_DEBUG, hash_logtype_test, "%s key:0x", msg); + for (i = 0; i < sizeof(struct flow_key); i++) + rte_log(RTE_LOG_DEBUG, hash_logtype_test, "%02X", p[i]); + rte_log(RTE_LOG_DEBUG, hash_logtype_test, " @ pos %d\n", pos); } /* Keys used by unit test functions */ From patchwork Tue Feb 26 23:02:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dharmik Thakkar X-Patchwork-Id: 50533 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 CB6913572; Wed, 27 Feb 2019 00:03:12 +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 C21A627D for ; Wed, 27 Feb 2019 00:03:07 +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 2A35A169E; 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 DCD603F738; Tue, 26 Feb 2019 15:03:06 -0800 (PST) From: Dharmik Thakkar To: Byron Marohn , Pablo de Lara Guarch Cc: dev@dpdk.org, Dharmik Thakkar Date: Tue, 26 Feb 2019 17:02:28 -0600 Message-Id: <20190226230229.25450-3-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 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-level=test.efd: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_efd.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/test/test/test_efd.c b/test/test/test_efd.c index ced091aab63d..93e8f1cbb8bd 100644 --- a/test/test/test_efd.c +++ b/test/test/test_efd.c @@ -31,31 +31,29 @@ struct flow_key { uint16_t port_dst; uint8_t proto; } __attribute__((packed)); + +int efd_logtype_test; + +RTE_INIT(test_efd_init_log) +{ + efd_logtype_test = rte_log_register("test.efd"); +} + /* * 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; - printf("%s key:0x", msg); + rte_log(RTE_LOG_DEBUG, efd_logtype_test, "%s key:0x", msg); for (i = 0; i < sizeof(struct flow_key); i++) - printf("%02X", p[i]); + rte_log(RTE_LOG_DEBUG, efd_logtype_test, "%02X", p[i]); - printf(" @ val %d\n", val); + rte_log(RTE_LOG_DEBUG, efd_logtype_test, " @ val %d\n", val); } -#else - -static void print_key_info(__attribute__((unused)) const char *msg, - __attribute__((unused)) const struct flow_key *key, - __attribute__((unused)) efd_value_t val) -{ -} -#endif /* Keys used by unit test functions */ static struct flow_key keys[5] = { 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;