Merge pull request #1802 from DaAwesomeP/0.10

[for 0.10] Remove EPoll delay
OpenLightingProject · Dec 6, 2022 · 2a98331 · 2a98331
2 parents f144c4c + daa30a8
commit 2a98331
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -21,6 +21,7 @@ Contributors:
   Masaki Muranaka, various patches
   Nicolas, for the win32 port of libartnet
   Nils Van Zuijlen, typos and python lib small update
+  Perry Naseck, EPoll delay fix
   Peter Newman, MilInst Plugin, Scanlime Fadecandy support and numerous fixes
   Ravindra Nath Kakarla, RDM Test Server (Google Summer of Code 2012)
   Rowan Maclachlan (hippy) for various changes

diff --git a/common/io/EPoller.cpp b/common/io/EPoller.cpp
@@ -311,8 +311,10 @@ bool EPoller::Poll(TimeoutManager *timeout_manager,
   }
 
   int ms_to_sleep = sleep_interval.InMilliSeconds();
+  // If we haven't been asked to wait as part of the poll interval, then don't
+  // wait in the epoll to allow for fast streaming
   int ready = epoll_wait(m_epoll_fd, reinterpret_cast<epoll_event*>(&events),
-                         MAX_EVENTS, ms_to_sleep ? ms_to_sleep : 1);
+                         MAX_EVENTS, ms_to_sleep ? ms_to_sleep : 0);
 
   if (ready == 0) {
     m_clock->CurrentMonotonicTime(&m_wake_up_time);