From: Kuan-Wei Chiu <visitorckw@gmail.com>
To: colyli@suse.de, kent.overstreet@linux.dev, msakai@redhat.com,
peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
namhyung@kernel.org, akpm@linux-foundation.org
Cc: bfoster@redhat.com, mark.rutland@arm.com,
alexander.shishkin@linux.intel.com, jolsa@kernel.org,
irogers@google.com, adrian.hunter@intel.com,
jserv@ccns.ncku.edu.tw, linux-bcache@vger.kernel.org,
dm-devel@lists.linux.dev, linux-bcachefs@vger.kernel.org,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Kuan-Wei Chiu <visitorckw@gmail.com>
Subject: [PATCH 11/13] lib min_heap: Add min_heap_del()
Date: Wed, 20 Mar 2024 02:00:03 +0800 [thread overview]
Message-ID: <20240319180005.246930-12-visitorckw@gmail.com> (raw)
In-Reply-To: <20240319180005.246930-1-visitorckw@gmail.com>
Add min_heap_del() to delete the element at index 'idx' in the heap.
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
---
include/linux/min_heap.h | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h
index 154ac2102114..ce085137fce7 100644
--- a/include/linux/min_heap.h
+++ b/include/linux/min_heap.h
@@ -199,4 +199,28 @@ bool __min_heap_push(struct __min_heap *heap, const void *element, size_t elem_s
#define min_heap_push(_heap, _element, _func, _args) \
__min_heap_push(&(_heap)->heap, _element, __minheap_obj_size(_heap), _func, _args)
+/* Remove ith element from the heap, O(log2(nr)). */
+static __always_inline
+bool __min_heap_del(struct __min_heap *heap, size_t elem_size, size_t idx,
+ const struct min_heap_callbacks *func, void *args)
+{
+ void *data = heap->data;
+
+ if (WARN_ONCE(heap->nr <= 0, "Popping an empty heap"))
+ return false;
+
+ /* Place last element at the root (position 0) and then sift down. */
+ heap->nr--;
+ if (idx == heap->nr)
+ return true;
+ memcpy(data, data + (heap->nr * elem_size), elem_size);
+ __min_heap_sift_up(heap, elem_size, idx, func, args);
+ __min_heapify(heap, idx, elem_size, func, args);
+
+ return true;
+}
+
+#define min_heap_del(_heap, _idx, _func, _args) \
+ __min_heap_del(&(_heap)->heap, __minheap_obj_size(_heap), _idx, _func, _args)
+
#endif /* _LINUX_MIN_HEAP_H */
--
2.34.1
next prev parent reply other threads:[~2024-03-19 18:01 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 17:59 [PATCH 00/13] treewide: Refactor heap related implementation Kuan-Wei Chiu
2024-03-19 17:59 ` [PATCH 01/13] perf/core: Fix several typos Kuan-Wei Chiu
2024-03-19 19:31 ` Ian Rogers
2024-03-19 17:59 ` [PATCH 02/13] bcache: Fix typo Kuan-Wei Chiu
2024-03-19 20:13 ` Ian Rogers
2024-03-19 17:59 ` [PATCH 03/13] bcachefs: " Kuan-Wei Chiu
2024-03-19 20:13 ` Ian Rogers
2024-03-19 17:59 ` [PATCH 04/13] lib min_heap: Add type safe interface Kuan-Wei Chiu
2024-03-19 19:49 ` Ian Rogers
2024-03-19 17:59 ` [PATCH 05/13] lib min_heap: Add min_heap_init() Kuan-Wei Chiu
2024-03-19 19:51 ` Ian Rogers
2024-03-20 2:56 ` Kuan-Wei Chiu
2024-03-19 17:59 ` [PATCH 06/13] lib min_heap: Add min_heap_peek() Kuan-Wei Chiu
2024-03-19 19:55 ` Ian Rogers
2024-03-19 17:59 ` [PATCH 07/13] lib min_heap: Add min_heap_full() Kuan-Wei Chiu
2024-03-19 19:55 ` Ian Rogers
2024-03-19 18:00 ` [PATCH 08/13] lib min_heap: Add args for min_heap_callbacks Kuan-Wei Chiu
2024-03-19 20:05 ` Ian Rogers
2024-03-20 2:49 ` Kuan-Wei Chiu
2024-03-20 4:43 ` Ian Rogers
2024-03-19 18:00 ` [PATCH 09/13] lib min_heap: Update min_heap_push() and min_heap_pop() to return bool values Kuan-Wei Chiu
2024-03-19 19:57 ` Ian Rogers
2024-03-19 18:00 ` [PATCH 10/13] bcache: Remove heap-related macros and switch to generic min_heap Kuan-Wei Chiu
2024-03-19 18:00 ` Kuan-Wei Chiu [this message]
2024-03-19 19:59 ` [PATCH 11/13] lib min_heap: Add min_heap_del() Ian Rogers
2024-03-19 18:00 ` [PATCH 12/13] lib min_heap: Add min_heap_sift_up() Kuan-Wei Chiu
2024-03-19 20:12 ` Ian Rogers
2024-03-20 2:51 ` Kuan-Wei Chiu
2024-03-19 18:00 ` [PATCH 13/13] bcachefs: Remove heap-related macros and switch to generic min_heap Kuan-Wei Chiu
2024-03-19 20:03 ` Ian Rogers
2024-03-20 2:55 ` Kuan-Wei Chiu
2024-03-19 22:12 ` [PATCH 00/13] treewide: Refactor heap related implementation Kent Overstreet
2024-03-20 3:01 ` Kuan-Wei Chiu
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=20240319180005.246930-12-visitorckw@gmail.com \
--to=visitorckw@gmail.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bfoster@redhat.com \
--cc=colyli@suse.de \
--cc=dm-devel@lists.linux.dev \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=jserv@ccns.ncku.edu.tw \
--cc=kent.overstreet@linux.dev \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-bcachefs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=msakai@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/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).