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

Kernel: Rename FileDescriptor to FileDescription.

Browse source 
After reading a bunch of POSIX specs, I've learned that a file descriptor
is the number that refers to a file description, not the description itself.
So this patch renames FileDescriptor to FileDescription, and Process now has
FileDescription* file_description(int fd).
This commit is contained in:
Andreas Kling 2019-06-07 09:36:51 +02:00
parent 69a6ce90df
commit 08cd75ac4b
70 changed files with 373 additions and 373 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Kernel/TTY/MasterPTY.cpp
View file

@ -31,14 +31,14 @@ String MasterPTY::pts_name() const
return m_pts_name;
}
ssize_t MasterPTY::read(FileDescriptor&, byte* buffer, ssize_t size)
ssize_t MasterPTY::read(FileDescription&, byte* buffer, ssize_t size)
{
if (!m_slave && m_buffer.is_empty())
return 0;
return m_buffer.read(buffer, size);
}
ssize_t MasterPTY::write(FileDescriptor&, const byte* buffer, ssize_t size)
ssize_t MasterPTY::write(FileDescription&, const byte* buffer, ssize_t size)
{
if (!m_slave)
return -EIO;
@ -46,14 +46,14 @@ ssize_t MasterPTY::write(FileDescriptor&, const byte* buffer, ssize_t size)
return size;
}
bool MasterPTY::can_read(FileDescriptor&) const
bool MasterPTY::can_read(FileDescription&) const
{
if (!m_slave)
return true;
return !m_buffer.is_empty();
}
bool MasterPTY::can_write(FileDescriptor&) const
bool MasterPTY::can_write(FileDescription&) const
{
return true;
}
@ -64,7 +64,7 @@ void MasterPTY::notify_slave_closed(Badge<SlavePTY>)
dbgprintf("MasterPTY(%u): slave closed, my retains: %u, slave retains: %u\n", m_index, retain_count(), m_slave->retain_count());
#endif
// +1 retain for my MasterPTY::m_slave
// +1 retain for FileDescriptor::m_device
// +1 retain for FileDescription::m_device
if (m_slave->retain_count() == 2)
m_slave = nullptr;
}
@ -88,7 +88,7 @@ void MasterPTY::close()
{
if (retain_count() == 2) {
InterruptDisabler disabler;
// After the closing FileDescriptor dies, slave is the only thing keeping me alive.
// After the closing FileDescription dies, slave is the only thing keeping me alive.
// From this point, let's consider ourselves closed.
m_closed = true;
@ -96,7 +96,7 @@ void MasterPTY::close()
}
}
int MasterPTY::ioctl(FileDescriptor& descriptor, unsigned request, unsigned arg)
int MasterPTY::ioctl(FileDescription& descriptor, unsigned request, unsigned arg)
{
if (request == TIOCSWINSZ)
return m_slave->ioctl(descriptor, request, arg);

10
Kernel/TTY/MasterPTY.h
View file

@ -20,13 +20,13 @@ public:
private:
// ^CharacterDevice
virtual ssize_t read(FileDescriptor&, byte*, ssize_t) override;
virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) override;
virtual bool can_read(FileDescriptor&) const override;
virtual bool can_write(FileDescriptor&) const override;
virtual ssize_t read(FileDescription&, byte*, ssize_t) override;
virtual ssize_t write(FileDescription&, const byte*, ssize_t) override;
virtual bool can_read(FileDescription&) const override;
virtual bool can_write(FileDescription&) const override;
virtual void close() override;
virtual bool is_master_pty() const override { return true; }
virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg) override;
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override;
virtual const char* class_name() const override { return "MasterPTY"; }
RetainPtr<SlavePTY> m_slave;

6
Kernel/TTY/PTYMultiplexer.cpp
View file

@ -1,6 +1,6 @@
#include "PTYMultiplexer.h"
#include "MasterPTY.h"
#include <Kernel/FileSystem/FileDescriptor.h>
#include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/Process.h>
#include <LibC/errno_numbers.h>
@ -28,7 +28,7 @@ PTYMultiplexer::~PTYMultiplexer()
{
}
KResultOr<Retained<FileDescriptor>> PTYMultiplexer::open(int options)
KResultOr<Retained<FileDescription>> PTYMultiplexer::open(int options)
{
UNUSED_PARAM(options);
LOCKER(m_lock);
@ -39,7 +39,7 @@ KResultOr<Retained<FileDescriptor>> PTYMultiplexer::open(int options)
#ifdef PTMX_DEBUG
dbgprintf("PTYMultiplexer::open: Vending master %u\n", master->index());
#endif
return FileDescriptor::create(master.ptr());
return FileDescription::create(master.ptr());
}
void PTYMultiplexer::notify_master_destroyed(Badge<MasterPTY>, unsigned index)

