From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id E63B87D52 for ; Wed, 14 Nov 2018 13:12:05 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Nov 2018 04:12:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,232,1539673200"; d="scan'208";a="89211251" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga007.jf.intel.com with ESMTP; 14 Nov 2018 04:12:02 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id wAECC2SV024243; Wed, 14 Nov 2018 12:12:02 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id wAECC1Es031847; Wed, 14 Nov 2018 12:12:01 GMT Received: (from aburakov@localhost) by sivswdev01.ir.intel.com with LOCAL id wAECBr01031788; Wed, 14 Nov 2018 12:11:53 GMT From: Anatoly Burakov To: dev@dpdk.org Cc: Neil Horman , John McNamara , Marko Kovacevic , Cristian Dumitrescu , thomas@monjalon.net, bruce.richardson@intel.com, ferruh.yigit@intel.com, jasvinder.singh@intel.com Date: Wed, 14 Nov 2018 12:11:53 +0000 Message-Id: <9eb826f80f19422153d5a0ab611fb467a94eded0.1542197039.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] bitmap: deprecate rte_bsf64 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: , X-List-Received-Date: Wed, 14 Nov 2018 12:12:06 -0000 The rte_bsf64 in rte_bitmap.h has a global namespace but does not follow convention of existing rte_bsf32 function in rte_common.h. Therefore, deprecate the current rte_bsf64 and introduce a new rte_bitmap_bsf64 function that will do the same thing. In later release cycles, rte_bsf64 will be removed from rte_bitmap.h and a proper rte_bsf64 implementation will be added to rte_common.h. Signed-off-by: Anatoly Burakov --- doc/guides/rel_notes/deprecation.rst | 5 +++++ lib/librte_eal/common/include/rte_bitmap.h | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 34b28234c..63793979d 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -22,6 +22,11 @@ Deprecation Notices + ``rte_eal_devargs_type_count`` +* eal: function ``rte_bsf64`` in ``rte_bitmap.h`` has been renamed to + ``rte_bitmap_bsf64``, and a new ``rte_bsf64`` function will be added in + release 19.05 in ``rte_common.h`` that follows convention set by existing + ``rte_bsf32`` function. + * pci: Several exposed functions are misnamed. The following functions are deprecated starting from v17.11 and are replaced: diff --git a/lib/librte_eal/common/include/rte_bitmap.h b/lib/librte_eal/common/include/rte_bitmap.h index 7a36ce73c..fd4f0aa78 100644 --- a/lib/librte_eal/common/include/rte_bitmap.h +++ b/lib/librte_eal/common/include/rte_bitmap.h @@ -100,7 +100,7 @@ __rte_bitmap_index2_set(struct rte_bitmap *bmp) #if RTE_BITMAP_OPTIMIZATIONS static inline int -rte_bsf64(uint64_t slab, uint32_t *pos) +rte_bitmap_bsf64(uint64_t slab, uint32_t *pos) { if (likely(slab == 0)) { return 0; @@ -113,7 +113,7 @@ rte_bsf64(uint64_t slab, uint32_t *pos) #else static inline int -rte_bsf64(uint64_t slab, uint32_t *pos) +rte_bitmap_bsf64(uint64_t slab, uint32_t *pos) { uint64_t mask; uint32_t i; @@ -134,6 +134,12 @@ rte_bsf64(uint64_t slab, uint32_t *pos) #endif +static inline int __rte_deprecated +rte_bsf64(uint64_t slab, uint32_t *pos) +{ + return rte_bitmap_bsf64(slab, pos); +} + static inline uint32_t __rte_bitmap_get_memory_footprint(uint32_t n_bits, uint32_t *array1_byte_offset, uint32_t *array1_slabs, @@ -439,9 +445,8 @@ __rte_bitmap_scan_search(struct rte_bitmap *bmp) value1 = bmp->array1[bmp->index1]; value1 &= __rte_bitmap_mask1_get(bmp); - if (rte_bsf64(value1, &bmp->offset1)) { + if (rte_bitmap_bsf64(value1, &bmp->offset1)) return 1; - } __rte_bitmap_index1_inc(bmp); bmp->offset1 = 0; @@ -450,9 +455,8 @@ __rte_bitmap_scan_search(struct rte_bitmap *bmp) for (i = 0; i < bmp->array1_size; i ++, __rte_bitmap_index1_inc(bmp)) { value1 = bmp->array1[bmp->index1]; - if (rte_bsf64(value1, &bmp->offset1)) { + if (rte_bitmap_bsf64(value1, &bmp->offset1)) return 1; - } } return 0; -- 2.17.1