All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev,
	linux-bcachefs@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Kuan-Wei Chiu <visitorckw@gmail.com>
Subject: [PATCH v3 13/17] lib min_heap: Update min_heap_push() to use min_heap_sift_up()
Date: Sun,  7 Apr 2024 00:47:23 +0800	[thread overview]
Message-ID: <20240406164727.577914-14-visitorckw@gmail.com> (raw)
In-Reply-To: <20240406164727.577914-1-visitorckw@gmail.com>

Update min_heap_push() to use min_heap_sift_up() rather than its origin
inline version.

Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
---
 include/linux/min_heap.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h
index 3086612d7cd5..fe037eb5952e 100644
--- a/include/linux/min_heap.h
+++ b/include/linux/min_heap.h
@@ -190,7 +190,6 @@ bool __min_heap_push(min_heap_char *heap, const void *element, size_t elem_size,
 		const struct min_heap_callbacks *func, void *args)
 {
 	void *data = heap->data;
-	void *child, *parent;
 	int pos;
 
 	if (WARN_ONCE(heap->nr >= heap->size, "Pushing on a full heap"))
@@ -202,13 +201,7 @@ bool __min_heap_push(min_heap_char *heap, const void *element, size_t elem_size,
 	heap->nr++;
 
 	/* Sift child at pos up. */
-	for (; pos > 0; pos = (pos - 1) / 2) {
-		child = data + (pos * elem_size);
-		parent = data + ((pos - 1) / 2) * elem_size;
-		if (func->less(parent, child, args))
-			break;
-		func->swp(parent, child, args);
-	}
+	__min_heap_sift_up(heap, elem_size, pos, func, args);
 
 	return true;
 }
-- 
2.34.1


  parent reply	other threads:[~2024-04-06 16:48 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-06 16:47 [PATCH v3 00/17] treewide: Refactor heap related implementation Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 01/17] perf/core: Fix several typos Kuan-Wei Chiu
2024-04-06 17:30   ` Randy Dunlap
2024-04-06 16:47 ` [PATCH v3 02/17] bcache: Fix typo Kuan-Wei Chiu
2024-04-06 17:31   ` Randy Dunlap
2024-04-06 16:47 ` [PATCH v3 03/17] bcachefs: " Kuan-Wei Chiu
2024-04-06 17:31   ` Randy Dunlap
2024-04-06 16:47 ` [PATCH v3 04/17] lib min_heap: Add type safe interface Kuan-Wei Chiu
2024-04-12  7:30   ` Peter Zijlstra
2024-04-15 17:35     ` Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 05/17] lib min_heap: Add min_heap_init() Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 06/17] lib min_heap: Add min_heap_peek() Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 07/17] lib min_heap: Add min_heap_full() Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 08/17] lib min_heap: Add args for min_heap_callbacks Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 09/17] lib min_heap: Add min_heap_sift_up() Kuan-Wei Chiu
2024-04-07 19:10   ` Ian Rogers
2024-04-06 16:47 ` [PATCH v3 10/17] lib min_heap: Add min_heap_del() Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 11/17] lib min_heap: Update min_heap_push() and min_heap_pop() to return bool values Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 12/17] lib min_heap: Rename min_heapify() to min_heap_sift_down() Kuan-Wei Chiu
2024-04-06 16:47 ` Kuan-Wei Chiu [this message]
2024-04-07 19:11   ` [PATCH v3 13/17] lib min_heap: Update min_heap_push() to use min_heap_sift_up() Ian Rogers
2024-04-06 16:47 ` [PATCH v3 14/17] lib/test_min_heap: Use min_heap_init() for initializing Kuan-Wei Chiu
2024-04-06 16:47 ` [PATCH v3 15/17] lib/test_min_heap: Add test for heap_del() Kuan-Wei Chiu
2024-04-07 19:23   ` Ian Rogers
2024-04-06 16:47 ` [PATCH v3 16/17] bcache: Remove heap-related macros and switch to generic min_heap Kuan-Wei Chiu
2024-04-09  8:00   ` Coly Li
2024-04-09  8:11   ` Coly Li
2024-04-06 16:47 ` [PATCH v3 17/17] bcachefs: " Kuan-Wei Chiu
2024-04-09  3:40 ` [PATCH v3 00/17] treewide: Refactor heap related implementation Kent Overstreet
2024-04-09  8:17   ` Coly Li
2024-04-22 20:20 ` Kent Overstreet
2024-04-23  9:35   ` 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=20240406164727.577914-14-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.