AK: Get rid of make_singleton function

Just default the InitFunction template argument.
cubiclove · Aug 22, 2020 · 5a98e32 · 5a98e32
1 parent 8a75e0b
commit 5a98e32
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 46 deletions.
diff --git a/AK/FlyString.cpp b/AK/FlyString.cpp
@@ -48,7 +48,7 @@ struct FlyStringImplTraits : public AK::Traits<StringImpl*> {
  }
 };
 
-static auto s_table = make_singleton<HashTable<StringImpl*, FlyStringImplTraits>>();
+static AK::Singleton<HashTable<StringImpl*, FlyStringImplTraits>> s_table;
 
 static HashTable<StringImpl*, FlyStringImplTraits>& fly_impls()
 {

diff --git a/AK/Singleton.h b/AK/Singleton.h
@@ -39,9 +39,18 @@
 
 namespace AK {
 
-template<typename T, T* (*InitFunction)()>
+template<typename T>
+struct SingletonInstanceCreator {
+ static T* create()
+ {
+ return new T();
+ }
+};
+
+template<typename T, T* (*InitFunction)() = SingletonInstanceCreator<T>::create>
 class Singleton {
  AK_MAKE_NONCOPYABLE(Singleton);
+ AK_MAKE_NONMOVABLE(Singleton);
 public:
  Singleton() = default;
 
@@ -110,18 +119,4 @@ class Singleton {
  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>();
-}
-
 }
diff --git a/Kernel/CommandLine.cpp b/Kernel/CommandLine.cpp
@@ -38,14 +38,15 @@ const CommandLine& kernel_command_line()
 
 void CommandLine::initialize(const String& string)
 {
+ ASSERT(!s_the);
  s_the = new CommandLine(string);
 }
 
 CommandLine::CommandLine(const String& string)
  : m_string(string)
 {
  s_the = this;
-
+klog() << "CommandLine: " << string;
  for (auto str : m_string.split(' ')) {
  if (str == "") {
  continue;

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

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

diff --git a/Kernel/Devices/Device.cpp b/Kernel/Devices/Device.cpp
@@ -31,7 +31,7 @@
 
 namespace Kernel {
 
-static auto s_all_devices = AK::make_singleton<HashMap<u32, Device*>>();
+static AK::Singleton<HashMap<u32, Device*>> s_all_devices;
 
 HashMap<u32, Device*>& Device::all_devices()
 {

diff --git a/Kernel/Devices/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp
@@ -336,7 +336,7 @@ void KeyboardDevice::handle_irq(const RegisterState&)
  }
 }
 
-static auto s_the = AK::make_singleton<KeyboardDevice>();
+static AK::Singleton<KeyboardDevice> s_the;
 
 void KeyboardDevice::initialize()
 {

diff --git a/Kernel/Devices/NullDevice.cpp b/Kernel/Devices/NullDevice.cpp
@@ -30,7 +30,7 @@
 
 namespace Kernel {
 
-static auto s_the = AK::make_singleton<NullDevice>();
+static AK::Singleton<NullDevice> s_the;
 
 void NullDevice::initialize()
 {

diff --git a/Kernel/Devices/PATAChannel.cpp b/Kernel/Devices/PATAChannel.cpp
@@ -108,7 +108,7 @@ namespace Kernel {
 #define PCI_Mass_Storage_Class 0x1
 #define PCI_IDE_Controller_Subclass 0x1
 
-static auto s_pata_lock = AK::make_singleton<Lock>();
+static AK::Singleton<Lock> s_pata_lock;
 
 static Lock& s_lock()
 {

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

diff --git a/Kernel/Devices/SB16.cpp b/Kernel/Devices/SB16.cpp
@@ -77,7 +77,7 @@ void SB16::set_sample_rate(uint16_t hz)
  dsp_write((u8)hz);
 }
 
-static auto s_the = AK::make_singleton<SB16>();
+static AK::Singleton<SB16> s_the;
 
 SB16::SB16()
  : IRQHandler(SB16_DEFAULT_IRQ)

diff --git a/Kernel/Devices/VMWareBackdoor.cpp b/Kernel/Devices/VMWareBackdoor.cpp
@@ -111,7 +111,7 @@ class VMWareBackdoorDetector
  OwnPtr<VMWareBackdoor> m_backdoor;
 };
 
-static auto s_vmware_backdoor = AK::make_singleton<VMWareBackdoorDetector>();
+static AK::Singleton<VMWareBackdoorDetector> s_vmware_backdoor;
 
 VMWareBackdoor* VMWareBackdoor::the()
 {

diff --git a/Kernel/FileSystem/DevPtsFS.cpp b/Kernel/FileSystem/DevPtsFS.cpp
@@ -46,7 +46,7 @@ DevPtsFS::~DevPtsFS()
 {
 }
 
-static auto s_ptys = AK::make_singleton<HashTable<unsigned>>();
+static AK::Singleton<HashTable<unsigned>> s_ptys;
 
 bool DevPtsFS::initialize()
 {

diff --git a/Kernel/FileSystem/FIFO.cpp b/Kernel/FileSystem/FIFO.cpp
@@ -38,7 +38,7 @@
 
 namespace Kernel {
 
-static auto s_table = AK::make_singleton<Lockable<HashTable<FIFO*>>>();
+static AK::Singleton<Lockable<HashTable<FIFO*>>> s_table;
 
 static Lockable<HashTable<FIFO*>>& all_fifos()
 {

diff --git a/Kernel/FileSystem/FileSystem.cpp b/Kernel/FileSystem/FileSystem.cpp
@@ -38,7 +38,7 @@
 namespace Kernel {
 
 static u32 s_lastFileSystemID;
-static auto s_fs_map = AK::make_singleton<HashMap<u32, FS*>>();
+static AK::Singleton<HashMap<u32, FS*>> s_fs_map;
 
 static HashMap<u32, FS*>& all_fses()
 {

diff --git a/Kernel/FileSystem/Inode.cpp b/Kernel/FileSystem/Inode.cpp
@@ -39,7 +39,7 @@
 namespace Kernel {
 
 static SpinLock s_all_inodes_lock;
-static auto s_list = AK::make_singleton<InlineLinkedList<Inode>>();
+static AK::Singleton<InlineLinkedList<Inode>> s_list;
 
 InlineLinkedList<Inode>& Inode::all_with_lock()
 {

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

diff --git a/Kernel/Interrupts/APIC.cpp b/Kernel/Interrupts/APIC.cpp
@@ -69,7 +69,7 @@
 
 namespace Kernel {
 
-static auto s_apic = AK::make_singleton<APIC>();
+static AK::Singleton<APIC> s_apic;
 
 class APICIPIInterruptHandler final : public GenericInterruptHandler {
 public:

diff --git a/Kernel/Net/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp
@@ -46,7 +46,7 @@
 
 namespace Kernel {
 
-static auto s_table = AK::make_singleton<Lockable<HashTable<IPv4Socket*>>>();
+static AK::Singleton<Lockable<HashTable<IPv4Socket*>>> s_table;
 
 Lockable<HashTable<IPv4Socket*>>& IPv4Socket::all_sockets()
 {

diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp
@@ -38,7 +38,7 @@
 
 namespace Kernel {
 
-static auto s_list = AK::make_singleton<Lockable<InlineLinkedList<LocalSocket>>>();
+static AK::Singleton<Lockable<InlineLinkedList<LocalSocket>>> s_list;
 
 Lockable<InlineLinkedList<LocalSocket>>& LocalSocket::all_sockets()
 {

diff --git a/Kernel/Net/LoopbackAdapter.cpp b/Kernel/Net/LoopbackAdapter.cpp
@@ -29,7 +29,7 @@
 
 namespace Kernel {
 
-static auto s_loopback = AK::make_singleton<LoopbackAdapter>();
+static AK::Singleton<LoopbackAdapter> s_loopback;
 
 LoopbackAdapter& LoopbackAdapter::the()
 {

diff --git a/Kernel/Net/NetworkAdapter.cpp b/Kernel/Net/NetworkAdapter.cpp
@@ -38,7 +38,7 @@
 
 namespace Kernel {
 
-static auto s_table = AK::make_singleton<Lockable<HashTable<NetworkAdapter*>>>();
+static AK::Singleton<Lockable<HashTable<NetworkAdapter*>>> s_table;
 
 static Lockable<HashTable<NetworkAdapter*>>& all_adapters()
 {

diff --git a/Kernel/Net/Routing.cpp b/Kernel/Net/Routing.cpp
@@ -34,7 +34,7 @@
 
 namespace Kernel {
 
-static auto s_arp_table = AK::make_singleton<Lockable<HashMap<IPv4Address, MACAddress>>>();
+static AK::Singleton<Lockable<HashMap<IPv4Address, MACAddress>>> s_arp_table;
 
 Lockable<HashMap<IPv4Address, MACAddress>>& arp_table()
 {

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

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

diff --git a/Kernel/Random.cpp b/Kernel/Random.cpp
@@ -33,7 +33,7 @@
 
 namespace Kernel {
 
-static auto s_the = AK::make_singleton<KernelRng>();
+static AK::Singleton<KernelRng> s_the;
 
 KernelRng& KernelRng::the()
 {

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

diff --git a/Kernel/TTY/PTYMultiplexer.cpp b/Kernel/TTY/PTYMultiplexer.cpp
@@ -36,7 +36,7 @@
 namespace Kernel {
 
 static const unsigned s_max_pty_pairs = 8;
-static auto s_the = AK::make_singleton<PTYMultiplexer>();
+static AK::Singleton<PTYMultiplexer> s_the;
 
 PTYMultiplexer& PTYMultiplexer::the()
 {

diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp
@@ -40,7 +40,7 @@
 
 namespace Kernel {
 
-static auto s_the = AK::make_singleton<TimeManagement>();
+static AK::Singleton<TimeManagement> s_the;
 
 TimeManagement& TimeManagement::the()
 {

diff --git a/Kernel/TimerQueue.cpp b/Kernel/TimerQueue.cpp
@@ -34,7 +34,7 @@
 
 namespace Kernel {
 
-static auto s_the = AK::make_singleton<TimerQueue>();
+static AK::Singleton<TimerQueue> s_the;
 
 TimerQueue& TimerQueue::the()
 {

diff --git a/Kernel/VM/PageDirectory.cpp b/Kernel/VM/PageDirectory.cpp
@@ -38,7 +38,7 @@ static const FlatPtr userspace_range_base = 0x00800000;
 static const FlatPtr userspace_range_ceiling = 0xbe000000;
 static const FlatPtr kernelspace_range_base = 0xc0800000;
 
-static auto s_cr3_map = AK::make_singleton<HashMap<u32, PageDirectory*>>();
+static AK::Singleton<HashMap<u32, PageDirectory*>> s_cr3_map;
 
 static HashMap<u32, PageDirectory*>& cr3_map()
 {