| Message ID | 20240319180005.246930-6-visitorckw@gmail.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Mike Snitzer |
| Headers | show |
| Series | treewide: Refactor heap related implementation | expand |
On Tue, Mar 19, 2024 at 11:00 AM Kuan-Wei Chiu <visitorckw@gmail.com> wrote: > > Add min_heap_init() for initializing heap with data, nr, and size. > > Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com> Should this change update lib/test_min_heap.c to use min_heap_init? Thanks, Ian > --- > include/linux/min_heap.h | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h > index c3635a7fdb88..ed462f194b88 100644 > --- a/include/linux/min_heap.h > +++ b/include/linux/min_heap.h > @@ -44,6 +44,18 @@ struct min_heap_callbacks { > void (*swp)(void *lhs, void *rhs); > }; > > +/* Initialize a min-heap. */ > +static __always_inline > +void __min_heap_init(struct __min_heap *heap, void *data, int size) > +{ > + heap->data = data; > + heap->nr = 0; > + heap->size = size; > +} > + > +#define min_heap_init(_heap, _data, _size) \ > + __min_heap_init(&(_heap)->heap, _data, _size) > + > /* Sift the element at pos down the heap. */ > static __always_inline > void __min_heapify(struct __min_heap *heap, int pos, size_t elem_size, > -- > 2.34.1 >
On Tue, Mar 19, 2024 at 12:51:22PM -0700, Ian Rogers wrote: > On Tue, Mar 19, 2024 at 11:00 AM Kuan-Wei Chiu <visitorckw@gmail.com> wrote: > > > > Add min_heap_init() for initializing heap with data, nr, and size. > > > > Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com> > > Should this change update lib/test_min_heap.c to use min_heap_init? > Sure, will do that in v2. Regards, Kuan-Wei > > > --- > > include/linux/min_heap.h | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h > > index c3635a7fdb88..ed462f194b88 100644 > > --- a/include/linux/min_heap.h > > +++ b/include/linux/min_heap.h > > @@ -44,6 +44,18 @@ struct min_heap_callbacks { > > void (*swp)(void *lhs, void *rhs); > > }; > > > > +/* Initialize a min-heap. */ > > +static __always_inline > > +void __min_heap_init(struct __min_heap *heap, void *data, int size) > > +{ > > + heap->data = data; > > + heap->nr = 0; > > + heap->size = size; > > +} > > + > > +#define min_heap_init(_heap, _data, _size) \ > > + __min_heap_init(&(_heap)->heap, _data, _size) > > + > > /* Sift the element at pos down the heap. */ > > static __always_inline > > void __min_heapify(struct __min_heap *heap, int pos, size_t elem_size, > > -- > > 2.34.1 > >
diff --git a/include/linux/min_heap.h b/include/linux/min_heap.h index c3635a7fdb88..ed462f194b88 100644 --- a/include/linux/min_heap.h +++ b/include/linux/min_heap.h @@ -44,6 +44,18 @@ struct min_heap_callbacks { void (*swp)(void *lhs, void *rhs); }; +/* Initialize a min-heap. */ +static __always_inline +void __min_heap_init(struct __min_heap *heap, void *data, int size) +{ + heap->data = data; + heap->nr = 0; + heap->size = size; +} + +#define min_heap_init(_heap, _data, _size) \ + __min_heap_init(&(_heap)->heap, _data, _size) + /* Sift the element at pos down the heap. */ static __always_inline void __min_heapify(struct __min_heap *heap, int pos, size_t elem_size,
Add min_heap_init() for initializing heap with data, nr, and size. Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com> --- include/linux/min_heap.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)