RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:28:12 +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);