From: SrinivasaBharathKanta <61141011+SrinivasaBharath@users.noreply.github.com> Date: Mon, 10 Feb 2025 10:48:24 +0000 (+0530) Subject: Merge pull request #60359 from MaxKellermann/Dispatcher__marrival_simplified X-Git-Tag: v20.0.0~212 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7fb3888efcaa9cbbac1c898545bcf20183aa8a1;p=ceph.git Merge pull request #60359 from MaxKellermann/Dispatcher__marrival_simplified msg/Dispatcher: simplify and optimize the `marrival` tree --- f7fb3888efcaa9cbbac1c898545bcf20183aa8a1 diff --cc src/msg/DispatchQueue.cc index 4694bdff5871,841479503189..5aac94c183f9 --- a/src/msg/DispatchQueue.cc +++ b/src/msg/DispatchQueue.cc @@@ -87,13 -87,14 +87,14 @@@ void DispatchQueue::enqueue(const ref_t return; } ldout(cct,20) << "queue " << m << " prio " << priority << dendl; - add_arrival(m); + QueueItem item{m}; + add_arrival(item); if (priority >= CEPH_MSG_PRIO_LOW) { - mqueue.enqueue_strict(id, priority, QueueItem(m)); + mqueue.enqueue_strict(id, priority, std::move(item)); } else { - mqueue.enqueue(id, priority, m->get_cost(), QueueItem(m)); + mqueue.enqueue(id, priority, m->get_cost(), std::move(item)); } - cond.notify_all(); + cond.notify_one(); } void DispatchQueue::local_delivery(const ref_t& m, int priority)