RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 00:48:11 +00:00
Code Issues Activity Actions

Kernel: Port File to RefCounted

Browse source 
Since RefCounted automatically calls a method named `will_be_destoyed`
on classes that have one, so there's no need to have a custom
implementation of unref in File.
This commit is contained in:
Idan Horowitz 2021-12-29 01:23:35 +02:00 • committed by Andreas Kling
parent 4a3a947df3
commit 6e2a82df13
3 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/FileSystem/File.cpp
View file

@ -20,15 +20,6 @@ File::~File()
{ {
} }
bool File::unref() const
{
if (deref_base())
return false;
const_cast<File&>(*this).will_be_destroyed();
delete this;
return true;
}
ErrorOr<NonnullRefPtr<OpenFileDescription>> File::open(int options) ErrorOr<NonnullRefPtr<OpenFileDescription>> File::open(int options)
{ {
auto description = OpenFileDescription::try_create(*this); auto description = OpenFileDescription::try_create(*this);

3
Kernel/FileSystem/File.h
View file

@ -71,10 +71,9 @@ public:
// - Should create a Region in the Process and return it if successful. // - Should create a Region in the Process and return it if successful.
class File class File
: public RefCountedBase : public RefCounted<File>
, public Weakable<File> { , public Weakable<File> {
public: public:
virtual bool unref() const;
virtual void will_be_destroyed() { } virtual void will_be_destroyed() { }
virtual ~File(); virtual ~File();

2
Kernel/TTY/SlavePTY.h
View file

@ -15,7 +15,7 @@ class MasterPTY;
class SlavePTY final : public TTY { class SlavePTY final : public TTY {
public: public:
virtual bool unref() const override; bool unref() const;
virtual ~SlavePTY() override; virtual ~SlavePTY() override;
void on_master_write(const UserOrKernelBuffer&, size_t); void on_master_write(const UserOrKernelBuffer&, size_t);