10
Kernel/TTY/PTYMultiplexer.h
View file

@ -15,11 +15,11 @@ public:
static PTYMultiplexer& the();
// ^CharacterDevice
virtual KResultOr<Retained<FileDescriptor>> open(int options) override;
virtual ssize_t read(FileDescriptor&, byte*, ssize_t) override { return 0; }
virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) override { return 0; }
virtual bool can_read(FileDescriptor&) const override { return true; }
virtual bool can_write(FileDescriptor&) const override { return true; }
virtual KResultOr<Retained<FileDescription>> open(int options) override;
virtual ssize_t read(FileDescription&, byte*, ssize_t) override { return 0; }
virtual ssize_t write(FileDescription&, const byte*, ssize_t) override { return 0; }
virtual bool can_read(FileDescription&) const override { return true; }
virtual bool can_write(FileDescription&) const override { return true; }
void notify_master_destroyed(Badge<MasterPTY>, unsigned index);

6
Kernel/TTY/SlavePTY.cpp
View file

@ -41,19 +41,19 @@ ssize_t SlavePTY::on_tty_write(const byte* data, ssize_t size)
return m_master->on_slave_write(data, size);
}
bool SlavePTY::can_write(FileDescriptor&) const
bool SlavePTY::can_write(FileDescription&) const
{
return m_master->can_write_from_slave();
}
bool SlavePTY::can_read(FileDescriptor& descriptor) const
bool SlavePTY::can_read(FileDescription& descriptor) const
{
if (m_master->is_closed())
return true;
return TTY::can_read(descriptor);
}
ssize_t SlavePTY::read(FileDescriptor& descriptor, byte* buffer, ssize_t size)
ssize_t SlavePTY::read(FileDescription& descriptor, byte* buffer, ssize_t size)
{
if (m_master->is_closed())
return 0;

6
Kernel/TTY/SlavePTY.h
View file

@ -21,9 +21,9 @@ private:
virtual ssize_t on_tty_write(const byte*, ssize_t) override;
// ^CharacterDevice
virtual bool can_read(FileDescriptor&) const override;
virtual ssize_t read(FileDescriptor&, byte*, ssize_t) override;
virtual bool can_write(FileDescriptor&) const override;
virtual bool can_read(FileDescription&) const override;
virtual ssize_t read(FileDescription&, byte*, ssize_t) override;
virtual bool can_write(FileDescription&) const override;
virtual const char* class_name() const override { return "SlavePTY"; }
virtual void close() override;

10
Kernel/TTY/TTY.cpp
View file

@ -24,12 +24,12 @@ void TTY::set_default_termios()
memcpy(m_termios.c_cc, default_cc, sizeof(default_cc));
}
ssize_t TTY::read(FileDescriptor&, byte* buffer, ssize_t size)
ssize_t TTY::read(FileDescription&, byte* buffer, ssize_t size)
{
return m_buffer.read(buffer, size);
}
ssize_t TTY::write(FileDescriptor&, const byte* buffer, ssize_t size)
ssize_t TTY::write(FileDescription&, const byte* buffer, ssize_t size)
{
#ifdef TTY_DEBUG
dbgprintf("TTY::write {%u} ", size);
@ -42,12 +42,12 @@ ssize_t TTY::write(FileDescriptor&, const byte* buffer, ssize_t size)
return size;
}
bool TTY::can_read(FileDescriptor&) const
bool TTY::can_read(FileDescription&) const
{
return !m_buffer.is_empty();
}
bool TTY::can_write(FileDescriptor&) const
bool TTY::can_write(FileDescription&) const
{
return true;
}
@ -111,7 +111,7 @@ void TTY::set_termios(const termios& t)
);
}
int TTY::ioctl(FileDescriptor&, unsigned request, unsigned arg)
int TTY::ioctl(FileDescription&, unsigned request, unsigned arg)
{
auto& process = current->process();
pid_t pgid;

12
Kernel/TTY/TTY.h
View file

@ -10,12 +10,12 @@ class TTY : public CharacterDevice {
public:
virtual ~TTY() override;
virtual ssize_t read(FileDescriptor&, byte*, ssize_t) override;
virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) override;
virtual bool can_read(FileDescriptor&) const override;
virtual bool can_write(FileDescriptor&) const override;
virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg) override final;
virtual String absolute_path(const FileDescriptor&) const override { return tty_name(); }
virtual ssize_t read(FileDescription&, byte*, ssize_t) override;
virtual ssize_t write(FileDescription&, const byte*, ssize_t) override;
virtual bool can_read(FileDescription&) const override;
virtual bool can_write(FileDescription&) const override;
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override final;
virtual String absolute_path(const FileDescription&) const override { return tty_name(); }
virtual String tty_name() const = 0;