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

Revert "Kernel: Move Singleton class to AK"

Browse source 
This reverts commit f0906250a1.
This commit is contained in:
Andreas Kling 2020-08-22 16:34:49 +02:00
parent b0a24a83be
commit 8925ad3fa0
31 changed files with 71 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Net/IPv4Socket.cpp
View file

@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/Singleton.h>
#include <AK/StringBuilder.h>
#include <Kernel/Singleton.h>
#include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/Net/ARP.h>
#include <Kernel/Net/ICMP.h>
@ -46,7 +46,7 @@
namespace Kernel {
static auto s_table = AK::make_singleton<Lockable<HashTable<IPv4Socket*>>>();
static auto s_table = make_singleton<Lockable<HashTable<IPv4Socket*>>>();
Lockable<HashTable<IPv4Socket*>>& IPv4Socket::all_sockets()
{

4
Kernel/Net/LocalSocket.cpp
View file

@ -24,12 +24,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/Singleton.h>
#include <AK/StringBuilder.h>
#include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/FileSystem/VirtualFileSystem.h>
#include <Kernel/Net/LocalSocket.h>
#include <Kernel/Process.h>
#include <Kernel/Singleton.h>
#include <Kernel/StdLib.h>
#include <Kernel/UnixTypes.h>
#include <LibC/errno_numbers.h>
@ -38,7 +38,7 @@
namespace Kernel {
static auto s_list = AK::make_singleton<Lockable<InlineLinkedList<LocalSocket>>>();
static auto s_list = make_singleton<Lockable<InlineLinkedList<LocalSocket>>>();
Lockable<InlineLinkedList<LocalSocket>>& LocalSocket::all_sockets()
{

4
Kernel/Net/LoopbackAdapter.cpp
View file

@ -24,12 +24,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/Singleton.h>
#include <Kernel/Net/LoopbackAdapter.h>
#include <Kernel/Singleton.h>
namespace Kernel {
static auto s_loopback = AK::make_singleton<LoopbackAdapter>();
static auto s_loopback = make_singleton<LoopbackAdapter>();
LoopbackAdapter& LoopbackAdapter::the()
{

4
Kernel/Net/NetworkAdapter.cpp
View file

@ -25,7 +25,6 @@
*/
#include <AK/HashTable.h>
#include <AK/Singleton.h>
#include <AK/StringBuilder.h>
#include <Kernel/Heap/kmalloc.h>
#include <Kernel/Lock.h>
@ -34,11 +33,12 @@
#include <Kernel/Net/LoopbackAdapter.h>
#include <Kernel/Net/NetworkAdapter.h>
#include <Kernel/Random.h>
#include <Kernel/Singleton.h>
#include <Kernel/StdLib.h>
namespace Kernel {
static auto s_table = AK::make_singleton<Lockable<HashTable<NetworkAdapter*>>>();
static auto s_table = make_singleton<Lockable<HashTable<NetworkAdapter*>>>();
static Lockable<HashTable<NetworkAdapter*>>& all_adapters()
{

4
Kernel/Net/Routing.cpp
View file

@ -25,16 +25,16 @@
*/
#include <AK/HashMap.h>
#include <AK/Singleton.h>
#include <Kernel/Net/LoopbackAdapter.h>
#include <Kernel/Net/Routing.h>
#include <Kernel/Thread.h>
#include <Kernel/Singleton.h>
//#define ROUTING_DEBUG
namespace Kernel {
static auto s_arp_table = AK::make_singleton<Lockable<HashMap<IPv4Address, MACAddress>>>();
static auto s_arp_table = make_singleton<Lockable<HashMap<IPv4Address, MACAddress>>>();
Lockable<HashMap<IPv4Address, MACAddress>>& arp_table()
{

13
Kernel/Net/TCPSocket.cpp
View file

@ -24,7 +24,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/Singleton.h>
#include <AK/Time.h>
#include <Kernel/Devices/RandomDevice.h>
#include <Kernel/FileSystem/FileDescription.h>
@ -34,6 +33,7 @@
#include <Kernel/Net/TCPSocket.h>
#include <Kernel/Process.h>
#include <Kernel/Random.h>
#include <Kernel/Singleton.h>
//#define TCP_SOCKET_DEBUG
@ -63,18 +63,19 @@ void TCPSocket::set_state(State new_state)
}
}
static auto s_socket_closing = AK::make_singleton<Lockable<HashMap<IPv4SocketTuple, RefPtr<TCPSocket>>>>();
Lockable<HashMap<IPv4SocketTuple, RefPtr<TCPSocket>>>& TCPSocket::closing_sockets()
{
return *s_socket_closing;
static Lockable<HashMap<IPv4SocketTuple, RefPtr<TCPSocket>>>* s_map;
if (!s_map)
s_map = new Lockable<HashMap<IPv4SocketTuple, RefPtr<TCPSocket>>>;
return *s_map;
}
static auto s_socket_tuples = AK::make_singleton<Lockable<HashMap<IPv4SocketTuple, TCPSocket*>>>();
static auto s_map = make_singleton<Lockable<HashMap<IPv4SocketTuple, TCPSocket*>>>();
Lockable<HashMap<IPv4SocketTuple, TCPSocket*>>& TCPSocket::sockets_by_tuple()
{
return *s_socket_tuples;
return *s_map;
}
RefPtr<TCPSocket> TCPSocket::from_tuple(const IPv4SocketTuple& tuple)

4
Kernel/Net/UDPSocket.cpp
View file

@ -24,7 +24,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/Singleton.h>
#include <Kernel/Devices/RandomDevice.h>
#include <Kernel/Net/NetworkAdapter.h>
#include <Kernel/Net/Routing.h>
@ -32,6 +31,7 @@
#include <Kernel/Net/UDPSocket.h>
#include <Kernel/Process.h>
#include <Kernel/Random.h>
#include <Kernel/Singleton.h>
namespace Kernel {
@ -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 auto s_map = make_singleton<Lockable<HashMap<u16, UDPSocket*>>>();
Lockable<HashMap<u16, UDPSocket*>>& UDPSocket::sockets_by_port()
{