diff options
| author | Yann Ylavic <ylavic@apache.org> | 2023-03-21 17:21:31 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2023-03-21 17:21:31 +0000 |
| commit | e30064f49e36599e1fc0926430f6a1c6c9d12f2d (patch) | |
| tree | c89107f782e15d68c776b68466239c337ba4a5b3 | |
| parent | 99fffba15352cac7b21bf9efd3fb1b5484af1415 (diff) | |
| download | apr-e30064f49e36599e1fc0926430f6a1c6c9d12f2d.tar.gz | |
tests: Follow up to r1908616: Simplify epoll_wait() check.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1908618 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 2225cb0a4..ea9a9337a 100644 --- a/configure.in +++ b/configure.in @@ -1124,7 +1124,6 @@ if test "$apr_cv_epoll_create1" = "yes"; then AC_DEFINE([HAVE_EPOLL_CREATE1], 1, [Define if epoll_create1 function is supported]) fi -# check if epoll_wait() timeout is a reliable as min min AC_CACHE_CHECK([whether epoll_wait has a reliable timeout (min)], [apr_cv_epoll_wait_has_reliable_timeout], [AC_TRY_RUN([ @@ -1132,14 +1131,12 @@ AC_CACHE_CHECK([whether epoll_wait has a reliable timeout (min)], #include <sys/epoll.h> #include <sys/time.h> /* for gettimeofday */ -#define TV2US(tv) ((long long)(tv).tv_sec * 1000000 + (tv).tv_usec) +#define TV2US(tv) ((tv).tv_sec * 1000000LL + (tv).tv_usec) int main(int argc, const char *argv[]) { - int ret = 0, fd, i; - struct epoll_event events; - struct timeval t1, t2; - + struct epoll_event events[1]; + int fd, i; #ifdef HAVE_EPOLL_CREATE1 fd = epoll_create1(0); #else @@ -1149,13 +1146,16 @@ int main(int argc, const char *argv[]) return 1; } for (i = 0; i < 10; ++i) { + struct timeval t1 = {0,}, + t2 = {0,}; (void)gettimeofday(&t1, NULL); - (void)epoll_wait(fd, &events, 1, 100); /* ms */ + (void)epoll_wait(fd, events, 1, 100); /* ms */ (void)gettimeofday(&t2, NULL); - ret |= (TV2US(t2) - TV2US(t1)) < 100000; /* us */ + if (TV2US(t2) - TV2US(t1) < 100000) { /* us */ + return 1; + } } - close(fd); - return ret; + return 0; }], [apr_cv_epoll_wait_has_reliable_timeout=yes], [apr_cv_epoll_wait_has_reliable_timeout=no], [apr_cv_epoll_wait_has_reliable_timeout=no])]) |