head	1.2;
access;
symbols
	RELEASE_8_0_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2010.01.06.06.31.21;	author stas;	state dead;
branches;
next	1.1;

1.1
date	2009.06.02.17.25.37;	author stas;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to patchlevel 248.
@
text
@--- eval.c	2009/05/26 05:24:19	23576
+++ eval.c	2009/05/26 11:54:05	23577
@@@@ -74,7 +74,16 @@@@
 
 #include <time.h>
 
-#ifdef __BEOS__
+#if defined(HAVE_FCNTL_H) || defined(_WIN32)
+#include <fcntl.h>
+#elif defined(HAVE_SYS_FCNTL_H)
+#include <sys/fcntl.h>
+#endif
+#ifdef __CYGWIN__
+#include <io.h>
+#endif
+
+#if defined(__BEOS__) && !defined(BONE)
 #include <net/socket.h>
 #endif
 
@@@@ -11084,20 +11093,60 @@@@
 #ifdef ERESTART
 	    if (e == ERESTART) goto again;
 #endif
-	    FOREACH_THREAD_FROM(curr, th) {
-		if (th->wait_for & WAIT_SELECT) {
-		    int v = 0;
-
-		    v |= find_bad_fds(&readfds, &th->readfds, th->fd);
-		    v |= find_bad_fds(&writefds, &th->writefds, th->fd);
-		    v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd);
-		    if (v) {
-			th->select_value = n;
-			n = max;
-		    }
-		}
-	    }
-	    END_FOREACH_FROM(curr, th);
+            if (e == EBADF) {
+                int badfd = -1;
+                int fd;
+                int dummy;
+                for (fd = 0; fd <= max; fd++) {
+                    if ((FD_ISSET(fd, &readfds) ||
+                         FD_ISSET(fd, &writefds) ||
+                         FD_ISSET(fd, &exceptfds)) &&
+                        fcntl(fd, F_GETFD, &dummy) == -1 &&
+                        errno == EBADF) {
+                        badfd = fd;
+                        break;
+                    }
+                }
+                if (badfd != -1) {
+                    FOREACH_THREAD_FROM(curr, th) {
+                        if (th->wait_for & WAIT_FD) {
+                            if (th->fd == badfd) {
+                                found = 1;
+                                th->status = THREAD_RUNNABLE;
+                                th->fd = 0;
+                                break;
+                            }
+                        }
+                        if (th->wait_for & WAIT_SELECT) {
+                            if (FD_ISSET(badfd, &th->readfds) ||
+                                FD_ISSET(badfd, &th->writefds) ||
+                                FD_ISSET(badfd, &th->exceptfds)) {
+                                found = 1;
+                                th->status = THREAD_RUNNABLE;
+                                th->select_value = -EBADF;
+                                break;
+                            }
+                        }
+                    }
+                    END_FOREACH_FROM(curr, th);
+                }
+            }
+            else {
+                FOREACH_THREAD_FROM(curr, th) {
+                    if (th->wait_for & WAIT_SELECT) {
+                        int v = 0;
+
+                        v |= find_bad_fds(&readfds, &th->readfds, th->fd);
+                        v |= find_bad_fds(&writefds, &th->writefds, th->fd);
+                        v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd);
+                        if (v) {
+                            th->select_value = n;
+                            n = max;
+                        }
+                    }
+                }
+                END_FOREACH_FROM(curr, th);
+            }
 	}
  	if (select_timeout && n == 0) {
  	    if (now < 0.0) now = timeofday();
@@@@ -11408,6 +11457,10 @@@@
     if (read) *read = curr_thread->readfds;
     if (write) *write = curr_thread->writefds;
     if (except) *except = curr_thread->exceptfds;
+    if (curr_thread->select_value < 0) {
+        errno = -curr_thread->select_value;
+        return -1;
+    }
     return curr_thread->select_value;
 }
 
@


1.1
log
@- Update ruby 1.8.7 to the latest revision available from ruby-lang.org.
  This updates also borrows some important bugfixes from Ruby CVS that
  is not available in patchlevel 160 yet.
- Drop GC patch support. It is broken with the new ruby version and
  seem to require the complete rewriting.
@
text
@@

