Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Fix epoll reporting multiple of the same event

Browse Source
This commit is contained in:
Bananymous
2026-01-12 23:45:17 +02:00
parent 9ffbb9fbf0
commit 0cef66d155
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/kernel/Epoll.cpp
View File

@@ -128,16 +128,18 @@ namespace Kernel
{ {
auto& [inode, events] = *it; auto& [inode, events] = *it;
#define REMOVE_IT_AND_CONTINUE() \ #define REMOVE_IT() \
({ \ ({ \
m_processing_events.remove(it); \ m_processing_events.remove(it); \
if (event_count > 0) \
break; \
it = m_processing_events.begin(); \ it = m_processing_events.begin(); \
continue; \ continue; \
}) })
auto listen_it = m_listening_events.find(inode); auto listen_it = m_listening_events.find(inode);
if (listen_it == m_listening_events.end()) if (listen_it == m_listening_events.end())
REMOVE_IT_AND_CONTINUE(); REMOVE_IT();
auto& listen = listen_it->value; auto& listen = listen_it->value;
{ {
@@ -149,7 +151,7 @@ namespace Kernel
} }
if (events == 0) if (events == 0)
REMOVE_IT_AND_CONTINUE(); REMOVE_IT();
{ {
LockGuard inode_locker(inode->m_mutex); LockGuard inode_locker(inode->m_mutex);
@@ -165,9 +167,9 @@ namespace Kernel
} }
if (events == 0) if (events == 0)
REMOVE_IT_AND_CONTINUE(); REMOVE_IT();
#undef REMOVE_IT_AND_CONTINUE #undef REMOVE_IT
for (size_t fd = 0; fd < listen.events.size() && event_count < event_span.size(); fd++) for (size_t fd = 0; fd < listen.events.size() && event_count < event_span.size(); fd++)
{ {