Merge pull request #4 from thomasjwinter/master

Fix potential busy loop with abnormal poll
alliedtelesis · Nov 26, 2024 · a48d85a · a48d85a
2 parents ab7b2aa + 6e1742b
commit a48d85a
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/iface.cc b/src/iface.cc
@@ -518,6 +518,8 @@ void iface::cleanup()
 
 int iface::poll_all()
 {
+    int no_polls = 0;
+
     if (_map_dirty) {
         cleanup();
         fixup_pollfds();
@@ -556,6 +558,7 @@ int iface::poll_all()
         bool is_pfd = i++ % 2;
 
         if (!(f_it->revents & POLLIN)) {
+            no_polls++;
             continue;
         }
 
@@ -596,6 +599,11 @@ int iface::poll_all()
         }
     }
 
+    if (no_polls == _pollfds.size()) {
+        /* 50 milliseconds to match poll timeout. */
+        usleep(50000);
+    }
+
     return 0;
 }