From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 757A2A0597; Fri, 17 Apr 2020 23:58:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4B1181EB8B; Fri, 17 Apr 2020 23:58:07 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id 3E5D21EB78 for ; Fri, 17 Apr 2020 23:58:02 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215802euoutp023e6d656487f309042b92634a3a2dfd28~GujsuSF5X0278302783euoutp02V for ; Fri, 17 Apr 2020 21:58:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200417215802euoutp023e6d656487f309042b92634a3a2dfd28~GujsuSF5X0278302783euoutp02V DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160682; bh=99T0Lx9giDczyfTuMIjRaCtdi3qOObhMVVvSDAGHzoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pub0pyGS0Ifgec+S5F30BHPSbysiH6/lG2gLr3F6bYd0xwg1H0Eyy9OSQpDTApLhc gLWimkUdLBpl9CBQfi86F+3IPFqOskpu0wUFK8wWqfSzZkonXrVqrqcXX96jtwxa99 gbCAwDuX/TonIGSQDN5vrI8b6Hml/Dx0iK1auwkk= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200417215801eucas1p2f38173356244971ef79b5f4d06419abb~GujsGQKgJ1681616816eucas1p2l; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 5C.FF.61286.9662A9E5; Fri, 17 Apr 2020 22:58:01 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215800eucas1p2f3a71aaf69584fc37c9c4a47c3a2d39d~GujrbUiyK1701917019eucas1p2c; Fri, 17 Apr 2020 21:58:00 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215800eusmtrp2ade5d3a062d3828ababb52dff0f70032~Gujraz_we2952229522eusmtrp2g; Fri, 17 Apr 2020 21:58:00 +0000 (GMT) X-AuditID: cbfec7f2-f0bff7000001ef66-54-5e9a266939d4 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 1C.94.08375.8662A9E5; Fri, 17 Apr 2020 22:58:00 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215800eusmtip2a8c97addc943df9ff5fa9b052f325756~Gujq4YZa50325203252eusmtip2n; Fri, 17 Apr 2020 21:57:59 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Nikhil Rao , Jerin Jacob , Erik Gabriel Carrillo Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:26 +0200 Message-Id: <20200417215739.23180-5-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsWy7djP87qZarPiDC5PE7V492k7k8WPb/2s Fr3nZzNavD30m9Xi04MTLA6sHr8WLGX1WLznJZPH5IUXmT2O3ZzGHsASxWWTkpqTWZZapG+X wJWxduZX9oL3WhXL195haWB8qtLFyMkhIWAi8fzmGTYQW0hgBaPEkX6JLkYuIPsLo0TXzgNs EM5nRom1kyexwHRMmnsXKrGcUeJV5wuodqCqB/2KIDabgK3EkZlfWUGKRASWMkq07v7GDpJg FhCQeHzvGSuILSwQIDF56lJmEJtFQFXi6fknjCA2r4CrxNbn01ghtslLrN5wAKyGU8BNYunL 74wgQyUEHrNJvDjfAHWSi8ShcwfZIWxhiVfHt0DZMhL/d85ngmjYxihx9fdPqO79jBLXe1dA VVlLHP73G+gHDqDzNCXW79KHCDtKdE44xwISlhDgk7jxVhDiAT6JSdumM0OEeSU62oQgqvUk nvZMZYRZ+2ftE6jTPCTOztzFDAmtmYwSe86eZpvAKD8LYdkCRsZVjOKppcW56anFhnmp5XrF ibnFpXnpesn5uZsYgang9L/jn3Ywfr2UdIhRgINRiYfXoGdmnBBrYllxZe4hRgkOZiUR3oNu QCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8xotexgoJpCeWpGanphakFsFkmTg4pRoY65bOMNO9 p6DAaf0pTCZ15gWp7w4ldqqR7f1R61v2TDb7x64+IS4o08r5zimjEhd9o/ICD64LU5JDdf58 uyrbHM9ge5bJyjeYMbF2flNyWhMvl/UE7tTUxWkX5pnkXmb6qlTaquzH2rqt3tvja8jrecsv 5ph9ufJQLOpM5n/7za+6/674sEiJpTgj0VCLuag4EQB0so//AQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHLMWRmVeSWpSXmKPExsVy+t/xe7oZarPiDO58ULF492k7k8WPb/2s Fr3nZzNavD30m9Xi04MTLA6sHr8WLGX1WLznJZPH5IUXmT2O3ZzGHsASpWdTlF9akqqQkV9c YqsUbWhhpGdoaaFnZGKpZ2hsHmtlZKqkb2eTkpqTWZZapG+XoJexduZX9oL3WhXL195haWB8 qtLFyMkhIWAiMWnuXbYuRi4OIYGljBKfNz5n72LkAErISHy4JABRIyzx51oXG4gtJPCRUeL1 xVgQm03AVuLIzK+sIL0iAssZJc4fuMAMkmAWEJB4fO8ZK4gtLOAn8eDQe7A4i4CqxNPzTxhB bF4BV4mtz6exQiyQl1i94QBYDaeAm8TSl98ZIZa5Sjx8eIp9AiPfAkaGVYwiqaXFuem5xYZ6 xYm5xaV56XrJ+bmbGIFhue3Yz807GC9tDD7EKMDBqMTDa9AzM06INbGsuDL3EKMEB7OSCO9B N6AQb0piZVVqUX58UWlOavEhRlOgoyYyS4km5wNjJq8k3tDU0NzC0tDc2NzYzEJJnLdD4GCM kEB6YklqdmpqQWoRTB8TB6dUA2OSDLdC/svVl/ICN/887r3/Z9X+i/077ilMPdXj8l/vzYPd Rk9PxUupRPHLRVUwZ5w5GC4uVhuuxHZpzszTh36+W21ht8fp2dIt7mkfPA6c7paVyRG+Zuuv nrpBc8oLxeqFy23W/LjQ7HAqTP30dj+JJZ+2cBvmLDJaI/sjLrnoROX3Oz6336cqsRRnJBpq MRcVJwIAjPoVmGECAAA= X-CMS-MailID: 20200417215800eucas1p2f3a71aaf69584fc37c9c4a47c3a2d39d X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20200417215800eucas1p2f3a71aaf69584fc37c9c4a47c3a2d39d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215800eucas1p2f3a71aaf69584fc37c9c4a47c3a2d39d References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 04/17] eventdev: replace library debug flag with global one 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" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_EVENTDEV_DEBUG. The old define is completely removed from source code and config. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - lib/librte_eventdev/rte_event_eth_tx_adapter.h | 2 +- lib/librte_eventdev/rte_event_timer_adapter.c | 6 +++--- lib/librte_eventdev/rte_event_timer_adapter.h | 6 +++--- lib/librte_eventdev/rte_eventdev.h | 4 ++-- lib/librte_eventdev/rte_eventdev_pmd.h | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/config/common_base b/config/common_base index 16a8f09b6..96d5031d9 100644 --- a/config/common_base +++ b/config/common_base @@ -722,7 +722,6 @@ CONFIG_RTE_LIBRTE_PMD_ZLIB=n # Compile generic event device library # CONFIG_RTE_LIBRTE_EVENTDEV=y -CONFIG_RTE_LIBRTE_EVENTDEV_DEBUG=n CONFIG_RTE_EVENT_MAX_DEVS=16 CONFIG_RTE_EVENT_MAX_QUEUES_PER_DEV=64 CONFIG_RTE_EVENT_TIMER_ADAPTER_NUM_MAX=32 diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/librte_eventdev/rte_event_eth_tx_adapter.h index 93b717af9..de13ca7f0 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.h +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.h @@ -357,7 +357,7 @@ rte_event_eth_tx_adapter_enqueue(uint8_t dev_id, { const struct rte_eventdev *dev = &rte_eventdevs[dev_id]; -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) { rte_errno = EINVAL; diff --git a/lib/librte_eventdev/rte_event_timer_adapter.c b/lib/librte_eventdev/rte_event_timer_adapter.c index 161e21a68..02c27b91e 100644 --- a/lib/librte_eventdev/rte_event_timer_adapter.c +++ b/lib/librte_eventdev/rte_event_timer_adapter.c @@ -43,7 +43,7 @@ static const struct rte_event_timer_adapter_ops swtim_ops; #define EVTIM_LOG_ERR(...) EVTIM_LOG(ERR, evtim_logtype, __VA_ARGS__) -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG #define EVTIM_LOG_DBG(...) \ EVTIM_LOG(DEBUG, evtim_logtype, __VA_ARGS__) #define EVTIM_BUF_LOG_DBG(...) \ @@ -1008,7 +1008,7 @@ __swtim_arm_burst(const struct rte_event_timer_adapter *adapter, struct rte_timer *tim, *tims[nb_evtims]; uint64_t cycles; -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG /* Check that the service is running. */ if (rte_service_runstate_get(adapter->data->service_id) != 1) { rte_errno = EINVAL; @@ -1114,7 +1114,7 @@ swtim_cancel_burst(const struct rte_event_timer_adapter *adapter, uint64_t opaque; struct swtim *sw = swtim_pmd_priv(adapter); -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG /* Check that the service is running. */ if (rte_service_runstate_get(adapter->data->service_id) != 1) { rte_errno = EINVAL; diff --git a/lib/librte_eventdev/rte_event_timer_adapter.h b/lib/librte_eventdev/rte_event_timer_adapter.h index 7f6dc5c29..8e7e2b0e3 100644 --- a/lib/librte_eventdev/rte_event_timer_adapter.h +++ b/lib/librte_eventdev/rte_event_timer_adapter.h @@ -575,7 +575,7 @@ rte_event_timer_arm_burst(const struct rte_event_timer_adapter *adapter, struct rte_event_timer **evtims, uint16_t nb_evtims) { -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG ADAPTER_VALID_OR_ERR_RET(adapter, -EINVAL); FUNC_PTR_OR_ERR_RET(adapter->arm_burst, -EINVAL); #endif @@ -618,7 +618,7 @@ rte_event_timer_arm_tmo_tick_burst( const uint64_t timeout_ticks, const uint16_t nb_evtims) { -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG ADAPTER_VALID_OR_ERR_RET(adapter, -EINVAL); FUNC_PTR_OR_ERR_RET(adapter->arm_tmo_tick_burst, -EINVAL); #endif @@ -651,7 +651,7 @@ rte_event_timer_cancel_burst(const struct rte_event_timer_adapter *adapter, struct rte_event_timer **evtims, uint16_t nb_evtims) { -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG ADAPTER_VALID_OR_ERR_RET(adapter, -EINVAL); FUNC_PTR_OR_ERR_RET(adapter->cancel_burst, -EINVAL); #endif diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h index 226f352ad..cb237fdd0 100644 --- a/lib/librte_eventdev/rte_eventdev.h +++ b/lib/librte_eventdev/rte_eventdev.h @@ -1332,7 +1332,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, { const struct rte_eventdev *dev = &rte_eventdevs[dev_id]; -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) { rte_errno = EINVAL; return 0; @@ -1609,7 +1609,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[], { struct rte_eventdev *dev = &rte_eventdevs[dev_id]; -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) { rte_errno = EINVAL; return 0; diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h index d118b9e5b..090cb4309 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd.h +++ b/lib/librte_eventdev/rte_eventdev_pmd.h @@ -34,7 +34,7 @@ extern "C" { RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,))) -#ifdef RTE_LIBRTE_EVENTDEV_DEBUG +#ifdef RTE_DEBUG #define RTE_EDEV_LOG_DEBUG(...) \ RTE_LOG(DEBUG, EVENTDEV, \ RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ -- 2.17.1