guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-13-116-g5


From: Andy Wingo
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-13-116-g50a4533
Date: Thu, 02 Dec 2010 22:38:14 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=50a4533f82e930adc357345e364672ac6c07ea16

The branch, master has been updated
       via  50a4533f82e930adc357345e364672ac6c07ea16 (commit)
      from  e68e0369cc4fd2148c027f155ed40967cc49d752 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 50a4533f82e930adc357345e364672ac6c07ea16
Author: Andy Wingo <address@hidden>
Date:   Thu Dec 2 23:41:00 2010 +0100

    no need for fport_fill_input to select() before read()
    
    * libguile/fports.c (fport_fill_input): Likewise to the previous commit,
      no need to select() before read().

-----------------------------------------------------------------------

Summary of changes:
 libguile/fports.c |   30 ------------------------------
 1 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/libguile/fports.c b/libguile/fports.c
index fd8faf8..4b190e1 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -643,33 +643,6 @@ fport_print (SCM exp, SCM port, scm_print_state *pstate 
SCM_UNUSED)
   return 1;
 }
 
-#ifndef __MINGW32__
-/* thread-local block for input on fport's fdes.  */
-static void
-fport_wait_for_input (SCM port)
-{
-  int fdes = SCM_FSTREAM (port)->fdes;
-
-  if (!fport_input_waiting (port))
-    {
-      int n;
-      SELECT_TYPE readfds;
-      int flags = fcntl (fdes, F_GETFL);
-
-      if (flags == -1)
-       scm_syserror ("scm_fdes_wait_for_input");
-      if (!(flags & O_NONBLOCK))
-       do
-         {
-           FD_ZERO (&readfds);
-           FD_SET (fdes, &readfds);
-           n = scm_std_select (fdes + 1, &readfds, NULL, NULL, NULL);
-         }
-       while (n == -1 && errno == EINTR);
-    }
-}
-#endif /* !__MINGW32__ */
-
 static void fport_flush (SCM port);
 
 /* fill a port's read-buffer with a single read.  returns the first
@@ -681,9 +654,6 @@ fport_fill_input (SCM port)
   scm_t_port *pt = SCM_PTAB_ENTRY (port);
   scm_t_fport *fp = SCM_FSTREAM (port);
 
-#ifndef __MINGW32__
-  fport_wait_for_input (port);
-#endif /* !__MINGW32__ */
   SCM_SYSCALL (count = read (fp->fdes, pt->read_buf, pt->read_buf_size));
   if (count == -1)
     scm_syserror ("fport_fill_input");


hooks/post-receive
-- 
GNU Guile



reply via email to

[Prev in Thread] Current Thread [Next in Thread]