oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/IntrusiveHashSet: remove_and_dispose() returns number of removed elements

Browse Source
This commit is contained in:
Max Kellermann 2023-08-02 15:01:17 +02:00 committed by Max Kellermann
parent 250fa8c732
commit 9691b609a2
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/util/IntrusiveHashSet.hxx
View File

@ -191,30 +191,44 @@ public:
counter.reset(); counter.reset();
} }
void remove_and_dispose_if(std::predicate<const_reference> auto pred, /**
* Remove and dispose all items matching the given predicate.
*
* @return the number of removed items
*/
std::size_t remove_and_dispose_if(std::predicate<const_reference> auto pred,
Disposer<value_type> auto disposer) noexcept { Disposer<value_type> auto disposer) noexcept {
std::size_t n = 0;
for (auto &bucket : table) for (auto &bucket : table)
counter -= bucket.remove_and_dispose_if(pred, disposer); n += bucket.remove_and_dispose_if(pred, disposer);
counter -= n;
return n;
} }
/** /**
* Remove and dispose all items with the specified key. * Remove and dispose all items with the specified key.
*
* @return the number of removed items
*/ */
constexpr void remove_and_dispose_key(const auto &key, constexpr std::size_t remove_and_dispose_key(const auto &key,
Disposer<value_type> auto disposer) noexcept { Disposer<value_type> auto disposer) noexcept {
auto &bucket = GetBucket(key); auto &bucket = GetBucket(key);
counter -= bucket.remove_and_dispose_if([this, &key](const auto &item){ std::size_t n = bucket.remove_and_dispose_if([this, &key](const auto &item){
return ops.equal(key, item); return ops.equal(key, item);
}, disposer); }, disposer);
counter -= n;
return n;
} }
constexpr void remove_and_dispose_key_if(const auto &key, constexpr std::size_t remove_and_dispose_key_if(const auto &key,
std::predicate<const_reference> auto pred, std::predicate<const_reference> auto pred,
Disposer<value_type> auto disposer) noexcept { Disposer<value_type> auto disposer) noexcept {
auto &bucket = GetBucket(key); auto &bucket = GetBucket(key);
counter -= bucket.remove_and_dispose_if([this, &key, &pred](const auto &item){ std::size_t n = bucket.remove_and_dispose_if([this, &key, &pred](const auto &item){
return ops.equal(key, item) && pred(item); return ops.equal(key, item) && pred(item);
}, disposer); }, disposer);
counter -= n;
return n;
} }
[[nodiscard]] [[nodiscard]]