mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 19:37:35 +00:00
Kernel: Switch singletons to use new Singleton class
MemoryManager cannot use the Singleton class because MemoryManager::initialize is called before the global constructors are run. That caused the Singleton to be re-initialized, causing it to create another MemoryManager instance. Fixes #3226
This commit is contained in:
parent
ba6e4fb77f
commit
d89582880e
46 changed files with 221 additions and 170 deletions
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include <AK/Assertions.h>
|
||||
#include <AK/Memory.h>
|
||||
#include <AK/Singleton.h>
|
||||
#include <AK/StringView.h>
|
||||
#include <AK/Types.h>
|
||||
#include <Kernel/ACPI/Parser.h>
|
||||
|
@ -68,7 +69,7 @@
|
|||
|
||||
namespace Kernel {
|
||||
|
||||
static APIC* s_apic;
|
||||
static AK::Singleton<APIC> s_apic;
|
||||
|
||||
class APICIPIInterruptHandler final : public GenericInterruptHandler {
|
||||
public:
|
||||
|
@ -132,7 +133,7 @@ private:
|
|||
|
||||
bool APIC::initialized()
|
||||
{
|
||||
return (s_apic != nullptr);
|
||||
return s_apic.is_initialized();
|
||||
}
|
||||
|
||||
APIC& APIC::the()
|
||||
|
@ -144,7 +145,7 @@ APIC& APIC::the()
|
|||
void APIC::initialize()
|
||||
{
|
||||
ASSERT(!APIC::initialized());
|
||||
s_apic = new APIC();
|
||||
s_apic.ensure_instance();
|
||||
}
|
||||
|
||||
PhysicalAddress APIC::get_base()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue