changeset 526:0273528e9e37

. Remove Mac OS X specific code which is currently reported as actually causing problems on Mac OS X (specifically Leopard). This can be revived if someone sees problems on Tiger and is willing to clean it up.
author glewis@misty.eyesbeyond.com
date Thu, 22 Jan 2009 18:48:24 -0800
parents a87e8ceb2b1f
children afd16fa8b690
files src/os/bsd/vm/hpi_bsd.hpp
diffstat 1 files changed, 0 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/bsd/vm/hpi_bsd.hpp	Fri Jan 16 21:34:21 2009 -0800
+++ b/src/os/bsd/vm/hpi_bsd.hpp	Thu Jan 22 18:48:24 2009 -0800
@@ -33,10 +33,6 @@
 #include <sys/ioctl.h>
 #include <netdb.h>
 
-#ifdef __APPLE__
-#include <sys/select.h>
-#endif
-
 // HPI_FileInterface
 
 inline int hpi::close(int fd) {
@@ -83,27 +79,12 @@
 
   for(;;) {
     int res;
-#ifdef __APPLE__
-    // XXXDARWIN: poll() appears non-interruptable on Leopard: Thread.interrupt() failed to
-    // cause interrupt. Does poll work at all on Tiger? Needs investigation.
-    fd_set fdset;
-    struct timeval seltv;
-
-    FD_ZERO(&fdset);
-    FD_SET(fd, &fdset);
-
-    seltv.tv_sec = timeout / 1000;
-    seltv.tv_usec = (timeout % 1000) * 1000;
-
-    INTERRUPTIBLE_NORESTART(::select(fd+1, &fdset, NULL, NULL, &seltv), res, os::Bsd::clear_interrupted);
-#else
     struct pollfd pfd;
 
     pfd.fd = fd;
     pfd.events = POLLIN | POLLERR;
 
     INTERRUPTIBLE_NORESTART(::poll(&pfd, 1, timeout), res, os::Bsd::clear_interrupted);
-#endif
 
     if (res == OS_ERR && errno == EINTR) {