Cleanup

eProsima · Nov 14, 2021 · 540bc28 · 540bc28
1 parent fa8cc12
commit 540bc28
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 18 deletions.
diff --git a/include/uxr/client/profile/transport/serial/serial_transport_posix.h b/include/uxr/client/profile/transport/serial/serial_transport_posix.h
@@ -21,7 +21,6 @@ extern "C"
 #endif // ifdef __cplusplus
 
 #include <poll.h>
-#include <sys/select.h>
 
 typedef struct uxrSerialPlatform
 {

diff --git a/src/c/profile/transport/ip/tcp/tcp_transport_freertos_plus_tcp.c b/src/c/profile/transport/ip/tcp/tcp_transport_freertos_plus_tcp.c
@@ -76,11 +76,6 @@ bool uxr_close_tcp_platform(
      * FreeRTOS_closesocket() always returns 0. */
     (void) FreeRTOS_closesocket(platform->fd);
 
-    if (NULL != platform->poll_fd)
-    {
-        (void) FreeRTOS_DeleteSocketSet(platform->poll_fd);
-    }
-
     return true;
 }
 

diff --git a/src/c/profile/transport/ip/udp/udp_transport_freertos_plus_tcp.c b/src/c/profile/transport/ip/udp/udp_transport_freertos_plus_tcp.c
@@ -61,11 +61,6 @@ bool uxr_close_udp_platform(
     /* FreeRTOS_closesocket() always returns 0. */
     (void) FreeRTOS_closesocket(platform->fd);
 
-    if (NULL != platform->poll_fd)
-    {
-        (void) FreeRTOS_DeleteSocketSet(platform->poll_fd);
-    }
-
     return true;
 }
 

diff --git a/src/c/profile/transport/serial/serial_transport_posix.c b/src/c/profile/transport/serial/serial_transport_posix.c
@@ -61,13 +61,7 @@ size_t uxr_read_serial_data_platform(
     size_t rv = 0;
     struct uxrSerialPlatform* platform = (struct uxrSerialPlatform*) args;
 
-    fd_set fds;
-    FD_ZERO(&fds);
-    FD_SET(platform->poll_fd.fd, &fds);
-    struct timeval t_out = { 0, timeout*1000};
-    int poll_rv = select(platform->poll_fd.fd+1, &fds, NULL, NULL, &t_out);
-
-    //int poll_rv = poll(&platform->poll_fd, 1, timeout);
+    int poll_rv = poll(&platform->poll_fd, 1, timeout);
     if (0 < poll_rv)
     {
         ssize_t bytes_read = read(platform->poll_fd.fd, buf, len);