[project @ 2002-09-25 15:24:07 by simonmar]

[haskell-directory.git] / cbits / inputReady.c

diff --git a/cbits/inputReady.c b/cbits/inputReady.c
index 79a605a..8677f26 100644 (file)
--- a/cbits/inputReady.c
+++ b/cbits/inputReady.c
@@ -1,14 +1,12 @@
 /* 
- * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
+ * (c) The GRASP/AQUA Project, Glasgow University, 1994-2002
  *
- * $Id: inputReady.c,v 1.3 2001/08/17 12:50:34 simonmar Exp $
- *
- * hReady Runtime Support
+ * hWaitForInput Runtime Support
  */
 
 /* select and supporting types is not Posix */
 /* #include "PosixSource.h" */
-#include "HsCore.h"
+#include "HsBase.h"
 
 /*
  * inputReady(fd) checks to see whether input is available on the file
@@ -16,35 +14,53 @@
  * *character* from this file object without blocking?'
  */
 int
-inputReady(int fd, int msecs)
+inputReady(int fd, int msecs, int isSock)
 {
+    if 
 #ifndef mingw32_TARGET_OS
-    int maxfd, ready;
-    fd_set rfd;
-    struct timeval tv;
+    ( 1 ) {
+#else
+    ( isSock ) {
 #endif
-
+       int maxfd, ready;
+       fd_set rfd;
+       struct timeval tv;
+       
+       FD_ZERO(&rfd);
+       FD_SET(fd, &rfd);
+       
+       /* select() will consider the descriptor set in the range of 0 to
+        * (maxfd-1) 
+        */
+       maxfd = fd + 1;
+       tv.tv_sec  = msecs / 1000;
+       tv.tv_usec = msecs % 1000;
+       
+       while ((ready = select(maxfd, &rfd, NULL, NULL, &tv)) < 0 ) {
+           if (errno != EINTR ) {
+               return -1;
+           }
+       }
+       
+       /* 1 => Input ready, 0 => not ready, -1 => error */
+       return (ready);
+    }
 #ifdef mingw32_TARGET_OS
-    return 1;
-#else
-    FD_ZERO(&rfd);
-    FD_SET(fd, &rfd);
-
-    /* select() will consider the descriptor set in the range of 0 to
-     * (maxfd-1) 
-     */
-    maxfd = fd + 1;
-    tv.tv_sec  = msecs / 1000;
-    tv.tv_usec = msecs % 1000;
-
-    while ((ready = select(maxfd, &rfd, NULL, NULL, &tv)) < 0 ) {
-      if (errno != EINTR ) {
-          return -1;
-      }
-   }
-
-    /* 1 => Input ready, 0 => not ready, -1 => error */
-    return (ready);
-
+    else {
+       DWORD rc;
+       HANDLE hFile = (HANDLE)_get_osfhandle(fd);
+       
+       rc = WaitForMultipleObjects( 1,
+                                    &hFile,
+                                    TRUE,   /* wait all */
+                                    msecs); /*millisecs*/
+       
+       /* 1 => Input ready, 0 => not ready, -1 => error */
+       switch (rc) {
+       case WAIT_TIMEOUT: return 0;
+       case WAIT_OBJECT_0: return 1;
+       default: return -1;
+       }
+    }
 #endif
-}
+}