net: split out poll and select variants from Sock::Wait()

Author: kwvg

src/util/sock.cpp

@@ -143,6 +143,15 @@ bool Sock::IsSelectable() const
 bool Sock::Wait(std::chrono::milliseconds timeout, Event requested, Event* occurred) const
 {
 #ifdef USE_POLL
+    return WaitPoll(timeout, requested, occurred);
+#else
+    return WaitSelect(timeout, requested, occurred);
+#endif /* USE_POLL */
+}
+
+#ifdef USE_POLL
+bool Sock::WaitPoll(std::chrono::milliseconds timeout, Event requested, Event* occurred) const
+{
     pollfd fd;
     fd.fd = m_socket;
     fd.events = 0;
@@ -171,7 +180,11 @@ bool Sock::Wait(std::chrono::milliseconds timeout, Event requested, Event* occur
     }
 
     return true;
-#else
+}
+#endif /* USE_POLL */
+
+bool Sock::WaitSelect(std::chrono::milliseconds timeout, Event requested, Event* occurred) const
+{
     if (!IsSelectable()) {
         return false;
     }
@@ -213,7 +226,6 @@ bool Sock::Wait(std::chrono::milliseconds timeout, Event requested, Event* occur
     }
 
     return true;
-#endif /* USE_POLL */
 }
 
 void Sock::SendComplete(const std::string& data,

src/util/sock.h

@@ -221,6 +221,10 @@ class Sock
     [[nodiscard]] virtual bool Wait(std::chrono::milliseconds timeout,
                                     Event requested,
                                     Event* occurred = nullptr) const;
+#ifdef USE_POLL
+    bool WaitPoll(std::chrono::milliseconds timeout, Event requested, Event* occurred = nullptr) const;
+#endif /* USE_POLL */
+    bool WaitSelect(std::chrono::milliseconds timeout, Event requested, Event* occurred = nullptr) const;
 
     /* Higher level, convenience, methods. These may throw. */