* sunrpc/rtime.c (rtime): Use poll instead of select.

1998-06-28  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
This commit is contained in:
Ulrich Drepper 1998-06-28 18:50:22 +00:00
parent 099a6fbd8a
commit ba488034ea
2 changed files with 16 additions and 12 deletions

View file

@ -1,3 +1,7 @@
1998-06-28 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sunrpc/rtime.c (rtime): Use poll instead of select.
1998-06-28 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sunrpc/clnt_tcp.c (readtcp): Use poll instead of select.

View file

@ -8,23 +8,23 @@ static char sccsid[] = "@(#)rtime.c 2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 S
* may copy or modify Sun RPC without charge, but are not authorized
* to license or distribute it to anyone else except as part of a product or
* program developed by the user.
*
*
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
*
*
* Sun RPC is provided with no support and without any obligation on the
* part of Sun Microsystems, Inc. to assist in its use, correction,
* modification or enhancement.
*
*
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
* OR ANY PART THEREOF.
*
*
* In no event will Sun Microsystems, Inc. be liable for any lost revenue
* or profits or other special, indirect and consequential damages, even if
* Sun has been advised of the possibility of such damages.
*
*
* Sun Microsystems, Inc.
* 2550 Garcia Avenue
* Mountain View, California 94043
@ -47,6 +47,7 @@ static char sccsid[] = "@(#)rtime.c 2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 S
#include <rpc/rpc.h>
#include <rpc/clnt.h>
#include <sys/types.h>
#include <sys/poll.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <rpc/auth_des.h>
@ -73,7 +74,8 @@ rtime (struct sockaddr_in *addrp, struct timeval *timep,
struct timeval *timeout)
{
int s;
fd_set readfds;
struct pollfd fd;
int milliseconds;
int res;
unsigned long thetime;
struct sockaddr_in from;
@ -100,13 +102,11 @@ rtime (struct sockaddr_in *addrp, struct timeval *timep,
do_close (s);
return -1;
}
milliseconds = (timeout->tv_sec * 1000) + (timeout->tv_usec / 1000);
fd.fd = s;
fd.events = POLLIN;
do
{
FD_ZERO (&readfds);
FD_SET (s, &readfds);
res = select (_rpc_dtablesize (), &readfds, (void *) NULL,
(void *) NULL, timeout);
}
res = __poll (&fd, 1, milliseconds);
while (res < 0 && errno == EINTR);
if (res <= 0)
{