xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid very long timeouts in event manager

Browse Source
This commit is contained in:
Maxime Coste 2014-12-12 13:55:32 +00:00
parent 9c1ca303ff
commit 801bd5245d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/event_manager.cc
View File

@ -77,20 +77,26 @@ void EventManager::handle_next_events(EventMode mode)
} }
} }
bool with_timeout = false;
timeval tv{}; timeval tv{};
if (not m_timers.empty()) if (not m_timers.empty())
{ {
auto next = std::min_element( auto next_date = (*std::min_element(
m_timers.begin(), m_timers.end(), [](Timer* lhs, Timer* rhs) { m_timers.begin(), m_timers.end(), [](Timer* lhs, Timer* rhs) {
return lhs->next_date() < rhs->next_date(); return lhs->next_date() < rhs->next_date();
}); }))->next_date();
if (next_date != TimePoint::max())
{
with_timeout = true;
using namespace std::chrono; using us = std::chrono::microseconds; using namespace std::chrono; using us = std::chrono::microseconds;
auto usecs = std::max(us(0), duration_cast<us>((*next)->next_date() - Clock::now())); auto usecs = std::max(us(0), duration_cast<us>(next_date - Clock::now()));
auto secs = duration_cast<seconds>(usecs); auto secs = duration_cast<seconds>(usecs);
tv = timeval{ (time_t)secs.count(), (suseconds_t)(usecs - secs).count() }; tv = timeval{ (time_t)secs.count(), (suseconds_t)(usecs - secs).count() };
} }
}
int res = select(max_fd + 1, &rfds, nullptr, nullptr, int res = select(max_fd + 1, &rfds, nullptr, nullptr,
m_timers.empty() ? nullptr : &tv); with_timeout ? &tv : nullptr);
// copy forced fds *after* poll, so that signal handlers can write to // copy forced fds *after* poll, so that signal handlers can write to
// m_forced_fd, interupt poll, and directly be serviced. // m_forced_fd, interupt poll, and directly be serviced.