fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-27 03:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Switch singletons to use new Singleton class

Browse Source 
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:
Tom
2020-08-24 19:35:19 -06:00
committed by Andreas Kling
parent ba6e4fb77f
commit d89582880e
46 changed files with 221 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Kernel/FileSystem/FileSystem.cpp
View File

@@ -26,6 +26,7 @@
#include <AK/Assertions.h>
#include <AK/HashMap.h>
#include <AK/Singleton.h>
#include <AK/StringBuilder.h>
#include <AK/StringView.h>
#include <Kernel/FileSystem/FileSystem.h>
@@ -37,12 +38,10 @@
namespace Kernel {
static u32 s_lastFileSystemID;
static HashMap<u32, FS*>* s_fs_map;
static AK::Singleton<HashMap<u32, FS*>> s_fs_map;
static HashMap<u32, FS*>& all_fses()
{
if (!s_fs_map)
s_fs_map = new HashMap<u32, FS*>();
return *s_fs_map;
}