diff --git a/Kernel/Devices/AsyncDeviceRequest.cpp b/Kernel/Devices/AsyncDeviceRequest.cpp index 25977d1ee5..ad421389eb 100644 --- a/Kernel/Devices/AsyncDeviceRequest.cpp +++ b/Kernel/Devices/AsyncDeviceRequest.cpp @@ -49,10 +49,13 @@ AsyncDeviceRequest::~AsyncDeviceRequest() // sub-requests should be completed (either succeeded, failed, or cancelled). // Which means there should be no more pending sub-requests and the // entire AsyncDeviceRequest hierarchy should be immutable. - for (auto& sub_request : m_sub_requests_complete) { - VERIFY(is_completed_result(sub_request.m_result)); // Shouldn't need any locking anymore - VERIFY(sub_request.m_parent_request == this); - sub_request.m_parent_request = nullptr; + while (!m_sub_requests_complete.is_empty()) { + // Note: sub_request is ref-counted, and we use this specific pattern + // to allow make sure the refcount is dropped properly. + auto sub_request = m_sub_requests_complete.take_first(); + VERIFY(is_completed_result(sub_request->m_result)); // Shouldn't need any locking anymore + VERIFY(sub_request->m_parent_request == this); + sub_request->m_parent_request = nullptr; } } @@ -104,24 +107,19 @@ void AsyncDeviceRequest::sub_request_finished(AsyncDeviceRequest& sub_request) { ScopedSpinLock lock(m_lock); VERIFY(m_result == Started); - size_t index; - for (index = 0; index < m_sub_requests_pending.size(); index++) { - if (&m_sub_requests_pending[index] == &sub_request) { - NonnullRefPtr request(m_sub_requests_pending[index]); - m_sub_requests_pending.remove(index); - m_sub_requests_complete.append(move(request)); - break; - } + + if (m_sub_requests_pending.contains(sub_request)) { + // Note: append handles removing from any previous intrusive list internally. + m_sub_requests_complete.append(sub_request); } - VERIFY(index < m_sub_requests_pending.size()); + all_completed = m_sub_requests_pending.is_empty(); if (all_completed) { // Aggregate any errors bool any_failures = false; bool any_memory_faults = false; - for (index = 0; index < m_sub_requests_complete.size(); index++) { - auto& sub_request = m_sub_requests_complete[index]; - auto sub_result = sub_request.get_request_result(); + for (auto& com_sub_request : m_sub_requests_complete) { + auto sub_result = com_sub_request.get_request_result(); VERIFY(is_completed_result(sub_result)); switch (sub_result) { case Failure: diff --git a/Kernel/Devices/AsyncDeviceRequest.h b/Kernel/Devices/AsyncDeviceRequest.h index 8084f5b971..9c49ecfad1 100644 --- a/Kernel/Devices/AsyncDeviceRequest.h +++ b/Kernel/Devices/AsyncDeviceRequest.h @@ -26,7 +26,8 @@ #pragma once -#include +#include +#include #include #include #include @@ -160,8 +161,12 @@ private: AsyncDeviceRequest* m_parent_request { nullptr }; RequestResult m_result { Pending }; - NonnullRefPtrVector m_sub_requests_pending; - NonnullRefPtrVector m_sub_requests_complete; + IntrusiveListNode> m_list_node; + + typedef IntrusiveList, &AsyncDeviceRequest::m_list_node> AsyncDeviceSubRequestList; + + AsyncDeviceSubRequestList m_sub_requests_pending; + AsyncDeviceSubRequestList m_sub_requests_complete; WaitQueue m_queue; NonnullRefPtr m_process; void* m_private { nullptr };