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

WindowServer: Block without timeout when there is no damaged regions

Browse Source
This commit is contained in:
Bananymous
2026-04-11 08:36:57 +03:00
parent 2e654b53fa
commit 2984927be5
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
userspace/programs/WindowServer/WindowServer.h
View File

@@ -60,6 +60,7 @@ public:
void remove_client_fd(int fd);
ClientData& get_client_data(int fd);
bool is_damaged() const { return m_damaged_area_count > 0 || m_is_bouncing_window; }
bool is_stopped() const { return m_is_stopped; }
private:

25
userspace/programs/WindowServer/main.cpp
View File

@@ -273,19 +273,26 @@ int main()
uint64_t last_sync_us = get_current_us() - sync_interval_us;
while (!window_server.is_stopped())
{
const auto current_us = get_current_us();
if (current_us - last_sync_us > sync_interval_us)
{
window_server.sync();
last_sync_us += sync_interval_us;
}
timespec* ptimeout = nullptr;
timespec timeout = {};
if (auto current_us = get_current_us(); current_us - last_sync_us < sync_interval_us)
timeout.tv_nsec = (sync_interval_us - (current_us - last_sync_us)) * 1000;
if (window_server.is_damaged())
{
if (const auto current_us = get_current_us(); current_us - last_sync_us > sync_interval_us)
{
window_server.sync();
const auto full_intervals = (current_us - last_sync_us) / sync_interval_us;
last_sync_us += full_intervals * sync_interval_us;
}
if (const auto current_us = get_current_us(); current_us - last_sync_us < sync_interval_us)
timeout.tv_nsec = (sync_interval_us - (current_us - last_sync_us)) * 1000;
ptimeout = &timeout;
}
epoll_event events[16];
int epoll_events = epoll_pwait2(g_epoll_fd, events, 16, &timeout, nullptr);
int epoll_events = epoll_pwait2(g_epoll_fd, events, 16, ptimeout, nullptr);
if (epoll_events == -1 && errno != EINTR)
{
dwarnln("epoll_pwait2: {}", strerror(errno));