RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:27:44 +00:00
Code Issues Activity Actions

Kernel: Use IntrusiveList for keeping track of GenericInterruptHandlers

Browse source
This commit is contained in:
Andreas Kling 2021-07-21 20:21:29 +02:00
parent a9f76b8270
commit 79745507a9
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Interrupts/GenericInterruptHandler.h
View file

@ -6,8 +6,7 @@
#pragma once #pragma once
#include <AK/HashTable.h> #include <AK/IntrusiveList.h>
#include <AK/String.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/x86/RegisterState.h> #include <Kernel/Arch/x86/RegisterState.h>
@ -65,5 +64,10 @@ private:
u8 m_interrupt_number { 0 }; u8 m_interrupt_number { 0 };
bool m_disable_remap { false }; bool m_disable_remap { false };
bool m_registered { false }; bool m_registered { false };
IntrusiveListNode<GenericInterruptHandler> m_list_node;
public:
using List = IntrusiveList<GenericInterruptHandler, RawPtr<GenericInterruptHandler>, &GenericInterruptHandler::m_list_node>;
}; };
} }

18
Kernel/Interrupts/SharedIRQHandler.cpp
View file

@ -24,13 +24,13 @@ UNMAP_AFTER_INIT void SharedIRQHandler::initialize(u8 interrupt_number)
void SharedIRQHandler::register_handler(GenericInterruptHandler& handler) void SharedIRQHandler::register_handler(GenericInterruptHandler& handler)
{ {
dbgln_if(INTERRUPT_DEBUG, "Interrupt Handler registered @ Shared Interrupt Handler {}", interrupt_number()); dbgln_if(INTERRUPT_DEBUG, "Interrupt Handler registered @ Shared Interrupt Handler {}", interrupt_number());
m_handlers.set(&handler); m_handlers.append(handler);
enable_interrupt_vector(); enable_interrupt_vector();
} }
void SharedIRQHandler::unregister_handler(GenericInterruptHandler& handler) void SharedIRQHandler::unregister_handler(GenericInterruptHandler& handler)
{ {
dbgln_if(INTERRUPT_DEBUG, "Interrupt Handler unregistered @ Shared Interrupt Handler {}", interrupt_number()); dbgln_if(INTERRUPT_DEBUG, "Interrupt Handler unregistered @ Shared Interrupt Handler {}", interrupt_number());
m_handlers.remove(&handler); m_handlers.remove(handler);
if (m_handlers.is_empty()) if (m_handlers.is_empty())
disable_interrupt_vector(); disable_interrupt_vector();
} }
@ -44,9 +44,8 @@ bool SharedIRQHandler::eoi()
void SharedIRQHandler::enumerate_handlers(Function<void(GenericInterruptHandler&)>& callback) void SharedIRQHandler::enumerate_handlers(Function<void(GenericInterruptHandler&)>& callback)
{ {
for (auto* handler : m_handlers) { for (auto& handler : m_handlers) {
VERIFY(handler); callback(handler);
callback(*handler);
} }
} }
@ -69,15 +68,14 @@ bool SharedIRQHandler::handle_interrupt(const RegisterState& regs)
if constexpr (INTERRUPT_DEBUG) { if constexpr (INTERRUPT_DEBUG) {
dbgln("Interrupt @ {}", interrupt_number()); dbgln("Interrupt @ {}", interrupt_number());
dbgln("Interrupt Handlers registered - {}", m_handlers.size()); dbgln("Interrupt Handlers registered - {}", m_handlers.size_slow());
} }
int i = 0; int i = 0;
bool was_handled = false; bool was_handled = false;
for (auto* handler : m_handlers) { for (auto& handler : m_handlers) {
dbgln_if(INTERRUPT_DEBUG, "Going for Interrupt Handling @ {}, Shared Interrupt {}", i, interrupt_number()); dbgln_if(INTERRUPT_DEBUG, "Going for Interrupt Handling @ {}, Shared Interrupt {}", i, interrupt_number());
VERIFY(handler != nullptr); if (handler.handle_interrupt(regs)) {
if (handler->handle_interrupt(regs)) { handler.increment_invoking_counter();
handler->increment_invoking_counter();
was_handled = true; was_handled = true;
} }
dbgln_if(INTERRUPT_DEBUG, "Going for Interrupt Handling @ {}, Shared Interrupt {} - End", i, interrupt_number()); dbgln_if(INTERRUPT_DEBUG, "Going for Interrupt Handling @ {}, Shared Interrupt {} - End", i, interrupt_number());

5
Kernel/Interrupts/SharedIRQHandler.h
View file

@ -6,7 +6,6 @@
#pragma once #pragma once
#include <AK/HashTable.h>
#include <AK/NonnullOwnPtr.h> #include <AK/NonnullOwnPtr.h>
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/Types.h> #include <AK/Types.h>
@ -28,7 +27,7 @@ public:
void enumerate_handlers(Function<void(GenericInterruptHandler&)>&); void enumerate_handlers(Function<void(GenericInterruptHandler&)>&);
virtual size_t sharing_devices_count() const override { return m_handlers.size(); } virtual size_t sharing_devices_count() const override { return m_handlers.size_slow(); }
virtual bool is_shared_handler() const override { return true; } virtual bool is_shared_handler() const override { return true; }
virtual bool is_sharing_with_others() const override { return false; } virtual bool is_sharing_with_others() const override { return false; }
@ -41,7 +40,7 @@ private:
void disable_interrupt_vector(); void disable_interrupt_vector();
explicit SharedIRQHandler(u8 interrupt_number); explicit SharedIRQHandler(u8 interrupt_number);
bool m_enabled { true }; bool m_enabled { true };
HashTable<GenericInterruptHandler*> m_handlers; GenericInterruptHandler::List m_handlers;
RefPtr<IRQController> m_responsible_irq_controller; RefPtr<IRQController> m_responsible_irq_controller;
}; };
} }