Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Make pipe check data every 100ms 

This prevents dead lock if read-end does not detect data before blocking
why write-end already notified.
This commit is contained in:
Bananymous 2024-12-03 21:54:27 +02:00
parent 3b7b6beca5
commit 49133dce48
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/kernel/FS/Pipe.cpp
View File

@ -49,7 +49,7 @@ namespace Kernel
if (m_writing_count == 0) if (m_writing_count == 0)
return 0; return 0;
LockFreeGuard lock_free(m_mutex); LockFreeGuard lock_free(m_mutex);
TRY(Thread::current().block_or_eintr_indefinite(m_thread_blocker)); TRY(Thread::current().block_or_eintr_or_timeout_ms(m_thread_blocker, 100, false));
} }
const size_t to_copy = BAN::Math::min<size_t>(buffer.size(), m_buffer_size); const size_t to_copy = BAN::Math::min<size_t>(buffer.size(), m_buffer_size);
@ -84,7 +84,7 @@ namespace Kernel
while (m_buffer.size() - m_buffer_size < buffer.size()) while (m_buffer.size() - m_buffer_size < buffer.size())
{ {
LockFreeGuard lock_free(m_mutex); LockFreeGuard lock_free(m_mutex);
TRY(Thread::current().block_or_eintr_indefinite(m_thread_blocker)); TRY(Thread::current().block_or_eintr_or_timeout_ms(m_thread_blocker, 100, false));
} }
const size_t to_copy = buffer.size(); const size_t to_copy = buffer.size();