aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul David <paul.david@ettus.com>2017-02-02 14:54:43 -0500
committermichael-west <michael.west@ettus.com>2017-09-01 09:18:27 -0700
commit122bfae1a09cca732040cbdc5d7d20e68d0d755d (patch)
treed2bf85fb04dcdf78a0281dd99ad9d368594c1852
parent8a3038b6c7d22c09b66597329d6e14b30d294f16 (diff)
downloaduhd-122bfae1a09cca732040cbdc5d7d20e68d0d755d.tar.gz
uhd-122bfae1a09cca732040cbdc5d7d20e68d0d755d.tar.bz2
uhd-122bfae1a09cca732040cbdc5d7d20e68d0d755d.zip
UDP transport: Utilize poll instead of select
- Avoids the descriptor limit of 1024 on FD_SETSIZE - Fixes a buffer overflow due to that limit - Keeps select around for Windows compatibility
-rw-r--r--host/lib/transport/udp_common.hpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/host/lib/transport/udp_common.hpp b/host/lib/transport/udp_common.hpp
index 3ee568432..d6e73cc5f 100644
--- a/host/lib/transport/udp_common.hpp
+++ b/host/lib/transport/udp_common.hpp
@@ -35,6 +35,7 @@ namespace uhd{ namespace transport{
* \return true when the socket is ready for receive
*/
UHD_INLINE bool wait_for_recv_ready(int sock_fd, double timeout){
+#ifdef UHD_PLATFORM_WIN32 // select is more portable than poll unfortunately
//setup timeval for timeout
timeval tv;
//If the tv_usec > 1 second on some platforms, select will
@@ -56,6 +57,17 @@ namespace uhd{ namespace transport{
//call select with timeout on receive socket
return TEMP_FAILURE_RETRY(::select(sock_fd+1, &rset, NULL, NULL, &tv)) > 0;
+#else
+ //calculate the total timeout in milliseconds (from seconds)
+ int total_timeout = int(timeout*1000);
+
+ pollfd pfd_read;
+ pfd_read.fd = sock_fd;
+ pfd_read.events = POLLIN;
+
+ //call poll with timeout on receive socket
+ return ::poll(&pfd_read, 1, total_timeout) > 0;
+#endif
}
}} //namespace uhd::transport