From 569c1ac4941addbbdf7cad6d8f3cd0a7dd4d064c Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 15 Feb 2007 17:17:47 +0000 Subject: [PATCH] Suppress timeout parameter from net_Select() - refs #1056. The only use of the timeout was to poll b_die, but net_ReadInner() takes care of that already. --- include/vlc_network.h | 8 ++++---- modules/services_discovery/sap.c | 2 +- src/network/io.c | 9 +++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/include/vlc_network.h b/include/vlc_network.h index 45089f007b..ccb14fe0b3 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -127,11 +127,11 @@ struct virtual_socket_t #define net_Read(a,b,c,d,e,f) __net_Read(VLC_OBJECT(a),b,c,d,e,f) VLC_EXPORT( ssize_t, __net_Read, ( vlc_object_t *p_this, int fd, const v_socket_t *, uint8_t *p_data, size_t i_data, vlc_bool_t b_retry ) ); -#define net_ReadNonBlock(a,b,c,d,e,f) __net_ReadNonBlock(VLC_OBJECT(a),b,c,d,e,f) -VLC_EXPORT( ssize_t, __net_ReadNonBlock, ( vlc_object_t *p_this, int fd, const v_socket_t *, uint8_t *p_data, size_t i_data, mtime_t i_wait ) ); +#define net_ReadNonBlock(a,b,c,d,e) __net_ReadNonBlock(VLC_OBJECT(a),b,c,d,e) +VLC_EXPORT( ssize_t, __net_ReadNonBlock, ( vlc_object_t *p_this, int fd, const v_socket_t *, uint8_t *p_data, size_t i_data ) ); -#define net_Select(a,b,c,d,e,f) __net_Select(VLC_OBJECT(a),b,c,d,e,f) -VLC_EXPORT( ssize_t, __net_Select, ( vlc_object_t *p_this, const int *pi_fd, int i_fd, uint8_t *p_data, size_t i_data, mtime_t i_wait ) ); +#define net_Select(a,b,c,d,e) __net_Select(VLC_OBJECT(a),b,c,d,e) +VLC_EXPORT( ssize_t, __net_Select, ( vlc_object_t *p_this, const int *pi_fd, int i_fd, uint8_t *p_data, size_t i_data ) ); #define net_Write(a,b,c,d,e) __net_Write(VLC_OBJECT(a),b,c,d,e) VLC_EXPORT( ssize_t, __net_Write, ( vlc_object_t *p_this, int fd, const v_socket_t *, const uint8_t *p_data, size_t i_data ) ); diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index cc9a68aff5..732c9be6bf 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -526,7 +526,7 @@ static void Run( services_discovery_t *p_sd ) i_read = net_Select( p_sd, p_sd->p_sys->pi_fd, p_sd->p_sys->i_fd, p_buffer, - MAX_SAP_BUFFER, 500000 ); + MAX_SAP_BUFFER ); /* Check for items that need deletion */ for( i = 0; i < p_sd->p_sys->i_announces; i++ ) diff --git a/src/network/io.c b/src/network/io.c index b9a564d0f1..e946cfd91c 100644 --- a/src/network/io.c +++ b/src/network/io.c @@ -435,19 +435,16 @@ ssize_t __net_ReadNonBlock( vlc_object_t *restrict p_this, int fd, /***************************************************************************** * __net_Select: ***************************************************************************** - * Read from several sockets (with timeout). Takes data from the first socket - * that has some. - * NOTE: DO NOT USE this API with a non-zero delay. You were warned. + * Read from several sockets. Takes data from the first socket that has some. *****************************************************************************/ ssize_t __net_Select( vlc_object_t *restrict p_this, const int *restrict fds, int nfd, - uint8_t *restrict buf, size_t len, mtime_t i_wait ) + uint8_t *restrict buf, size_t len ) { const v_socket_t *vsv[nfd]; memset( vsv, 0, sizeof (vsv) ); - return net_ReadInner( p_this, nfd, fds, vsv, buf, len, - i_wait / 1000, VLC_FALSE ); + return net_ReadInner( p_this, nfd, fds, vsv, buf, len, -1, VLC_FALSE ); } -- 2.39.2