From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, bruce.richardson@intel.com,
ktraynor@redhat.com, "Morten Brørup" <mb@smartsharesystems.com>,
"Mattias Rönnblom" <mattias.ronnblom@ericsson.com>,
"Tyler Retzlaff" <roretzla@linux.microsoft.com>
Subject: [PATCH v2 2/4] bitset: fix build for GCC without experimental API
Date: Wed, 16 Oct 2024 13:38:14 +0200 [thread overview]
Message-ID: <20241016113817.3956187-3-david.marchand@redhat.com> (raw)
In-Reply-To: <20241016113817.3956187-1-david.marchand@redhat.com>
For a reason similar to the change on bitops header, hide bitset
implementation relying on experimental API.
Fixes: 99a1197647d8 ("eal: add bitset type")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
lib/eal/include/rte_bitset.h | 123 +++++++++++++++++++++++++++++++++++
1 file changed, 123 insertions(+)
diff --git a/lib/eal/include/rte_bitset.h b/lib/eal/include/rte_bitset.h
index 74c643a72a..8ae8425fc2 100644
--- a/lib/eal/include/rte_bitset.h
+++ b/lib/eal/include/rte_bitset.h
@@ -255,7 +255,13 @@ __rte_experimental
static inline bool
rte_bitset_test(const uint64_t *bitset, size_t bit_num)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __RTE_BITSET_DELEGATE(rte_bit_test, bitset, bit_num);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ return false;
+#endif
}
/**
@@ -277,7 +283,12 @@ __rte_experimental
static inline void
rte_bitset_set(uint64_t *bitset, size_t bit_num)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE(rte_bit_set, bitset, bit_num);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+#endif
}
/**
@@ -299,7 +310,12 @@ __rte_experimental
static inline void
rte_bitset_clear(uint64_t *bitset, size_t bit_num)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE(rte_bit_clear, bitset, bit_num);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+#endif
}
/**
@@ -323,7 +339,13 @@ __rte_experimental
static inline void
rte_bitset_assign(uint64_t *bitset, size_t bit_num, bool bit_value)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_assign, bitset, bit_num, bit_value);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(bit_value);
+#endif
}
/**
@@ -345,7 +367,12 @@ __rte_experimental
static inline void
rte_bitset_flip(uint64_t *bitset, size_t bit_num)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE(rte_bit_flip, bitset, bit_num);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+#endif
}
/**
@@ -370,7 +397,14 @@ __rte_experimental
static inline bool
rte_bitset_atomic_test(const uint64_t *bitset, size_t bit_num, int memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __RTE_BITSET_DELEGATE_N(rte_bit_atomic_test, bitset, bit_num, memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(memory_order);
+ return false;
+#endif
}
/**
@@ -399,7 +433,13 @@ __rte_experimental
static inline void
rte_bitset_atomic_set(uint64_t *bitset, size_t bit_num, int memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_atomic_set, bitset, bit_num, memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(memory_order);
+#endif
}
/**
@@ -428,7 +468,13 @@ __rte_experimental
static inline void
rte_bitset_atomic_clear(uint64_t *bitset, size_t bit_num, int memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_atomic_clear, bitset, bit_num, memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(memory_order);
+#endif
}
/**
@@ -459,7 +505,14 @@ __rte_experimental
static inline void
rte_bitset_atomic_assign(uint64_t *bitset, size_t bit_num, bool bit_value, int memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_atomic_assign, bitset, bit_num, bit_value, memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(bit_value);
+ RTE_SET_USED(memory_order);
+#endif
}
/**
@@ -488,7 +541,13 @@ __rte_experimental
static inline void
rte_bitset_atomic_flip(uint64_t *bitset, size_t bit_num, int memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_atomic_flip, bitset, bit_num, memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(memory_order);
+#endif
}
/**
@@ -524,7 +583,12 @@ __rte_experimental
static inline void
rte_bitset_clear_all(uint64_t *bitset, size_t size)
{
+#ifdef ALLOW_EXPERIMENTAL_API
rte_bitset_init(bitset, size);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+#endif
}
/**
@@ -576,7 +640,13 @@ __rte_experimental
static inline size_t
rte_bitset_count_clear(const uint64_t *bitset, size_t size)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return size - rte_bitset_count_set(bitset, size);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ return 0;
+#endif
}
#define __RTE_BITSET_FIND_FLAG_FIND_CLEAR (1U << 0)
@@ -638,6 +708,7 @@ static inline ssize_t
__rte_bitset_find(const uint64_t *bitset, size_t size, size_t start_bit, size_t len,
unsigned int flags)
{
+#ifdef ALLOW_EXPERIMENTAL_API
bool find_clear = flags & __RTE_BITSET_FIND_FLAG_FIND_CLEAR;
bool may_wrap = flags & __RTE_BITSET_FIND_FLAG_WRAP;
bool does_wrap = (start_bit + len) > size;
@@ -658,6 +729,14 @@ __rte_bitset_find(const uint64_t *bitset, size_t size, size_t start_bit, size_t
rc = __rte_bitset_find_nowrap(bitset, size, start_bit, len, find_clear);
return rc;
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ RTE_SET_USED(start_bit);
+ RTE_SET_USED(len);
+ RTE_SET_USED(flags);
+ return 0;
+#endif
}
/**
@@ -681,7 +760,13 @@ __rte_experimental
static inline ssize_t
rte_bitset_find_first_set(const uint64_t *bitset, size_t size)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __rte_bitset_find(bitset, size, 0, size, 0);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ return 0;
+#endif
}
/**
@@ -711,7 +796,15 @@ __rte_experimental
static inline ssize_t
rte_bitset_find_set(const uint64_t *bitset, size_t size, size_t start_bit, size_t len)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __rte_bitset_find(bitset, size, start_bit, len, 0);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ RTE_SET_USED(start_bit);
+ RTE_SET_USED(len);
+ return 0;
+#endif
}
/**
@@ -742,7 +835,15 @@ __rte_experimental
static inline ssize_t
rte_bitset_find_set_wrap(const uint64_t *bitset, size_t size, size_t start_bit, size_t len)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __rte_bitset_find(bitset, size, start_bit, len, __RTE_BITSET_FIND_FLAG_WRAP);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ RTE_SET_USED(start_bit);
+ RTE_SET_USED(len);
+ return 0;
+#endif
}
/**
@@ -766,7 +867,13 @@ __rte_experimental
static inline ssize_t
rte_bitset_find_first_clear(const uint64_t *bitset, size_t size)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __rte_bitset_find(bitset, size, 0, size, __RTE_BITSET_FIND_FLAG_FIND_CLEAR);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ return 0;
+#endif
}
/**
@@ -796,7 +903,15 @@ __rte_experimental
static inline ssize_t
rte_bitset_find_clear(const uint64_t *bitset, size_t size, size_t start_bit, size_t len)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __rte_bitset_find(bitset, size, start_bit, len, __RTE_BITSET_FIND_FLAG_FIND_CLEAR);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ RTE_SET_USED(start_bit);
+ RTE_SET_USED(len);
+ return 0;
+#endif
}
/**
@@ -827,8 +942,16 @@ __rte_experimental
static inline ssize_t
rte_bitset_find_clear_wrap(const uint64_t *bitset, size_t size, size_t start_bit, size_t len)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __rte_bitset_find(bitset, size, start_bit, len,
__RTE_BITSET_FIND_FLAG_FIND_CLEAR | __RTE_BITSET_FIND_FLAG_WRAP);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ RTE_SET_USED(start_bit);
+ RTE_SET_USED(len);
+ return 0;
+#endif
}
/**
--
2.46.2
next prev parent reply other threads:[~2024-10-16 11:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-15 12:10 [PATCH 0/3] Enhance headers check David Marchand
2024-10-15 12:10 ` [PATCH 1/3] bitops: fix build for GCC without experimental API David Marchand
2024-10-15 12:47 ` Morten Brørup
2024-10-15 12:10 ` [PATCH 2/3] bitset: " David Marchand
2024-10-15 12:53 ` Morten Brørup
2024-10-15 14:13 ` Thomas Monjalon
2024-10-15 14:44 ` Morten Brørup
2024-10-15 19:58 ` Thomas Monjalon
2024-10-15 20:30 ` Morten Brørup
2024-10-15 12:10 ` [PATCH 3/3] buildtools/chkincs: check headers with stable API only David Marchand
2024-10-16 11:38 ` [PATCH v2 0/4] Enhance headers check David Marchand
2024-10-16 11:38 ` [PATCH v2 1/4] bitops: fix build for GCC without experimental API David Marchand
2024-10-16 11:38 ` David Marchand [this message]
2024-10-16 14:14 ` [PATCH v2 2/4] bitset: " Mattias Rönnblom
2024-10-16 15:36 ` David Marchand
2024-10-16 15:42 ` Morten Brørup
2024-10-16 16:03 ` Mattias Rönnblom
2024-10-16 16:17 ` Thomas Monjalon
2024-10-16 15:51 ` Mattias Rönnblom
2024-10-16 11:38 ` [PATCH v2 3/4] vhost: remove internal vDPA API description from public header David Marchand
2024-10-16 11:47 ` Maxime Coquelin
2024-10-16 11:38 ` [PATCH v2 4/4] buildtools/chkincs: check headers with stable API only David Marchand
2024-10-16 20:40 ` [PATCH v2 0/4] Enhance headers check David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241016113817.3956187-3-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=ktraynor@redhat.com \
--cc=mattias.ronnblom@ericsson.com \
--cc=mb@smartsharesystems.com \
--cc=roretzla@linux.microsoft.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).