0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-02 12:30:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Share the "blocked-on file descriptor" number between read() and write().

Browse source 
A process can't be reading and writing at the same time, so it's fine for
them to share the variable for the blocked FD.
This commit is contained in:
Andreas Kling 2018-12-03 00:42:48 +01:00
parent f6e27c2abe
commit 4bc87dc7b9
Notes: sideshowbarker 2024-07-19 16:09:05 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/4bc87dc7b99
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Process.cpp
View file

@ -1055,7 +1055,7 @@ ssize_t Process::sys$read(int fd, void* outbuf, size_t nread)
return -EBADF;
if (descriptor->is_blocking()) {
if (!descriptor->has_data_available_for_reading()) {
m_fdBlockedOnRead = fd;
m_blocked_fd = fd;
block(BlockedRead);
sched_yield();
if (m_was_interrupted_while_blocked)

1
Kernel/Process.h
View file

@ -266,7 +266,6 @@ private:
void* m_kernelStack { nullptr };
dword m_timesScheduled { 0 };
pid_t m_waitee_pid { -1 };
int m_fdBlockedOnRead { -1 };
int m_blocked_fd { -1 };
size_t m_max_open_file_descriptors { 16 };
SignalActionData m_signal_action_data[32];

4
Kernel/Scheduler.cpp
View file

@ -49,9 +49,9 @@ bool Scheduler::pick_next()
}
if (process.state() == Process::BlockedRead) {
ASSERT(process.m_fdBlockedOnRead != -1);
ASSERT(process.m_blocked_fd != -1);
// FIXME: Block until the amount of data wanted is available.
if (process.m_fds[process.m_fdBlockedOnRead].descriptor->has_data_available_for_reading())
if (process.m_fds[process.m_blocked_fd].descriptor->has_data_available_for_reading())
process.unblock();
return true;
}