Re: [PATCH] prio-queue: fold lazy_queue into prio_queue for automatic get+put fusion
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 6, 2026, 16:31 UTC
- Message-ID
- <xmqqqzmjbpfp.fsf@gitster.g>
- In-Reply-To
- <pull.2140.git.1780757885582.gitgitgadget@gmail.com>
"Kristofer Karlsson via GitGitGadget" <gitgitgadget@gmail.com> writes:
> Add prio_queue_size() for callers that need the logical element > count, since the physical nr may temporarily include a > pending-removal element.
Many code paths used to learn how many elements it logically has by directly peeking into .nr member of the prio_queue struct. Now they should call this new helper function, and you converted some in this patch.
How can we be sure that all such users of prio_queue has been converted? Are direct references to .nr member, outside of the prio-queue.c implementation, all now suspect?
For example, object-name.c:get_oid_oneline() uses a prio-queue "copy", and loops "while (copy.nr)". In the loop, it calls pop_most_recent_commit(), which does a get followed by put of its parents. If the get become hanging (e.g., root commit, causing no _put() performed in pop_most_recent_commit()), would copy.nr still remain 1 but logically no elements remain in the queue.
There seem to be other direct peeking of .nr member remaining in the code. Perhaps the member should be renamed to catch in-flight topics that add more users of prio-queue that peek into the .nr member, or something like that.