From bdb04ee8e21c3ee229bf3d2ad2ca8288e3cb44e9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 31 Jul 1999 06:11:24 +0000 Subject: Update. 1999-07-30 Andreas Schwab * sysdeps/unix/sysv/linux/getsysstats.c (GET_NPROCS_PARSER): New definition. (__get_nprocs): Use it. (__get_nprocs_conf): Define as separate function if GET_NPROCS_CONF_PARSER is defined. * sysdeps/unix/sysv/linux/alpha/getsysstats.c: New file. * include/sys/sysinfo.h: New file. * sysdeps/generic/sys/sysinfo.h: Remove declaration of internal interface. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Likewise. 1999-07-30 H.J. Lu * libio/iofflush.c (fflush_unlocked): Weak aliase if _IO_MTSAFE_IO is not defined. * libio/clearerr.c (clearerr_unlocked): Likewise. * libio/feof.c (feof_unlocked): Likewise. * libio/ferror.c (ferror_unlocked): Likewise. * libio/fputc.c (fputc_unlocked): Likewise. * libio/getc.c (getc_unlocked, fgetc_unlocked): Likewise. * libio/getchar.c (getchar_unlocked): Likewise. * libio/putc.c (putc_unlocked): Likewise. * libio/putchar.c (putchar_unlocked): Likewise. 1999-07-30 Thorsten Kukuk * sunrpc/Versions: Add svc_getreq_common, svc_getreq_poll, svc_max_pollfd and svc_pollfd to GLIBC_2.2 * sunrpc/rpc/svc.h: Use rpc*_t types, add new prototypes for svc_run/poll interface. * sunrpc/rpc/types.h: Add rpc*_t typedefs. * sunrpc/rpc_common.c: Add svc_pollfd and svc_max_pollfd as global variable. * sunrpc/svc.c: Add svc_getreq_poll and svc_getreq_common, rewrite other svc_getreq* functions to use svc_getreq_common. * sunrpc/svc_run.c: Use poll(). 1999-07-30 Andreas Schwab * Makerules: Put sysd-versions and Versions.all on postclean-generated instead of common-generated. 1999-07-29 Andreas Jaeger * manual/time.texi (Basic CPU Time): Note that clock_t can wrap around and CLOCKS_PER_SEC is 1e6. --- sunrpc/svc_run.c | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) (limited to 'sunrpc/svc_run.c') diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c index 799c0125d6..e6ffb0f027 100644 --- a/sunrpc/svc_run.c +++ b/sunrpc/svc_run.c @@ -1,8 +1,3 @@ -/* @(#)svc_run.c 2.1 88/07/29 4.0 RPCSRC */ -#if !defined(lint) && defined(SCCSIDS) -static char sccsid[] = "@(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro"; -#endif - /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -31,60 +26,58 @@ static char sccsid[] = "@(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro"; * 2550 Garcia Avenue * Mountain View, California 94043 */ - /* * This is the rpc server side idle loop * Wait for input, call server program. */ + #include +#include #include +#include #include -static int svc_stop; - /* This function can be used as a signal handler to terminate the server loop. */ void svc_exit (void) { - svc_stop = 1; + free (svc_pollfd); + svc_pollfd = NULL; + svc_max_pollfd = 0; } void svc_run (void) { -#ifdef FD_SETSIZE - fd_set readfds; -#else - int readfds; -#endif /* def FD_SETSIZE */ - - svc_stop = 0; + int i; for (;;) { - if (svc_stop) + struct pollfd *my_pollfd; + + if (svc_max_pollfd == 0 && svc_pollfd == NULL) return; -#ifdef FD_SETSIZE - readfds = svc_fdset; -#else - readfds = svc_fds; -#endif /* def FD_SETSIZE */ - switch (__select (_rpc_dtablesize (), &readfds, (fd_set *)NULL, - (fd_set *)NULL, (struct timeval *) 0)) + my_pollfd = malloc (sizeof (struct pollfd) * svc_max_pollfd); + for (i = 0; i < svc_max_pollfd; ++i) + { + my_pollfd[i].fd = svc_pollfd[i].fd; + my_pollfd[i].events = svc_pollfd[i].events; + my_pollfd[i].revents = 0; + } + + switch (i = __poll (my_pollfd, svc_max_pollfd, -1)) { case -1: if (errno == EINTR) - { - continue; - } - perror (_("svc_run: - select failed")); + continue; + perror (_("svc_run: - poll failed")); return; case 0: continue; default: - svc_getreqset (&readfds); + svc_getreq_poll (my_pollfd, i); } } } -- cgit v1.2.1