aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

poll and EINTRLOOP - added fragment from links

Browse Source
This commit is contained in:
Witold Filipczyk 2017-11-11 21:37:08 +01:00
parent 8c39acc277
commit 050f304161
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -207,7 +207,7 @@ AC_CHECK_HEADERS([net/if.h], [], [],
AC_CHECK_HEADERS(stdint.h inttypes.h) AC_CHECK_HEADERS(stdint.h inttypes.h)
AC_CHECK_HEADERS(locale.h pwd.h) AC_CHECK_HEADERS(locale.h pwd.h)
AC_CHECK_HEADERS(termios.h) AC_CHECK_HEADERS(termios.h)
AC_CHECK_HEADERS(poll.h)
AC_CHECK_HEADERS(sys/un.h, AC_CHECK_HEADERS(sys/un.h,
[CONFIG_INTERLINK=yes [CONFIG_INTERLINK=yes
@ -312,6 +312,8 @@ AC_CHECK_FUNCS(kill, HAVE_KILL=yes)
AC_CHECK_FUNCS(fpathconf, HAVE_FPATHCONF=yes) AC_CHECK_FUNCS(fpathconf, HAVE_FPATHCONF=yes)
AC_CHECK_FUNCS(poll, HAVE_POLL=yes)
if test x"$HAVE_RAISE" = x; then if test x"$HAVE_RAISE" = x; then
if test x"$HAVE_KILL" = x || test x"$HAVE_GETPID" = x; then if test x"$HAVE_KILL" = x || test x"$HAVE_GETPID" = x; then
AC_MSG_ERROR([Unable to emulate raise()]) AC_MSG_ERROR([Unable to emulate raise()])

25
src/main/select.c
View File

@ -25,10 +25,23 @@
#ifdef HAVE_INTTYPES_H #ifdef HAVE_INTTYPES_H
#include <inttypes.h> /* OMG */ #include <inttypes.h> /* OMG */
#endif #endif
#if defined(HAVE_POLL_H) && defined(HAVE_POLL) && !defined(INTERIX) && !defined(__HOS_AIX__)
#define USE_POLL
#include <poll.h>
#endif
#ifdef HAVE_SYS_SELECT_H #ifdef HAVE_SYS_SELECT_H
#include <sys/select.h> #include <sys/select.h>
#endif #endif
#define EINTRLOOPX(ret_, call_, x_) \
do { \
(ret_) = (call_); \
} while ((ret_) == (x_) && errno == EINTR)
#define EINTRLOOP(ret_, call_) EINTRLOOPX(ret_, call_, -1)
#include "elinks.h" #include "elinks.h"
#include "intl/gettext/libintl.h" #include "intl/gettext/libintl.h"
@ -340,6 +353,17 @@ select_loop(void (*init)(void))
static int static int
can_read_or_write(int fd, int write) can_read_or_write(int fd, int write)
{ {
#if defined(USE_POLL)
struct pollfd p;
int rs;
p.fd = fd;
p.events = !write ? POLLIN : POLLOUT;
EINTRLOOP(rs, poll(&p, 1, 0));
if (rs < 0) elinks_internal("ERROR: poll for %s (%d) failed: %s", !write ? "read" : "write", fd, strerror(errno));
if (!rs) return 0;
if (p.revents & POLLNVAL) elinks_internal("ERROR: poll for %s (%d) failed: %s", !write ? "read" : "write", fd, strerror(errno));
return 1;
#else
struct timeval tv = {0, 0}; struct timeval tv = {0, 0};
fd_set fds; fd_set fds;
fd_set *rfds = NULL; fd_set *rfds = NULL;
@ -354,6 +378,7 @@ can_read_or_write(int fd, int write)
rfds = &fds; rfds = &fds;
return select(fd + 1, rfds, wfds, NULL, &tv); return select(fd + 1, rfds, wfds, NULL, &tv);
#endif
} }
int int