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

Revert "AK: Get rid of make_singleton function"

Browse source 
This reverts commit 5a98e329d1.
This commit is contained in:
Andreas Kling 2020-08-22 16:34:14 +02:00
parent 8a21491d86
commit 68580d5a8d
31 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AK/FlyString.cpp
View file

@ -48,7 +48,7 @@ struct FlyStringImplTraits : public AK::Traits<StringImpl*> {
} }
}; };
static AK::Singleton<HashTable<StringImpl*, FlyStringImplTraits>> s_table; static auto s_table = make_singleton<HashTable<StringImpl*, FlyStringImplTraits>>();
static HashTable<StringImpl*, FlyStringImplTraits>& fly_impls() static HashTable<StringImpl*, FlyStringImplTraits>& fly_impls()
{ {

25
AK/Singleton.h
View file

@ -39,18 +39,9 @@
namespace AK { namespace AK {
template<typename T> template<typename T, T* (*InitFunction)()>
struct SingletonInstanceCreator {
static T* create()
{
return new T();
}
};
template<typename T, T* (*InitFunction)() = SingletonInstanceCreator<T>::create>
class Singleton { class Singleton {
AK_MAKE_NONCOPYABLE(Singleton); AK_MAKE_NONCOPYABLE(Singleton);
AK_MAKE_NONMOVABLE(Singleton);
public: public:
Singleton() = default; Singleton() = default;
@ -119,4 +110,18 @@ private:
mutable T* m_obj { nullptr }; // atomic mutable T* m_obj { nullptr }; // atomic
}; };
template<typename T>
struct SingletonInstanceCreator {
static T* create()
{
return new T();
}
};
template<typename T>
inline Singleton<T, SingletonInstanceCreator<T>::create> make_singleton()
{
return Singleton<T, SingletonInstanceCreator<T>::create>();
}
} }

3
Kernel/CommandLine.cpp
View file

@ -38,7 +38,6 @@ const CommandLine& kernel_command_line()
void CommandLine::initialize(const String& string) void CommandLine::initialize(const String& string)
{ {
ASSERT(!s_the);
s_the = new CommandLine(string); s_the = new CommandLine(string);
} }
@ -46,7 +45,7 @@ CommandLine::CommandLine(const String& string)
: m_string(string) : m_string(string)
{ {
s_the = this; s_the = this;
klog() << "CommandLine: " << string;
for (auto str : m_string.split(' ')) { for (auto str : m_string.split(' ')) {
if (str == "") { if (str == "") {
continue; continue;

2
Kernel/Console.cpp
View file

@ -33,7 +33,7 @@
// Bytes output to 0xE9 end up on the Bochs console. It's very handy. // Bytes output to 0xE9 end up on the Bochs console. It's very handy.
#define CONSOLE_OUT_TO_E9 #define CONSOLE_OUT_TO_E9
static AK::Singleton<Console> s_the; static auto s_the = AK::make_singleton<Console>();
static Kernel::SpinLock g_console_lock; static Kernel::SpinLock g_console_lock;
void Console::initialize() void Console::initialize()

2
Kernel/Devices/BXVGADevice.cpp
View file

@ -57,7 +57,7 @@ namespace Kernel {
#define VBE_DISPI_ENABLED 0x01 #define VBE_DISPI_ENABLED 0x01
#define VBE_DISPI_LFB_ENABLED 0x40 #define VBE_DISPI_LFB_ENABLED 0x40
static AK::Singleton<BXVGADevice> s_the; static auto s_the = AK::make_singleton<BXVGADevice>();
void BXVGADevice::initialize() void BXVGADevice::initialize()
{ {

2
Kernel/Devices/Device.cpp
View file

@ -31,7 +31,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<HashMap<u32, Device*>> s_all_devices; static auto s_all_devices = AK::make_singleton<HashMap<u32, Device*>>();
HashMap<u32, Device*>& Device::all_devices() HashMap<u32, Device*>& Device::all_devices()
{ {

2
Kernel/Devices/KeyboardDevice.cpp
View file

@ -336,7 +336,7 @@ void KeyboardDevice::handle_irq(const RegisterState&)
} }
} }
static AK::Singleton<KeyboardDevice> s_the; static auto s_the = AK::make_singleton<KeyboardDevice>();
void KeyboardDevice::initialize() void KeyboardDevice::initialize()
{ {

2
Kernel/Devices/NullDevice.cpp
View file

@ -30,7 +30,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<NullDevice> s_the; static auto s_the = AK::make_singleton<NullDevice>();
void NullDevice::initialize() void NullDevice::initialize()
{ {

2
Kernel/Devices/PATAChannel.cpp
View file

@ -108,7 +108,7 @@ namespace Kernel {
#define PCI_Mass_Storage_Class 0x1 #define PCI_Mass_Storage_Class 0x1
#define PCI_IDE_Controller_Subclass 0x1 #define PCI_IDE_Controller_Subclass 0x1
static AK::Singleton<Lock> s_pata_lock; static auto s_pata_lock = AK::make_singleton<Lock>();
static Lock& s_lock() static Lock& s_lock()
{ {

2
Kernel/Devices/PS2MouseDevice.cpp
View file

@ -57,7 +57,7 @@ namespace Kernel {
//#define PS2MOUSE_DEBUG //#define PS2MOUSE_DEBUG
static AK::Singleton<PS2MouseDevice> s_the; static auto s_the = AK::make_singleton<PS2MouseDevice>();
PS2MouseDevice::PS2MouseDevice() PS2MouseDevice::PS2MouseDevice()
: IRQHandler(IRQ_MOUSE) : IRQHandler(IRQ_MOUSE)

2
Kernel/Devices/SB16.cpp
View file

@ -77,7 +77,7 @@ void SB16::set_sample_rate(uint16_t hz)
dsp_write((u8)hz); dsp_write((u8)hz);
} }
static AK::Singleton<SB16> s_the; static auto s_the = AK::make_singleton<SB16>();
SB16::SB16() SB16::SB16()
: IRQHandler(SB16_DEFAULT_IRQ) : IRQHandler(SB16_DEFAULT_IRQ)

2
Kernel/Devices/VMWareBackdoor.cpp
View file

@ -111,7 +111,7 @@ private:
OwnPtr<VMWareBackdoor> m_backdoor; OwnPtr<VMWareBackdoor> m_backdoor;
}; };
static AK::Singleton<VMWareBackdoorDetector> s_vmware_backdoor; static auto s_vmware_backdoor = AK::make_singleton<VMWareBackdoorDetector>();
VMWareBackdoor* VMWareBackdoor::the() VMWareBackdoor* VMWareBackdoor::the()
{ {

2
Kernel/FileSystem/DevPtsFS.cpp
View file

@ -46,7 +46,7 @@ DevPtsFS::~DevPtsFS()
{ {
} }
static AK::Singleton<HashTable<unsigned>> s_ptys; static auto s_ptys = AK::make_singleton<HashTable<unsigned>>();
bool DevPtsFS::initialize() bool DevPtsFS::initialize()
{ {

2
Kernel/FileSystem/FIFO.cpp
View file

@ -38,7 +38,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<Lockable<HashTable<FIFO*>>> s_table; static auto s_table = AK::make_singleton<Lockable<HashTable<FIFO*>>>();
static Lockable<HashTable<FIFO*>>& all_fifos() static Lockable<HashTable<FIFO*>>& all_fifos()
{ {

2
Kernel/FileSystem/FileSystem.cpp
View file

@ -38,7 +38,7 @@
namespace Kernel { namespace Kernel {
static u32 s_lastFileSystemID; static u32 s_lastFileSystemID;
static AK::Singleton<HashMap<u32, FS*>> s_fs_map; static auto s_fs_map = AK::make_singleton<HashMap<u32, FS*>>();
static HashMap<u32, FS*>& all_fses() static HashMap<u32, FS*>& all_fses()
{ {

2
Kernel/FileSystem/Inode.cpp
View file

@ -39,7 +39,7 @@
namespace Kernel { namespace Kernel {
static SpinLock s_all_inodes_lock; static SpinLock s_all_inodes_lock;
static AK::Singleton<InlineLinkedList<Inode>> s_list; static auto s_list = AK::make_singleton<InlineLinkedList<Inode>>();
InlineLinkedList<Inode>& Inode::all_with_lock() InlineLinkedList<Inode>& Inode::all_with_lock()
{ {

2
Kernel/FileSystem/VirtualFileSystem.cpp
View file

@ -41,7 +41,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<VFS> s_the; static auto s_the = AK::make_singleton<VFS>();
static constexpr int symlink_recursion_limit { 5 }; // FIXME: increase? static constexpr int symlink_recursion_limit { 5 }; // FIXME: increase?
static constexpr int root_mount_flags = MS_NODEV | MS_NOSUID | MS_RDONLY; static constexpr int root_mount_flags = MS_NODEV | MS_NOSUID | MS_RDONLY;

2
Kernel/Interrupts/APIC.cpp
View file

@ -69,7 +69,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<APIC> s_apic; static auto s_apic = AK::make_singleton<APIC>();
class APICIPIInterruptHandler final : public GenericInterruptHandler { class APICIPIInterruptHandler final : public GenericInterruptHandler {
public: public:

2
Kernel/Net/IPv4Socket.cpp
View file

@ -46,7 +46,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<Lockable<HashTable<IPv4Socket*>>> s_table; static auto s_table = AK::make_singleton<Lockable<HashTable<IPv4Socket*>>>();
Lockable<HashTable<IPv4Socket*>>& IPv4Socket::all_sockets() Lockable<HashTable<IPv4Socket*>>& IPv4Socket::all_sockets()
{ {

2
Kernel/Net/LocalSocket.cpp
View file

@ -38,7 +38,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<Lockable<InlineLinkedList<LocalSocket>>> s_list; static auto s_list = AK::make_singleton<Lockable<InlineLinkedList<LocalSocket>>>();
Lockable<InlineLinkedList<LocalSocket>>& LocalSocket::all_sockets() Lockable<InlineLinkedList<LocalSocket>>& LocalSocket::all_sockets()
{ {

2
Kernel/Net/LoopbackAdapter.cpp
View file

@ -29,7 +29,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<LoopbackAdapter> s_loopback; static auto s_loopback = AK::make_singleton<LoopbackAdapter>();
LoopbackAdapter& LoopbackAdapter::the() LoopbackAdapter& LoopbackAdapter::the()
{ {

2
Kernel/Net/NetworkAdapter.cpp
View file

@ -38,7 +38,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<Lockable<HashTable<NetworkAdapter*>>> s_table; static auto s_table = AK::make_singleton<Lockable<HashTable<NetworkAdapter*>>>();
static Lockable<HashTable<NetworkAdapter*>>& all_adapters() static Lockable<HashTable<NetworkAdapter*>>& all_adapters()
{ {

2
Kernel/Net/Routing.cpp
View file

@ -34,7 +34,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<Lockable<HashMap<IPv4Address, MACAddress>>> s_arp_table; static auto s_arp_table = AK::make_singleton<Lockable<HashMap<IPv4Address, MACAddress>>>();
Lockable<HashMap<IPv4Address, MACAddress>>& arp_table() Lockable<HashMap<IPv4Address, MACAddress>>& arp_table()
{ {

4
Kernel/Net/TCPSocket.cpp
View file

@ -63,14 +63,14 @@ void TCPSocket::set_state(State new_state)
} }
} }
static AK::Singleton<Lockable<HashMap<IPv4SocketTuple, RefPtr<TCPSocket>>>> s_socket_closing; static auto s_socket_closing = AK::make_singleton<Lockable<HashMap<IPv4SocketTuple, RefPtr<TCPSocket>>>>();
Lockable<HashMap<IPv4SocketTuple, RefPtr<TCPSocket>>>& TCPSocket::closing_sockets() Lockable<HashMap<IPv4SocketTuple, RefPtr<TCPSocket>>>& TCPSocket::closing_sockets()
{ {
return *s_socket_closing; return *s_socket_closing;
} }
static AK::Singleton<Lockable<HashMap<IPv4SocketTuple, TCPSocket*>>> s_socket_tuples; static auto s_socket_tuples = AK::make_singleton<Lockable<HashMap<IPv4SocketTuple, TCPSocket*>>>();
Lockable<HashMap<IPv4SocketTuple, TCPSocket*>>& TCPSocket::sockets_by_tuple() Lockable<HashMap<IPv4SocketTuple, TCPSocket*>>& TCPSocket::sockets_by_tuple()
{ {

2
Kernel/Net/UDPSocket.cpp
View file

@ -42,7 +42,7 @@ void UDPSocket::for_each(Function<void(const UDPSocket&)> callback)
callback(*it.value); callback(*it.value);
} }
static AK::Singleton<Lockable<HashMap<u16, UDPSocket*>>> s_map; static auto s_map = AK::make_singleton<Lockable<HashMap<u16, UDPSocket*>>>();
Lockable<HashMap<u16, UDPSocket*>>& UDPSocket::sockets_by_port() Lockable<HashMap<u16, UDPSocket*>>& UDPSocket::sockets_by_port()
{ {

2
Kernel/Random.cpp
View file

@ -33,7 +33,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<KernelRng> s_the; static auto s_the = AK::make_singleton<KernelRng>();
KernelRng& KernelRng::the() KernelRng& KernelRng::the()
{ {

2
Kernel/SharedBuffer.cpp
View file

@ -30,7 +30,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<Lockable<HashMap<int, NonnullOwnPtr<SharedBuffer>>>> s_map; static auto s_map = AK::make_singleton<Lockable<HashMap<int, NonnullOwnPtr<SharedBuffer>>>>();
Lockable<HashMap<int, NonnullOwnPtr<SharedBuffer>>>& shared_buffers() Lockable<HashMap<int, NonnullOwnPtr<SharedBuffer>>>& shared_buffers()
{ {

2
Kernel/TTY/PTYMultiplexer.cpp
View file

@ -36,7 +36,7 @@
namespace Kernel { namespace Kernel {
static const unsigned s_max_pty_pairs = 8; static const unsigned s_max_pty_pairs = 8;
static AK::Singleton<PTYMultiplexer> s_the; static auto s_the = AK::make_singleton<PTYMultiplexer>();
PTYMultiplexer& PTYMultiplexer::the() PTYMultiplexer& PTYMultiplexer::the()
{ {

2
Kernel/Time/TimeManagement.cpp
View file

@ -40,7 +40,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<TimeManagement> s_the; static auto s_the = AK::make_singleton<TimeManagement>();
TimeManagement& TimeManagement::the() TimeManagement& TimeManagement::the()
{ {

2
Kernel/TimerQueue.cpp
View file

@ -34,7 +34,7 @@
namespace Kernel { namespace Kernel {
static AK::Singleton<TimerQueue> s_the; static auto s_the = AK::make_singleton<TimerQueue>();
TimerQueue& TimerQueue::the() TimerQueue& TimerQueue::the()
{ {

2
Kernel/VM/PageDirectory.cpp
View file

@ -38,7 +38,7 @@ static const FlatPtr userspace_range_base = 0x00800000;
static const FlatPtr userspace_range_ceiling = 0xbe000000; static const FlatPtr userspace_range_ceiling = 0xbe000000;
static const FlatPtr kernelspace_range_base = 0xc0800000; static const FlatPtr kernelspace_range_base = 0xc0800000;
static AK::Singleton<HashMap<u32, PageDirectory*>> s_cr3_map; static auto s_cr3_map = AK::make_singleton<HashMap<u32, PageDirectory*>>();
static HashMap<u32, PageDirectory*>& cr3_map() static HashMap<u32, PageDirectory*>& cr3_map()
{ {