mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

rely on gnulib for `poll'

Browse source 
* configure.ac:
* libguile/fports.c (fport_input_waiting):
* libguile/poll.c (scm_primitive_poll): Rely on gnulib to provide poll
  for us.
This commit is contained in:
Jason Earl 2013-03-10 23:44:23 +01:00 • committed by Andy Wingo
parent 428f9e95fc
commit b5870f25ad
3 changed files with 4 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libguile/fports.c
View file

@ -41,9 +41,7 @@
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
#include <sys/stat.h>
#endif
#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
@ -546,42 +544,12 @@ fport_input_waiting (SCM port)
{
int fdes = SCM_FSTREAM (port)->fdes;
/* `FD_SETSIZE', which is 1024 on GNU systems, effectively limits the
highest numerical value of file descriptors that can be monitored.
Thus, use poll(2) whenever that is possible. */
#if defined(HAVE_POLL) && defined(HAVE_STRUCT_POLLFD)
struct pollfd pollfd = { fdes, POLLIN, 0 };
if (poll (&pollfd, 1, 0) < 0)
scm_syserror ("fport_input_waiting");
return pollfd.revents & POLLIN ? 1 : 0;
#else
struct timeval timeout;
fd_set read_set;
fd_set write_set;
fd_set except_set;
FD_ZERO (&read_set);
FD_ZERO (&write_set);
FD_ZERO (&except_set);
if (fdes < FD_SETSIZE)
FD_SET (fdes, &read_set);
else
scm_out_of_range ("fport_input_waiting", scm_from_int (fdes));
timeout.tv_sec = 0;
timeout.tv_usec = 0;
if (select (fdes + 1,
&read_set, &write_set, &except_set, &timeout)
< 0)
scm_syserror ("fport_input_waiting");
return FD_ISSET (fdes, &read_set) ? 1 : 0;
#endif
}

13
libguile/poll.c
View file

@ -25,6 +25,8 @@
# include <config.h>
#endif
#include <poll.h>
#include "libguile/_scm.h"
#include "libguile/bytevectors.h"
#include "libguile/numbers.h"
@ -33,11 +35,6 @@
#include "libguile/poll.h"
#ifdef HAVE_POLL_H
#include <poll.h>
#endif
/* {Poll}
@ -73,7 +70,6 @@
If timeout is given and is non-negative, the poll will return after that
number of milliseconds if no fd became active.
*/
#if defined(HAVE_POLL) && defined(HAVE_STRUCT_POLLFD)
static SCM
scm_primitive_poll (SCM pollfds, SCM nfds, SCM ports, SCM timeout)
#define FUNC_NAME "primitive-poll"
@ -174,7 +170,6 @@ scm_primitive_poll (SCM pollfds, SCM nfds, SCM ports, SCM timeout)
return scm_from_int (rv);
}
#undef FUNC_NAME
#endif /* HAVE_POLL && HAVE_STRUCT_POLLFD */
@ -182,12 +177,8 @@ scm_primitive_poll (SCM pollfds, SCM nfds, SCM ports, SCM timeout)
static void
scm_init_poll (void)
{
#if defined(HAVE_POLL) && defined(HAVE_STRUCT_POLLFD)
scm_c_define_gsubr ("primitive-poll", 4, 0, 0, scm_primitive_poll);
scm_c_define ("%sizeof-struct-pollfd", scm_from_size_t (sizeof (struct pollfd)));
#else
scm_misc_error ("%init-poll", "`poll' unavailable on this platform", SCM_EOL);
#endif
#ifdef POLLIN
scm_c_define ("POLLIN", scm_from_int (POLLIN));