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 56AAAA0597; Fri, 17 Apr 2020 23:59:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B07341EBC8; Fri, 17 Apr 2020 23:58:16 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 9005A1EB87 for ; Fri, 17 Apr 2020 23:58:05 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215805euoutp01a34841abf5c3604d2b879ac6d0c5f949~Gujv3Cmlh2759027590euoutp01j for ; Fri, 17 Apr 2020 21:58:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215805euoutp01a34841abf5c3604d2b879ac6d0c5f949~Gujv3Cmlh2759027590euoutp01j DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160685; bh=5PYeWBb8w13O/NBKe72u1/QU+tHOagzowElMuwz7tkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l+RCxXKnZyVcR05TkAYrzaMDx5XwBI2OJbT/nHTz17RebP2t3E7GhhPunc0ElqZtx H3RB/jfuQ4W9SYHaKATelcnwgZFWsZi0we8pfuumWP0XF6Syy3RlbmpWMPP/abv9ls 2lFBwc/cTOXicToUSBrqQyS0H9ATj+ElT/arDiUg= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215804eucas1p1456e404647d136844ed35189a2865ce2~GujvFccl40152001520eucas1p11; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 6E.5E.60698.C662A9E5; Fri, 17 Apr 2020 22:58:04 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200417215804eucas1p2c04d6f2141be07b25f0d346c73d4f965~GujuyCM5n1849618496eucas1p2s; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200417215804eusmtrp28fcd73a77a3048e642067e0096dd709f~GujuxdUXi2952229522eusmtrp2j; Fri, 17 Apr 2020 21:58:04 +0000 (GMT) X-AuditID: cbfec7f5-a0fff7000001ed1a-b4-5e9a266ce96f Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 1D.94.08375.C662A9E5; Fri, 17 Apr 2020 22:58:04 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215803eusmtip2ceec5b26286ea27fe6cb8f206dfbeb1f~GujuSP3EB0325203252eusmtip2s; Fri, 17 Apr 2020 21:58:03 +0000 (GMT) From: Lukasz Wojciechowski To: Bruce Richardson , Vladimir Medvedkin , Thomas Monjalon Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:31 +0200 Message-Id: <20200417215739.23180-10-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+NgFnrCIsWRmVeSWpSXmKPExsWy7djP87o5arPiDO71KlrcWGVv8e7TdiaL Tw9OsFg8verpwOLxa8FSVo/Fe14yeRy7OY09gDmKyyYlNSezLLVI3y6BK+PfuftsBZ/4K9q2 dbM0MH7h6WLk5JAQMJHovfKCpYuRi0NIYAWjxJEny6GcL4wSy/ZMY4VwPjNKHJy1iRGmZdWV JjaIxHJGieUT9yFUXZu0mA2kik3AVuLIzK9gCRGBXkaJk3MPM4EkmAUEJB7fe8YKYgsLeEos b/gB1sAioCqx5Nh/sBW8Am4SW2avZYZYJy+xesMBMJsTKL705XdGkKESAifYJJrWLmWHKHKR mH9/OiuELSzx6vgWqLiMxP+d85kgGrYxSlz9/ROqez+jxPXeFVBV1hKH//0GOoMD6DxNifW7 9CHCjhJ/fhxiAglLCPBJ3HgrCPEAn8SkbdOZIcK8Eh1tQhDVehJPe6Yywqz9s/YJC4TtIfHw fgM0hGYySrxZP41lAqP8LIRlCxgZVzGKp5YW56anFhvnpZbrFSfmFpfmpesl5+duYgTG/el/ x7/uYNz3J+kQowAHoxIPr0HPzDgh1sSy4srcQ4wSHMxKIrwH3YBCvCmJlVWpRfnxRaU5qcWH GKU5WJTEeY0XvYwVEkhPLEnNTk0tSC2CyTJxcEo1MFaFaS9l/DRf4Znqy9nTuneZlzCWni4R Eda8qV3LGSo4zcPA0Hin6D7N1I/zWc8ruhyVcXh4ze/ZWXkVvh62b+9lS0JPCJ6fwnFWZOai vHmG3SqPdpguulAce22vwYSf9avPbLjr4hlvmOv4QzV099T3F+NXH7PLXBz97LvTacsdZVM1 Zlo1MCuxFGckGmoxFxUnAgCs8rL79wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrELMWRmVeSWpSXmKPExsVy+t/xe7o5arPiDDpvcFncWGVv8e7TdiaL Tw9OsFg8verpwOLxa8FSVo/Fe14yeRy7OY09gDlKz6Yov7QkVSEjv7jEVina0MJIz9DSQs/I xFLP0Ng81srIVEnfziYlNSezLLVI3y5BL+PfuftsBZ/4K9q2dbM0MH7h6WLk5JAQMJFYdaWJ DcQWEljKKPFwI3sXIwdQXEbiwyUBiBJhiT/XuoBKuIBKPjJK9F74zgiSYBOwlTgy8ysrSEJE oJ9R4vfng2AJZgEBicf3nrGC2MICnhLLG36ALWARUJVYcuw/WA2vgJvEltlrmSE2yEus3nAA zOYEii99CbFASMBV4uHDU+wTGPkWMDKsYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECAy/bcd+ bt7BeGlj8CFGAQ5GJR5eg56ZcUKsiWXFlbmHGCU4mJVEeA+6AYV4UxIrq1KL8uOLSnNSiw8x mgIdNZFZSjQ5HxgbeSXxhqaG5haWhubG5sZmFkrivB0CB2OEBNITS1KzU1MLUotg+pg4OKUa GCeK/7JlEjCNnsO96ZbOnfuBv/+eOL7rcIViQcbN/WaG844a7HWXv2adde/JzNf1kXKtOf4X QyTPOl7avJD/n8Ghe+oLj6Wu01L5Jz/51sq7P2fcE340a4HvkXl18w/yMx7L8uEzeru4ch/X HclVv5unf73aGe7HufUTx+kH4porzPwXnVnMeChEiaU4I9FQi7moOBEAhmodG1UCAAA= X-CMS-MailID: 20200417215804eucas1p2c04d6f2141be07b25f0d346c73d4f965 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20200417215804eucas1p2c04d6f2141be07b25f0d346c73d4f965 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215804eucas1p2c04d6f2141be07b25f0d346c73d4f965 References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 09/17] lpm: 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_LPM_DEBUG. The old define is completely removed from source code and config. Application of the flag in tests was also adjusted. Signed-off-by: Lukasz Wojciechowski --- app/test/test_lpm.c | 2 +- config/common_base | 1 - lib/librte_lpm/rte_lpm.c | 2 +- lib/librte_lpm/rte_lpm.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c index 3a3fd097f..339999e04 100644 --- a/app/test/test_lpm.c +++ b/app/test/test_lpm.c @@ -234,7 +234,7 @@ test4(void) int32_t test5(void) { -#if defined(RTE_LIBRTE_LPM_DEBUG) +#ifdef RTE_DEBUG struct rte_lpm *lpm = NULL; struct rte_lpm_config config; diff --git a/config/common_base b/config/common_base index 44a9ab75c..310d5ab24 100644 --- a/config/common_base +++ b/config/common_base @@ -933,7 +933,6 @@ CONFIG_RTE_LIBRTE_FIB=y # Compile librte_lpm # CONFIG_RTE_LIBRTE_LPM=y -CONFIG_RTE_LIBRTE_LPM_DEBUG=n # # Compile librte_acl diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c index 268756419..0907cf11c 100644 --- a/lib/librte_lpm/rte_lpm.c +++ b/lib/librte_lpm/rte_lpm.c @@ -40,7 +40,7 @@ enum valid_flag { }; /* Macro to enable/disable run-time checks. */ -#if defined(RTE_LIBRTE_LPM_DEBUG) +#ifdef RTE_DEBUG #include #define VERIFY_DEPTH(depth) do { \ if ((depth == 0) || (depth > RTE_LPM_MAX_DEPTH)) \ diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h index b9d49ac87..350fa6bc8 100644 --- a/lib/librte_lpm/rte_lpm.h +++ b/lib/librte_lpm/rte_lpm.h @@ -48,7 +48,7 @@ extern "C" { RTE_LPM_TBL8_GROUP_NUM_ENTRIES) /** @internal Macro to enable/disable run-time checks. */ -#if defined(RTE_LIBRTE_LPM_DEBUG) +#ifdef RTE_DEBUG #define RTE_LPM_RETURN_IF_TRUE(cond, retval) do { \ if (cond) return (retval); \ } while (0) -- 2.17.1