iopause: assume poll() is available

Since poll() is available on all platforms we care about, we don't need to
check if it is.

This gets rid of trypoll.c, the last configure-time check that required to be
run on the host (messing with cross). We also get rid of trysysel.c, since
select() was only used as a fallback when poll() isn't avaialble.

Author: 0x5c

src/Makefile

@@ -229,10 +229,7 @@ hassgprm.h: choose compile hassgprm.h1 hassgprm.h2 load trysgprm.c
 haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c
 	./choose cl trywaitp haswaitp.h1 haswaitp.h2 > haswaitp.h
 
-iopause.h: choose compile iopause.h1 iopause.h2 load trypoll.c
-	./choose clr trypoll iopause.h1 iopause.h2 > iopause.h
-
-iopause.o: compile iopause.c iopause.h select.h tai.h taia.h
+iopause.o: compile iopause.c tai.h taia.h
 	./compile iopause.c
 
 load: conf-ld print-ld.sh warn-auto.sh
@@ -291,9 +288,6 @@ scan_ulong.o: compile scan.h scan_ulong.c
 seek_set.o: compile seek.h seek_set.c
 	./compile seek_set.c
 
-select.h: choose compile select.h1 select.h2 trysysel.c
-	./choose c trysysel select.h1 select.h2 > select.h
-
 sgetopt.o: buffer.h compile sgetopt.c sgetopt.h subgetopt.h
 	./compile sgetopt.c
 
@@ -358,16 +352,14 @@ subgetopt.o: compile subgetopt.c subgetopt.h
 	./compile subgetopt.c
 
 sysdeps: compile direntry.h hasflock.h hasmkffo.h hassgact.h \
-hassgprm.h haswaitp.h iopause.h load select.h \
+hassgprm.h haswaitp.h load \
 reboot_system.h uw_tmp.h socket.lib
 	rm -f sysdeps
 	cat compile load socket.lib >>sysdeps
 	grep sysdep direntry.h >>sysdeps
 	grep sysdep haswaitp.h >>sysdeps
 	grep sysdep hassgact.h >>sysdeps
 	grep sysdep hassgprm.h >>sysdeps
-	grep sysdep select.h >>sysdeps
-	grep sysdep iopause.h >>sysdeps
 	grep sysdep hasmkffo.h >>sysdeps
 	grep sysdep hasflock.h >>sysdeps
 	grep sysdep reboot_system.h >>sysdeps

src/TARGETS

@@ -67,7 +67,6 @@ hasmkffo.h
 hassgact.h
 hassgprm.h
 haswaitp.h
-iopause.h
 iopause.o
 load
 lock_ex.o
@@ -85,7 +84,6 @@ pathexec_run.o
 readclose.o
 scan_ulong.o
 seek_set.o
-select.h
 sgetopt.o
 sig.o
 sig_block.o

src/iopause.c

@@ -1,7 +1,6 @@
 /* Public domain. */
 
 #include "taia.h"
-#include "select.h"
 #include "iopause.h"
 
 void iopause(iopause_fd *x,unsigned int len,struct taia *deadline,struct taia *stamp)
@@ -24,55 +23,9 @@ void iopause(iopause_fd *x,unsigned int len,struct taia *deadline,struct taia *s
   for (i = 0;i < len;++i)
     x[i].revents = 0;
 
-#ifdef IOPAUSE_POLL
-
   poll(x,len,millisecs);
   /* XXX: some kernels apparently need x[0] even if len is 0 */
   /* XXX: how to handle EAGAIN? are kernels really this dumb? */
   /* XXX: how to handle EINVAL? when exactly can this happen? */
 
-#else
-{
-
-  struct timeval tv;
-  fd_set rfds;
-  fd_set wfds;
-  int nfds;
-  int fd;
-
-  FD_ZERO(&rfds);
-  FD_ZERO(&wfds);
-
-  nfds = 1;
-  for (i = 0;i < len;++i) {
-    fd = x[i].fd;
-    if (fd < 0) continue;
-    if (fd >= 8 * sizeof(fd_set)) continue; /*XXX*/
-
-    if (fd >= nfds) nfds = fd + 1;
-    if (x[i].events & IOPAUSE_READ) FD_SET(fd,&rfds);
-    if (x[i].events & IOPAUSE_WRITE) FD_SET(fd,&wfds);
-  }
-
-  tv.tv_sec = millisecs / 1000;
-  tv.tv_usec = 1000 * (millisecs % 1000);
-
-  if (select(nfds,&rfds,&wfds,(fd_set *) 0,&tv) <= 0)
-    return;
-    /* XXX: for EBADF, could seek out and destroy the bad descriptor */
-
-  for (i = 0;i < len;++i) {
-    fd = x[i].fd;
-    if (fd < 0) continue;
-    if (fd >= 8 * sizeof(fd_set)) continue; /*XXX*/
-
-    if (x[i].events & IOPAUSE_READ)
-      if (FD_ISSET(fd,&rfds)) x[i].revents |= IOPAUSE_READ;
-    if (x[i].events & IOPAUSE_WRITE)
-      if (FD_ISSET(fd,&wfds)) x[i].revents |= IOPAUSE_WRITE;
-  }
-
-}
-#endif
-
 }

src/iopause.h2 src/iopause.hsrc/iopause.h2 renamed to src/iopause.h

@@ -3,9 +3,6 @@
 #ifndef IOPAUSE_H
 #define IOPAUSE_H
 
-/* sysdep: +poll */
-#define IOPAUSE_POLL
-
 #include <sys/types.h>
 #include <poll.h>
 

src/iopause.h1

@@ -47,10 +47,6 @@ int main (int argc, const char * const *argv, char * const *envp) {
   int wstat;
   int st;
   iopause_fd x;
-#ifndef IOPAUSE_POLL
-  fd_set rfds;
-  struct timeval t;
-#endif
   char ch;
   int ttyfd;
   struct stat s;
@@ -145,14 +141,7 @@ int main (int argc, const char * const *argv, char * const *envp) {
       sig_unblock(sig_child);
       sig_unblock(sig_cont);
       sig_unblock(sig_int);
-#ifdef IOPAUSE_POLL
       poll(&x, 1, 14000);
-#else
-      t.tv_sec =14; t.tv_usec =0;
-      FD_ZERO(&rfds);
-      FD_SET(x.fd, &rfds);
-      select(x.fd +1, &rfds, (fd_set*)0, (fd_set*)0, &t);
-#endif
       sig_block(sig_cont);
       sig_block(sig_child);
       sig_block(sig_int);