RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:17: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

18
Kernel/Process.h
View file

@ -16,7 +16,7 @@
#include <LibC/signal_numbers.h>
class ELFLoader;
class FileDescriptor;
class FileDescription;
class PageDirectory;
class Region;
class VMObject;
@ -87,8 +87,8 @@ public:
bool in_group(gid_t) const;
FileDescriptor* file_descriptor(int fd);
const FileDescriptor* file_descriptor(int fd) const;
FileDescription* file_description(int fd);
const FileDescription* file_description(int fd) const;
template<typename Callback>
static void for_each(Callback);
@ -280,7 +280,7 @@ private:
Range allocate_range(LinearAddress, size_t);
int do_exec(String path, Vector<String> arguments, Vector<String> environment);
ssize_t do_write(FileDescriptor&, const byte*, int data_size);
ssize_t do_write(FileDescription&, const byte*, int data_size);
int alloc_fd(int first_candidate_fd = 0);
void disown_all_shared_buffers();
@ -306,17 +306,17 @@ private:
Priority m_priority { NormalPriority };
struct FileDescriptorAndFlags {
struct FileDescriptionAndFlags {
operator bool() const { return !!descriptor; }
void clear();
void set(Retained<FileDescriptor>&& d, dword f = 0);
RetainPtr<FileDescriptor> descriptor;
void set(Retained<FileDescription>&& d, dword f = 0);
RetainPtr<FileDescription> descriptor;
dword flags { 0 };
};
Vector<FileDescriptorAndFlags> m_fds;
Vector<FileDescriptionAndFlags> m_fds;
RingLevel m_ring { Ring0 };
int m_max_open_file_descriptors { 128 };
static const int m_max_open_file_descriptors { FD_SETSIZE };
byte m_termination_status { 0 };
byte m_termination_signal { 0 };