diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 556304e69e..6c726a9e82 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -1076,7 +1076,7 @@ ssize_t Process::sys$read(int fd, void* outbuf, size_t nread) if (!descriptor) return -EBADF; if (descriptor->is_blocking()) { - if (!descriptor->has_data_available_for_reading(*this)) { + if (!descriptor->can_read(*this)) { m_blocked_fd = fd; block(BlockedRead); sched_yield(); @@ -1964,7 +1964,7 @@ int Process::sys$select(const Syscall::SC_select_params* params) memset(readfds, 0, sizeof(fd_set)); auto bitmap = Bitmap::wrap((byte*)readfds, FD_SETSIZE); for (int fd : m_select_read_fds) { - if (m_fds[fd].descriptor->has_data_available_for_reading(*this)) { + if (m_fds[fd].descriptor->can_read(*this)) { bitmap.set(fd, true); ++markedfds; } diff --git a/Kernel/Scheduler.cpp b/Kernel/Scheduler.cpp index ac4edd59cb..7bd8ee4d91 100644 --- a/Kernel/Scheduler.cpp +++ b/Kernel/Scheduler.cpp @@ -52,7 +52,7 @@ bool Scheduler::pick_next() if (process.state() == Process::BlockedRead) { ASSERT(process.m_blocked_fd != -1); // FIXME: Block until the amount of data wanted is available. - if (process.m_fds[process.m_blocked_fd].descriptor->has_data_available_for_reading(process)) + if (process.m_fds[process.m_blocked_fd].descriptor->can_read(process)) process.unblock(); return true; } @@ -66,7 +66,7 @@ bool Scheduler::pick_next() if (process.state() == Process::BlockedSelect) { for (int fd : process.m_select_read_fds) { - if (process.m_fds[fd].descriptor->has_data_available_for_reading(process)) { + if (process.m_fds[fd].descriptor->can_read(process)) { process.unblock(); return true; } diff --git a/VirtualFileSystem/FileDescriptor.cpp b/VirtualFileSystem/FileDescriptor.cpp index bbfefd829b..a6f422752e 100644 --- a/VirtualFileSystem/FileDescriptor.cpp +++ b/VirtualFileSystem/FileDescriptor.cpp @@ -176,7 +176,7 @@ bool FileDescriptor::can_write(Process& process) return true; } -bool FileDescriptor::has_data_available_for_reading(Process& process) +bool FileDescriptor::can_read(Process& process) { if (is_fifo()) { ASSERT(fifo_direction() == FIFO::Reader); diff --git a/VirtualFileSystem/FileDescriptor.h b/VirtualFileSystem/FileDescriptor.h index 7947954d7f..ba16df3c29 100644 --- a/VirtualFileSystem/FileDescriptor.h +++ b/VirtualFileSystem/FileDescriptor.h @@ -29,7 +29,7 @@ public: ssize_t write(Process&, const byte* data, size_t); int stat(Unix::stat*); - bool has_data_available_for_reading(Process&); + bool can_read(Process&); bool can_write(Process&); ssize_t get_dir_entries(byte* buffer, size_t);