1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 04:07:45 +00:00

Kernel: Make self-contained locking smart pointers their own classes

Until now, our kernel has reimplemented a number of AK classes to
provide automatic internal locking:

- RefPtr
- NonnullRefPtr
- WeakPtr
- Weakable

This patch renames the Kernel classes so that they can coexist with
the original AK classes:

- RefPtr => LockRefPtr
- NonnullRefPtr => NonnullLockRefPtr
- WeakPtr => LockWeakPtr
- Weakable => LockWeakable

The goal here is to eventually get rid of the Lock* classes in favor of
using external locking.
This commit is contained in:
Andreas Kling 2022-08-19 20:53:40 +02:00
parent e475263113
commit 11eee67b85
360 changed files with 1703 additions and 1672 deletions

View file

@ -5,15 +5,15 @@
*/
#include <AK/OwnPtr.h>
#include <AK/RefPtr.h>
#include <AK/Types.h>
#include <Kernel/Library/LockRefPtr.h>
#include <Kernel/Storage/Ramdisk/Controller.h>
namespace Kernel {
NonnullRefPtr<RamdiskController> RamdiskController::initialize()
NonnullLockRefPtr<RamdiskController> RamdiskController::initialize()
{
return adopt_ref(*new RamdiskController());
return adopt_lock_ref(*new RamdiskController());
}
bool RamdiskController::reset()
@ -57,7 +57,7 @@ RamdiskController::RamdiskController()
RamdiskController::~RamdiskController() = default;
RefPtr<StorageDevice> RamdiskController::device(u32 index) const
LockRefPtr<StorageDevice> RamdiskController::device(u32 index) const
{
if (index >= m_devices.size())
return nullptr;

View file

@ -7,8 +7,8 @@
#pragma once
#include <AK/OwnPtr.h>
#include <AK/RefPtr.h>
#include <AK/Types.h>
#include <Kernel/Library/LockRefPtr.h>
#include <Kernel/Storage/Ramdisk/Device.h>
#include <Kernel/Storage/StorageController.h>
#include <Kernel/Storage/StorageDevice.h>
@ -19,10 +19,10 @@ class AsyncBlockDeviceRequest;
class RamdiskController final : public StorageController {
public:
static NonnullRefPtr<RamdiskController> initialize();
static NonnullLockRefPtr<RamdiskController> initialize();
virtual ~RamdiskController() override;
virtual RefPtr<StorageDevice> device(u32 index) const override;
virtual LockRefPtr<StorageDevice> device(u32 index) const override;
virtual bool reset() override;
virtual bool shutdown() override;
virtual size_t devices_count() const override;
@ -31,6 +31,6 @@ public:
private:
RamdiskController();
NonnullRefPtrVector<RamdiskDevice> m_devices;
NonnullLockRefPtrVector<RamdiskDevice> m_devices;
};
}

View file

@ -13,7 +13,7 @@
namespace Kernel {
NonnullRefPtr<RamdiskDevice> RamdiskDevice::create(RamdiskController const& controller, NonnullOwnPtr<Memory::Region>&& region, int major, int minor)
NonnullLockRefPtr<RamdiskDevice> RamdiskDevice::create(RamdiskController const& controller, NonnullOwnPtr<Memory::Region>&& region, int major, int minor)
{
auto device_name = MUST(KString::formatted("ramdisk{}", minor));

View file

@ -18,7 +18,7 @@ class RamdiskDevice final : public StorageDevice {
friend class DeviceManagement;
public:
static NonnullRefPtr<RamdiskDevice> create(RamdiskController const&, NonnullOwnPtr<Memory::Region>&& region, int major, int minor);
static NonnullLockRefPtr<RamdiskDevice> create(RamdiskController const&, NonnullOwnPtr<Memory::Region>&& region, int major, int minor);
virtual ~RamdiskDevice() override;
// ^DiskDevice