ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.c
(Generate patch)

Comparing libev/ev.c (file contents):
Revision 1.311 by root, Wed Jul 29 09:36:05 2009 UTC vs.
Revision 1.337 by root, Wed Mar 10 09:18:24 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
… …
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
… …
204#elif defined (MAXSIG) 207#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
215# define EV_NSIG 65 219# define EV_NSIG 65
216#endif 220#endif
217 221
218#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
… …
302# define EV_USE_EVENTFD 0 306# define EV_USE_EVENTFD 0
303# endif 307# endif
304#endif 308#endif
305 309
306#ifndef EV_USE_SIGNALFD 310#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 312# define EV_USE_SIGNALFD 1
309# else 313# else
310# define EV_USE_SIGNALFD 0 314# define EV_USE_SIGNALFD 0
311# endif 315# endif
312#endif 316#endif
… …
343# endif 347# endif
344#endif 348#endif
345 349
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 350/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 351
352#ifdef _AIX
353/* AIX has a completely broken poll.h header */
354# undef EV_USE_POLL
355# define EV_USE_POLL 0
356#endif
357
348#ifndef CLOCK_MONOTONIC 358#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 359# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 360# define EV_USE_MONOTONIC 0
351#endif 361#endif
352 362
… …
395# endif 405# endif
396# endif 406# endif
397# ifdef __cplusplus 407# ifdef __cplusplus
398extern "C" { 408extern "C" {
399# endif 409# endif
400int eventfd (unsigned int initval, int flags); 410int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 411# ifdef __cplusplus
402} 412}
403# endif 413# endif
404#endif 414#endif
405 415
406#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
407# include <sys/signalfd.h> 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
418# include <stdint.h>
419# ifndef SFD_NONBLOCK
420# define SFD_NONBLOCK O_NONBLOCK
408#endif 421# endif
422# ifndef SFD_CLOEXEC
423# ifdef O_CLOEXEC
424# define SFD_CLOEXEC O_CLOEXEC
425# else
426# define SFD_CLOEXEC 02000000
427# endif
428# endif
429# ifdef __cplusplus
430extern "C" {
431# endif
432int signalfd (int fd, const sigset_t *mask, int flags);
433
434struct signalfd_siginfo
435{
436 uint32_t ssi_signo;
437 char pad[128 - sizeof (uint32_t)];
438};
439# ifdef __cplusplus
440}
441# endif
442#endif
443
409 444
410/**/ 445/**/
411 446
412#if EV_VERIFY >= 3 447#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
425 */ 460 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 462
428#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
429#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
430/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
431 465
432#if __GNUC__ >= 4 466#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 467# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 468# define noinline __attribute__ ((noinline))
435#else 469#else
… …
476 510
477#if EV_USE_MONOTONIC 511#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
479#endif 513#endif
480 514
515#ifndef EV_FD_TO_WIN32_HANDLE
516# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
517#endif
518#ifndef EV_WIN32_HANDLE_TO_FD
519# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
520#endif
521#ifndef EV_WIN32_CLOSE_FD
522# define EV_WIN32_CLOSE_FD(fd) close (fd)
523#endif
524
481#ifdef _WIN32 525#ifdef _WIN32
482# include "ev_win32.c" 526# include "ev_win32.c"
483#endif 527#endif
484 528
485/*****************************************************************************/ 529/*****************************************************************************/
530
531#if EV_AVOID_STDIO
532static void noinline
533ev_printerr (const char *msg)
534{
535 write (STDERR_FILENO, msg, strlen (msg));
536}
537#endif
486 538
487static void (*syserr_cb)(const char *msg); 539static void (*syserr_cb)(const char *msg);
488 540
489void 541void
490ev_set_syserr_cb (void (*cb)(const char *msg)) 542ev_set_syserr_cb (void (*cb)(const char *msg))
… …
500 552
501 if (syserr_cb) 553 if (syserr_cb)
502 syserr_cb (msg); 554 syserr_cb (msg);
503 else 555 else
504 { 556 {
557#if EV_AVOID_STDIO
558 const char *err = strerror (errno);
559
560 ev_printerr (msg);
561 ev_printerr (": ");
562 ev_printerr (err);
563 ev_printerr ("\n");
564#else
505 perror (msg); 565 perror (msg);
566#endif
506 abort (); 567 abort ();
507 } 568 }
508} 569}
509 570
510static void * 571static void *
511ev_realloc_emul (void *ptr, long size) 572ev_realloc_emul (void *ptr, long size)
512{ 573{
574#if __GLIBC__
575 return realloc (ptr, size);
576#else
513 /* some systems, notably openbsd and darwin, fail to properly 577 /* some systems, notably openbsd and darwin, fail to properly
514 * implement realloc (x, 0) (as required by both ansi c-98 and 578 * implement realloc (x, 0) (as required by both ansi c-89 and
515 * the single unix specification, so work around them here. 579 * the single unix specification, so work around them here.
516 */ 580 */
517 581
518 if (size) 582 if (size)
519 return realloc (ptr, size); 583 return realloc (ptr, size);
520 584
521 free (ptr); 585 free (ptr);
522 return 0; 586 return 0;
587#endif
523} 588}
524 589
525static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 590static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
526 591
527void 592void
… …
535{ 600{
536 ptr = alloc (ptr, size); 601 ptr = alloc (ptr, size);
537 602
538 if (!ptr && size) 603 if (!ptr && size)
539 { 604 {
605#if EV_AVOID_STDIO
606 ev_printerr ("libev: memory allocation failed, aborting.\n");
607#else
540 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 608 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
609#endif
541 abort (); 610 abort ();
542 } 611 }
543 612
544 return ptr; 613 return ptr;
545} 614}
… …
822} 891}
823 892
824/*****************************************************************************/ 893/*****************************************************************************/
825 894
826inline_speed void 895inline_speed void
827fd_event_nc (EV_P_ int fd, int revents) 896fd_event_nocheck (EV_P_ int fd, int revents)
828{ 897{
829 ANFD *anfd = anfds + fd; 898 ANFD *anfd = anfds + fd;
830 ev_io *w; 899 ev_io *w;
831 900
832 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 901 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
844fd_event (EV_P_ int fd, int revents) 913fd_event (EV_P_ int fd, int revents)
845{ 914{
846 ANFD *anfd = anfds + fd; 915 ANFD *anfd = anfds + fd;
847 916
848 if (expect_true (!anfd->reify)) 917 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
850} 919}
851 920
852void 921void
853ev_feed_fd_event (EV_P_ int fd, int revents) 922ev_feed_fd_event (EV_P_ int fd, int revents)
854{ 923{
855 if (fd >= 0 && fd < anfdmax) 924 if (fd >= 0 && fd < anfdmax)
856 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
857} 926}
858 927
859/* make sure the external fd watch events are in-sync */ 928/* make sure the external fd watch events are in-sync */
860/* with the kernel/libev internal state */ 929/* with the kernel/libev internal state */
861inline_size void 930inline_size void
… …
876 945
877#if EV_SELECT_IS_WINSOCKET 946#if EV_SELECT_IS_WINSOCKET
878 if (events) 947 if (events)
879 { 948 {
880 unsigned long arg; 949 unsigned long arg;
881 #ifdef EV_FD_TO_WIN32_HANDLE
882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
883 #else
884 anfd->handle = _get_osfhandle (fd);
885 #endif
886 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
887 } 952 }
888#endif 953#endif
889 954
890 { 955 {
… …
928 ev_io_stop (EV_A_ w); 993 ev_io_stop (EV_A_ w);
929 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 994 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
930 } 995 }
931} 996}
932 997
933/* check whether the given fd is atcually valid, for error recovery */ 998/* check whether the given fd is actually valid, for error recovery */
934inline_size int 999inline_size int
935fd_valid (int fd) 1000fd_valid (int fd)
936{ 1001{
937#ifdef _WIN32 1002#ifdef _WIN32
938 return _get_osfhandle (fd) != -1; 1003 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
939#else 1004#else
940 return fcntl (fd, F_GETFD) != -1; 1005 return fcntl (fd, F_GETFD) != -1;
941#endif 1006#endif
942} 1007}
943 1008
… …
978 { 1043 {
979 anfds [fd].events = 0; 1044 anfds [fd].events = 0;
980 anfds [fd].emask = 0; 1045 anfds [fd].emask = 0;
981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1046 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
982 } 1047 }
1048}
1049
1050/* used to prepare libev internal fd's */
1051/* this is not fork-safe */
1052inline_speed void
1053fd_intern (int fd)
1054{
1055#ifdef _WIN32
1056 unsigned long arg = 1;
1057 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1058#else
1059 fcntl (fd, F_SETFD, FD_CLOEXEC);
1060 fcntl (fd, F_SETFL, O_NONBLOCK);
1061#endif
983} 1062}
984 1063
985/*****************************************************************************/ 1064/*****************************************************************************/
986 1065
987/* 1066/*
… …
1141 1220
1142static ANSIG signals [EV_NSIG - 1]; 1221static ANSIG signals [EV_NSIG - 1];
1143 1222
1144/*****************************************************************************/ 1223/*****************************************************************************/
1145 1224
1146/* used to prepare libev internal fd's */ 1225#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1147/* this is not fork-safe */
1148inline_speed void
1149fd_intern (int fd)
1150{
1151#ifdef _WIN32
1152 unsigned long arg = 1;
1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1154#else
1155 fcntl (fd, F_SETFD, FD_CLOEXEC);
1156 fcntl (fd, F_SETFL, O_NONBLOCK);
1157#endif
1158}
1159 1226
1160static void noinline 1227static void noinline
1161evpipe_init (EV_P) 1228evpipe_init (EV_P)
1162{ 1229{
1163 if (!ev_is_active (&pipe_w)) 1230 if (!ev_is_active (&pipe_w))
1164 { 1231 {
1165#if EV_USE_EVENTFD 1232# if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1233 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL) 1234 if (evfd < 0 && errno == EINVAL)
1168 evfd = eventfd (0, 0); 1235 evfd = eventfd (0, 0);
1169 1236
1170 if (evfd >= 0) 1237 if (evfd >= 0)
… …
1172 evpipe [0] = -1; 1239 evpipe [0] = -1;
1173 fd_intern (evfd); /* doing it twice doesn't hurt */ 1240 fd_intern (evfd); /* doing it twice doesn't hurt */
1174 ev_io_set (&pipe_w, evfd, EV_READ); 1241 ev_io_set (&pipe_w, evfd, EV_READ);
1175 } 1242 }
1176 else 1243 else
1177#endif 1244# endif
1178 { 1245 {
1179 while (pipe (evpipe)) 1246 while (pipe (evpipe))
1180 ev_syserr ("(libev) error creating signal/async pipe"); 1247 ev_syserr ("(libev) error creating signal/async pipe");
1181 1248
1182 fd_intern (evpipe [0]); 1249 fd_intern (evpipe [0]);
… …
1193evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1260evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1194{ 1261{
1195 if (!*flag) 1262 if (!*flag)
1196 { 1263 {
1197 int old_errno = errno; /* save errno because write might clobber it */ 1264 int old_errno = errno; /* save errno because write might clobber it */
1265 char dummy;
1198 1266
1199 *flag = 1; 1267 *flag = 1;
1200 1268
1201#if EV_USE_EVENTFD 1269#if EV_USE_EVENTFD
1202 if (evfd >= 0) 1270 if (evfd >= 0)
… …
1204 uint64_t counter = 1; 1272 uint64_t counter = 1;
1205 write (evfd, &counter, sizeof (uint64_t)); 1273 write (evfd, &counter, sizeof (uint64_t));
1206 } 1274 }
1207 else 1275 else
1208#endif 1276#endif
1209 write (evpipe [1], &old_errno, 1); 1277 write (evpipe [1], &dummy, 1);
1210 1278
1211 errno = old_errno; 1279 errno = old_errno;
1212 } 1280 }
1213} 1281}
1214 1282
… …
1263{ 1331{
1264#if EV_MULTIPLICITY 1332#if EV_MULTIPLICITY
1265 EV_P = signals [signum - 1].loop; 1333 EV_P = signals [signum - 1].loop;
1266#endif 1334#endif
1267 1335
1268#if _WIN32 1336#ifdef _WIN32
1269 signal (signum, ev_sighandler); 1337 signal (signum, ev_sighandler);
1270#endif 1338#endif
1271 1339
1272 signals [signum - 1].pending = 1; 1340 signals [signum - 1].pending = 1;
1273 evpipe_write (EV_A_ &sig_pending); 1341 evpipe_write (EV_A_ &sig_pending);
… …
1315 break; 1383 break;
1316 } 1384 }
1317} 1385}
1318#endif 1386#endif
1319 1387
1388#endif
1389
1320/*****************************************************************************/ 1390/*****************************************************************************/
1321 1391
1392#if EV_CHILD_ENABLE
1322static WL childs [EV_PID_HASHSIZE]; 1393static WL childs [EV_PID_HASHSIZE];
1323
1324#ifndef _WIN32
1325 1394
1326static ev_signal childev; 1395static ev_signal childev;
1327 1396
1328#ifndef WIFCONTINUED 1397#ifndef WIFCONTINUED
1329# define WIFCONTINUED(status) 0 1398# define WIFCONTINUED(status) 0
… …
1574#endif 1643#endif
1575#if EV_USE_INOTIFY 1644#if EV_USE_INOTIFY
1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1645 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1577#endif 1646#endif
1578#if EV_USE_SIGNALFD 1647#if EV_USE_SIGNALFD
1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1648 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1580#endif 1649#endif
1581 1650
1582 if (!(flags & 0x0000ffffU)) 1651 if (!(flags & 0x0000ffffU))
1583 flags |= ev_recommended_backends (); 1652 flags |= ev_recommended_backends ();
1584 1653
… …
1598 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1667 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1599#endif 1668#endif
1600 1669
1601 ev_prepare_init (&pending_w, pendingcb); 1670 ev_prepare_init (&pending_w, pendingcb);
1602 1671
1672#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1603 ev_init (&pipe_w, pipecb); 1673 ev_init (&pipe_w, pipecb);
1604 ev_set_priority (&pipe_w, EV_MAXPRI); 1674 ev_set_priority (&pipe_w, EV_MAXPRI);
1675#endif
1605 } 1676 }
1606} 1677}
1607 1678
1608/* free up a loop structure */ 1679/* free up a loop structure */
1609static void noinline 1680static void noinline
… …
1621 close (evfd); 1692 close (evfd);
1622#endif 1693#endif
1623 1694
1624 if (evpipe [0] >= 0) 1695 if (evpipe [0] >= 0)
1625 { 1696 {
1626 close (evpipe [0]); 1697 EV_WIN32_CLOSE_FD (evpipe [0]);
1627 close (evpipe [1]); 1698 EV_WIN32_CLOSE_FD (evpipe [1]);
1628 } 1699 }
1629 } 1700 }
1630 1701
1631#if EV_USE_SIGNALFD 1702#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w)) 1703 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd); 1704 close (sigfd);
1638 }
1639#endif 1705#endif
1640 1706
1641#if EV_USE_INOTIFY 1707#if EV_USE_INOTIFY
1642 if (fs_fd >= 0) 1708 if (fs_fd >= 0)
1643 close (fs_fd); 1709 close (fs_fd);
… …
1728 close (evfd); 1794 close (evfd);
1729#endif 1795#endif
1730 1796
1731 if (evpipe [0] >= 0) 1797 if (evpipe [0] >= 0)
1732 { 1798 {
1733 close (evpipe [0]); 1799 EV_WIN32_CLOSE_FD (evpipe [0]);
1734 close (evpipe [1]); 1800 EV_WIN32_CLOSE_FD (evpipe [1]);
1735 } 1801 }
1736 1802
1803#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1737 evpipe_init (EV_A); 1804 evpipe_init (EV_A);
1738 /* now iterate over everything, in case we missed something */ 1805 /* now iterate over everything, in case we missed something */
1739 pipecb (EV_A_ &pipe_w, EV_READ); 1806 pipecb (EV_A_ &pipe_w, EV_READ);
1807#endif
1740 } 1808 }
1741 1809
1742 postfork = 0; 1810 postfork = 0;
1743} 1811}
1744 1812
… …
1857#if EV_ASYNC_ENABLE 1925#if EV_ASYNC_ENABLE
1858 assert (asyncmax >= asynccnt); 1926 assert (asyncmax >= asynccnt);
1859 array_verify (EV_A_ (W *)asyncs, asynccnt); 1927 array_verify (EV_A_ (W *)asyncs, asynccnt);
1860#endif 1928#endif
1861 1929
1930#if EV_PREPARE_ENABLE
1862 assert (preparemax >= preparecnt); 1931 assert (preparemax >= preparecnt);
1863 array_verify (EV_A_ (W *)prepares, preparecnt); 1932 array_verify (EV_A_ (W *)prepares, preparecnt);
1933#endif
1864 1934
1935#if EV_CHECK_ENABLE
1865 assert (checkmax >= checkcnt); 1936 assert (checkmax >= checkcnt);
1866 array_verify (EV_A_ (W *)checks, checkcnt); 1937 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif
1867 1939
1868# if 0 1940# if 0
1941#if EV_CHILD_ENABLE
1869 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1942 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif
1871# endif 1945# endif
1872#endif 1946#endif
1873} 1947}
1874#endif 1948#endif
1875 1949
… …
1891 1965
1892 loop_init (EV_A_ flags); 1966 loop_init (EV_A_ flags);
1893 1967
1894 if (ev_backend (EV_A)) 1968 if (ev_backend (EV_A))
1895 { 1969 {
1896#ifndef _WIN32 1970#if EV_CHILD_ENABLE
1897 ev_signal_init (&childev, childcb, SIGCHLD); 1971 ev_signal_init (&childev, childcb, SIGCHLD);
1898 ev_set_priority (&childev, EV_MAXPRI); 1972 ev_set_priority (&childev, EV_MAXPRI);
1899 ev_signal_start (EV_A_ &childev); 1973 ev_signal_start (EV_A_ &childev);
1900 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1974 ev_unref (EV_A); /* child watcher should not keep loop alive */
1901#endif 1975#endif
… …
1914 EV_P = ev_default_loop_ptr; 1988 EV_P = ev_default_loop_ptr;
1915#endif 1989#endif
1916 1990
1917 ev_default_loop_ptr = 0; 1991 ev_default_loop_ptr = 0;
1918 1992
1919#ifndef _WIN32 1993#if EV_CHILD_ENABLE
1920 ev_ref (EV_A); /* child watcher */ 1994 ev_ref (EV_A); /* child watcher */
1921 ev_signal_stop (EV_A_ &childev); 1995 ev_signal_stop (EV_A_ &childev);
1922#endif 1996#endif
1923 1997
1924 loop_destroy (EV_A); 1998 loop_destroy (EV_A);
… …
2131 ANHE_at_cache (*he); 2205 ANHE_at_cache (*he);
2132 } 2206 }
2133} 2207}
2134 2208
2135/* fetch new monotonic and realtime times from the kernel */ 2209/* fetch new monotonic and realtime times from the kernel */
2136/* also detetc if there was a timejump, and act accordingly */ 2210/* also detect if there was a timejump, and act accordingly */
2137inline_speed void 2211inline_speed void
2138time_update (EV_P_ ev_tstamp max_block) 2212time_update (EV_P_ ev_tstamp max_block)
2139{ 2213{
2140#if EV_USE_MONOTONIC 2214#if EV_USE_MONOTONIC
2141 if (expect_true (have_monotonic)) 2215 if (expect_true (have_monotonic))
… …
2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2310 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2237 EV_INVOKE_PENDING; 2311 EV_INVOKE_PENDING;
2238 } 2312 }
2239#endif 2313#endif
2240 2314
2315#if EV_PREPARE_ENABLE
2241 /* queue prepare watchers (and execute them) */ 2316 /* queue prepare watchers (and execute them) */
2242 if (expect_false (preparecnt)) 2317 if (expect_false (preparecnt))
2243 { 2318 {
2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2319 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2245 EV_INVOKE_PENDING; 2320 EV_INVOKE_PENDING;
2246 } 2321 }
2322#endif
2247 2323
2248 if (expect_false (loop_done)) 2324 if (expect_false (loop_done))
2249 break; 2325 break;
2250 2326
2251 /* we might have forked, so reify kernel state if necessary */ 2327 /* we might have forked, so reify kernel state if necessary */
… …
2324#if EV_IDLE_ENABLE 2400#if EV_IDLE_ENABLE
2325 /* queue idle watchers unless other events are pending */ 2401 /* queue idle watchers unless other events are pending */
2326 idle_reify (EV_A); 2402 idle_reify (EV_A);
2327#endif 2403#endif
2328 2404
2405#if EV_CHECK_ENABLE
2329 /* queue check watchers, to be executed first */ 2406 /* queue check watchers, to be executed first */
2330 if (expect_false (checkcnt)) 2407 if (expect_false (checkcnt))
2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2408 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2409#endif
2332 2410
2333 EV_INVOKE_PENDING; 2411 EV_INVOKE_PENDING;
2334 } 2412 }
2335 while (expect_true ( 2413 while (expect_true (
2336 activecnt 2414 activecnt
… …
2475 2553
2476 if (expect_false (ev_is_active (w))) 2554 if (expect_false (ev_is_active (w)))
2477 return; 2555 return;
2478 2556
2479 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2557 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2480 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2558 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2481 2559
2482 EV_FREQUENT_CHECK; 2560 EV_FREQUENT_CHECK;
2483 2561
2484 ev_start (EV_A_ (W)w, 1); 2562 ev_start (EV_A_ (W)w, 1);
2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2563 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2555 timers [active] = timers [timercnt + HEAP0]; 2633 timers [active] = timers [timercnt + HEAP0];
2556 adjustheap (timers, timercnt, active); 2634 adjustheap (timers, timercnt, active);
2557 } 2635 }
2558 } 2636 }
2559 2637
2560 EV_FREQUENT_CHECK;
2561
2562 ev_at (w) -= mn_now; 2638 ev_at (w) -= mn_now;
2563 2639
2564 ev_stop (EV_A_ (W)w); 2640 ev_stop (EV_A_ (W)w);
2641
2642 EV_FREQUENT_CHECK;
2565} 2643}
2566 2644
2567void noinline 2645void noinline
2568ev_timer_again (EV_P_ ev_timer *w) 2646ev_timer_again (EV_P_ ev_timer *w)
2569{ 2647{
… …
2648 periodics [active] = periodics [periodiccnt + HEAP0]; 2726 periodics [active] = periodics [periodiccnt + HEAP0];
2649 adjustheap (periodics, periodiccnt, active); 2727 adjustheap (periodics, periodiccnt, active);
2650 } 2728 }
2651 } 2729 }
2652 2730
2653 EV_FREQUENT_CHECK;
2654
2655 ev_stop (EV_A_ (W)w); 2731 ev_stop (EV_A_ (W)w);
2732
2733 EV_FREQUENT_CHECK;
2656} 2734}
2657 2735
2658void noinline 2736void noinline
2659ev_periodic_again (EV_P_ ev_periodic *w) 2737ev_periodic_again (EV_P_ ev_periodic *w)
2660{ 2738{
… …
2665#endif 2743#endif
2666 2744
2667#ifndef SA_RESTART 2745#ifndef SA_RESTART
2668# define SA_RESTART 0 2746# define SA_RESTART 0
2669#endif 2747#endif
2748
2749#if EV_SIGNAL_ENABLE
2670 2750
2671void noinline 2751void noinline
2672ev_signal_start (EV_P_ ev_signal *w) 2752ev_signal_start (EV_P_ ev_signal *w)
2673{ 2753{
2674 if (expect_false (ev_is_active (w))) 2754 if (expect_false (ev_is_active (w)))
… …
2721 if (!((WL)w)->next) 2801 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD 2802# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/ 2803 if (sigfd < 0) /*TODO*/
2724# endif 2804# endif
2725 { 2805 {
2726# if _WIN32 2806# ifdef _WIN32
2807 evpipe_init (EV_A);
2808
2727 signal (w->signum, ev_sighandler); 2809 signal (w->signum, ev_sighandler);
2728# else 2810# else
2729 struct sigaction sa; 2811 struct sigaction sa;
2730 2812
2731 evpipe_init (EV_A); 2813 evpipe_init (EV_A);
… …
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2844 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif 2845#endif
2764#if EV_USE_SIGNALFD 2846#if EV_USE_SIGNALFD
2765 if (sigfd >= 0) 2847 if (sigfd >= 0)
2766 { 2848 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2849 sigset_t ss;
2850
2851 sigemptyset (&ss);
2852 sigaddset (&ss, w->signum);
2768 sigdelset (&sigfd_set, w->signum); 2853 sigdelset (&sigfd_set, w->signum);
2854
2769 signalfd (sigfd, &sigfd_set, 0); 2855 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2856 sigprocmask (SIG_UNBLOCK, &ss, 0);
2771 /*TODO: maybe unblock signal? */
2772 } 2857 }
2773 else 2858 else
2774#endif 2859#endif
2775 signal (w->signum, SIG_DFL); 2860 signal (w->signum, SIG_DFL);
2776 } 2861 }
2777 2862
2778 EV_FREQUENT_CHECK; 2863 EV_FREQUENT_CHECK;
2779} 2864}
2865
2866#endif
2867
2868#if EV_CHILD_ENABLE
2780 2869
2781void 2870void
2782ev_child_start (EV_P_ ev_child *w) 2871ev_child_start (EV_P_ ev_child *w)
2783{ 2872{
2784#if EV_MULTIPLICITY 2873#if EV_MULTIPLICITY
… …
2808 ev_stop (EV_A_ (W)w); 2897 ev_stop (EV_A_ (W)w);
2809 2898
2810 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2811} 2900}
2812 2901
2902#endif
2903
2813#if EV_STAT_ENABLE 2904#if EV_STAT_ENABLE
2814 2905
2815# ifdef _WIN32 2906# ifdef _WIN32
2816# undef lstat 2907# undef lstat
2817# define lstat(a,b) _stati64 (a,b) 2908# define lstat(a,b) _stati64 (a,b)
… …
2822#define MIN_STAT_INTERVAL 0.1074891 2913#define MIN_STAT_INTERVAL 0.1074891
2823 2914
2824static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2915static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2825 2916
2826#if EV_USE_INOTIFY 2917#if EV_USE_INOTIFY
2827# define EV_INOTIFY_BUFSIZE 8192 2918
2919/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2920# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2828 2921
2829static void noinline 2922static void noinline
2830infy_add (EV_P_ ev_stat *w) 2923infy_add (EV_P_ ev_stat *w)
2831{ 2924{
2832 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2925 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2833 2926
2834 if (w->wd < 0) 2927 if (w->wd >= 0)
2928 {
2929 struct statfs sfs;
2930
2931 /* now local changes will be tracked by inotify, but remote changes won't */
2932 /* unless the filesystem is known to be local, we therefore still poll */
2933 /* also do poll on <2.6.25, but with normal frequency */
2934
2935 if (!fs_2625)
2936 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2937 else if (!statfs (w->path, &sfs)
2938 && (sfs.f_type == 0x1373 /* devfs */
2939 || sfs.f_type == 0xEF53 /* ext2/3 */
2940 || sfs.f_type == 0x3153464a /* jfs */
2941 || sfs.f_type == 0x52654973 /* reiser3 */
2942 || sfs.f_type == 0x01021994 /* tempfs */
2943 || sfs.f_type == 0x58465342 /* xfs */))
2944 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2945 else
2946 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2835 { 2947 }
2948 else
2949 {
2950 /* can't use inotify, continue to stat */
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2951 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2837 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2838 2952
2839 /* monitor some parent directory for speedup hints */ 2953 /* if path is not there, monitor some parent directory for speedup hints */
2840 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2954 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2841 /* but an efficiency issue only */ 2955 /* but an efficiency issue only */
2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2956 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2843 { 2957 {
2844 char path [4096]; 2958 char path [4096];
… …
2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2861 } 2975 }
2862 } 2976 }
2863 2977
2864 if (w->wd >= 0) 2978 if (w->wd >= 0)
2865 {
2866 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2979 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2867 2980
2868 /* now local changes will be tracked by inotify, but remote changes won't */ 2981 /* now re-arm timer, if required */
2869 /* unless the filesystem it known to be local, we therefore still poll */ 2982 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2870 /* also do poll on <2.6.25, but with normal frequency */
2871 struct statfs sfs;
2872
2873 if (fs_2625 && !statfs (w->path, &sfs))
2874 if (sfs.f_type == 0x1373 /* devfs */
2875 || sfs.f_type == 0xEF53 /* ext2/3 */
2876 || sfs.f_type == 0x3153464a /* jfs */
2877 || sfs.f_type == 0x52654973 /* reiser3 */
2878 || sfs.f_type == 0x01021994 /* tempfs */
2879 || sfs.f_type == 0x58465342 /* xfs */)
2880 return;
2881
2882 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2883 ev_timer_again (EV_A_ &w->timer); 2983 ev_timer_again (EV_A_ &w->timer);
2884 } 2984 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2885} 2985}
2886 2986
2887static void noinline 2987static void noinline
2888infy_del (EV_P_ ev_stat *w) 2988infy_del (EV_P_ ev_stat *w)
2889{ 2989{
… …
2934 3034
2935static void 3035static void
2936infy_cb (EV_P_ ev_io *w, int revents) 3036infy_cb (EV_P_ ev_io *w, int revents)
2937{ 3037{
2938 char buf [EV_INOTIFY_BUFSIZE]; 3038 char buf [EV_INOTIFY_BUFSIZE];
2939 struct inotify_event *ev = (struct inotify_event *)buf;
2940 int ofs; 3039 int ofs;
2941 int len = read (fs_fd, buf, sizeof (buf)); 3040 int len = read (fs_fd, buf, sizeof (buf));
2942 3041
2943 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3042 for (ofs = 0; ofs < len; )
3043 {
3044 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2944 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3045 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3046 ofs += sizeof (struct inotify_event) + ev->len;
3047 }
3048}
3049
3050inline_size unsigned int
3051ev_linux_version (void)
3052{
3053 struct utsname buf;
3054 unsigned int v;
3055 int i;
3056 char *p = buf.release;
3057
3058 if (uname (&buf))
3059 return 0;
3060
3061 for (i = 3+1; --i; )
3062 {
3063 unsigned int c = 0;
3064
3065 for (;;)
3066 {
3067 if (*p >= '0' && *p <= '9')
3068 c = c * 10 + *p++ - '0';
3069 else
3070 {
3071 p += *p == '.';
3072 break;
3073 }
3074 }
3075
3076 v = (v << 8) | c;
3077 }
3078
3079 return v;
2945} 3080}
2946 3081
2947inline_size void 3082inline_size void
2948check_2625 (EV_P) 3083ev_check_2625 (EV_P)
2949{ 3084{
2950 /* kernels < 2.6.25 are borked 3085 /* kernels < 2.6.25 are borked
2951 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3086 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2952 */ 3087 */
2953 struct utsname buf; 3088 if (ev_linux_version () < 0x020619)
2954 int major, minor, micro;
2955
2956 if (uname (&buf))
2957 return; 3089 return;
2958 3090
2959 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2960 return;
2961
2962 if (major < 2
2963 || (major == 2 && minor < 6)
2964 || (major == 2 && minor == 6 && micro < 25))
2965 return;
2966
2967 fs_2625 = 1; 3091 fs_2625 = 1;
3092}
3093
3094inline_size int
3095infy_newfd (void)
3096{
3097#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3098 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3099 if (fd >= 0)
3100 return fd;
3101#endif
3102 return inotify_init ();
2968} 3103}
2969 3104
2970inline_size void 3105inline_size void
2971infy_init (EV_P) 3106infy_init (EV_P)
2972{ 3107{
2973 if (fs_fd != -2) 3108 if (fs_fd != -2)
2974 return; 3109 return;
2975 3110
2976 fs_fd = -1; 3111 fs_fd = -1;
2977 3112
2978 check_2625 (EV_A); 3113 ev_check_2625 (EV_A);
2979 3114
2980 fs_fd = inotify_init (); 3115 fs_fd = infy_newfd ();
2981 3116
2982 if (fs_fd >= 0) 3117 if (fs_fd >= 0)
2983 { 3118 {
3119 fd_intern (fs_fd);
2984 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3120 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2985 ev_set_priority (&fs_w, EV_MAXPRI); 3121 ev_set_priority (&fs_w, EV_MAXPRI);
2986 ev_io_start (EV_A_ &fs_w); 3122 ev_io_start (EV_A_ &fs_w);
3123 ev_unref (EV_A);
2987 } 3124 }
2988} 3125}
2989 3126
2990inline_size void 3127inline_size void
2991infy_fork (EV_P) 3128infy_fork (EV_P)
… …
2993 int slot; 3130 int slot;
2994 3131
2995 if (fs_fd < 0) 3132 if (fs_fd < 0)
2996 return; 3133 return;
2997 3134
3135 ev_ref (EV_A);
3136 ev_io_stop (EV_A_ &fs_w);
2998 close (fs_fd); 3137 close (fs_fd);
2999 fs_fd = inotify_init (); 3138 fs_fd = infy_newfd ();
3139
3140 if (fs_fd >= 0)
3141 {
3142 fd_intern (fs_fd);
3143 ev_io_set (&fs_w, fs_fd, EV_READ);
3144 ev_io_start (EV_A_ &fs_w);
3145 ev_unref (EV_A);
3146 }
3000 3147
3001 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3002 { 3149 {
3003 WL w_ = fs_hash [slot].head; 3150 WL w_ = fs_hash [slot].head;
3004 fs_hash [slot].head = 0; 3151 fs_hash [slot].head = 0;
… …
3011 w->wd = -1; 3158 w->wd = -1;
3012 3159
3013 if (fs_fd >= 0) 3160 if (fs_fd >= 0)
3014 infy_add (EV_A_ w); /* re-add, no matter what */ 3161 infy_add (EV_A_ w); /* re-add, no matter what */
3015 else 3162 else
3163 {
3164 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3165 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3016 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3168 }
3017 } 3169 }
3018 } 3170 }
3019} 3171}
3020 3172
3021#endif 3173#endif
… …
3038static void noinline 3190static void noinline
3039stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3191stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3040{ 3192{
3041 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3193 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3042 3194
3043 /* we copy this here each the time so that */ 3195 ev_statdata prev = w->attr;
3044 /* prev has the old value when the callback gets invoked */
3045 w->prev = w->attr;
3046 ev_stat_stat (EV_A_ w); 3196 ev_stat_stat (EV_A_ w);
3047 3197
3048 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3198 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3049 if ( 3199 if (
3050 w->prev.st_dev != w->attr.st_dev 3200 prev.st_dev != w->attr.st_dev
3051 || w->prev.st_ino != w->attr.st_ino 3201 || prev.st_ino != w->attr.st_ino
3052 || w->prev.st_mode != w->attr.st_mode 3202 || prev.st_mode != w->attr.st_mode
3053 || w->prev.st_nlink != w->attr.st_nlink 3203 || prev.st_nlink != w->attr.st_nlink
3054 || w->prev.st_uid != w->attr.st_uid 3204 || prev.st_uid != w->attr.st_uid
3055 || w->prev.st_gid != w->attr.st_gid 3205 || prev.st_gid != w->attr.st_gid
3056 || w->prev.st_rdev != w->attr.st_rdev 3206 || prev.st_rdev != w->attr.st_rdev
3057 || w->prev.st_size != w->attr.st_size 3207 || prev.st_size != w->attr.st_size
3058 || w->prev.st_atime != w->attr.st_atime 3208 || prev.st_atime != w->attr.st_atime
3059 || w->prev.st_mtime != w->attr.st_mtime 3209 || prev.st_mtime != w->attr.st_mtime
3060 || w->prev.st_ctime != w->attr.st_ctime 3210 || prev.st_ctime != w->attr.st_ctime
3061 ) { 3211 ) {
3212 /* we only update w->prev on actual differences */
3213 /* in case we test more often than invoke the callback, */
3214 /* to ensure that prev is always different to attr */
3215 w->prev = prev;
3216
3062 #if EV_USE_INOTIFY 3217 #if EV_USE_INOTIFY
3063 if (fs_fd >= 0) 3218 if (fs_fd >= 0)
3064 { 3219 {
3065 infy_del (EV_A_ w); 3220 infy_del (EV_A_ w);
3066 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
… …
3091 3246
3092 if (fs_fd >= 0) 3247 if (fs_fd >= 0)
3093 infy_add (EV_A_ w); 3248 infy_add (EV_A_ w);
3094 else 3249 else
3095#endif 3250#endif
3251 {
3096 ev_timer_again (EV_A_ &w->timer); 3252 ev_timer_again (EV_A_ &w->timer);
3253 ev_unref (EV_A);
3254 }
3097 3255
3098 ev_start (EV_A_ (W)w, 1); 3256 ev_start (EV_A_ (W)w, 1);
3099 3257
3100 EV_FREQUENT_CHECK; 3258 EV_FREQUENT_CHECK;
3101} 3259}
… …
3110 EV_FREQUENT_CHECK; 3268 EV_FREQUENT_CHECK;
3111 3269
3112#if EV_USE_INOTIFY 3270#if EV_USE_INOTIFY
3113 infy_del (EV_A_ w); 3271 infy_del (EV_A_ w);
3114#endif 3272#endif
3273
3274 if (ev_is_active (&w->timer))
3275 {
3276 ev_ref (EV_A);
3115 ev_timer_stop (EV_A_ &w->timer); 3277 ev_timer_stop (EV_A_ &w->timer);
3278 }
3116 3279
3117 ev_stop (EV_A_ (W)w); 3280 ev_stop (EV_A_ (W)w);
3118 3281
3119 EV_FREQUENT_CHECK; 3282 EV_FREQUENT_CHECK;
3120} 3283}
… …
3165 3328
3166 EV_FREQUENT_CHECK; 3329 EV_FREQUENT_CHECK;
3167} 3330}
3168#endif 3331#endif
3169 3332
3333#if EV_PREPARE_ENABLE
3170void 3334void
3171ev_prepare_start (EV_P_ ev_prepare *w) 3335ev_prepare_start (EV_P_ ev_prepare *w)
3172{ 3336{
3173 if (expect_false (ev_is_active (w))) 3337 if (expect_false (ev_is_active (w)))
3174 return; 3338 return;
… …
3200 3364
3201 ev_stop (EV_A_ (W)w); 3365 ev_stop (EV_A_ (W)w);
3202 3366
3203 EV_FREQUENT_CHECK; 3367 EV_FREQUENT_CHECK;
3204} 3368}
3369#endif
3205 3370
3371#if EV_CHECK_ENABLE
3206void 3372void
3207ev_check_start (EV_P_ ev_check *w) 3373ev_check_start (EV_P_ ev_check *w)
3208{ 3374{
3209 if (expect_false (ev_is_active (w))) 3375 if (expect_false (ev_is_active (w)))
3210 return; 3376 return;
… …
3236 3402
3237 ev_stop (EV_A_ (W)w); 3403 ev_stop (EV_A_ (W)w);
3238 3404
3239 EV_FREQUENT_CHECK; 3405 EV_FREQUENT_CHECK;
3240} 3406}
3407#endif
3241 3408
3242#if EV_EMBED_ENABLE 3409#if EV_EMBED_ENABLE
3243void noinline 3410void noinline
3244ev_embed_sweep (EV_P_ ev_embed *w) 3411ev_embed_sweep (EV_P_ ev_embed *w)
3245{ 3412{
… …
3339 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3340 3507
3341 ev_io_stop (EV_A_ &w->io); 3508 ev_io_stop (EV_A_ &w->io);
3342 ev_prepare_stop (EV_A_ &w->prepare); 3509 ev_prepare_stop (EV_A_ &w->prepare);
3343 ev_fork_stop (EV_A_ &w->fork); 3510 ev_fork_stop (EV_A_ &w->fork);
3511
3512 ev_stop (EV_A_ (W)w);
3344 3513
3345 EV_FREQUENT_CHECK; 3514 EV_FREQUENT_CHECK;
3346} 3515}
3347#endif 3516#endif
3348 3517
… …
3572 if (types & EV_ASYNC) 3741 if (types & EV_ASYNC)
3573 for (i = asynccnt; i--; ) 3742 for (i = asynccnt; i--; )
3574 cb (EV_A_ EV_ASYNC, asyncs [i]); 3743 cb (EV_A_ EV_ASYNC, asyncs [i]);
3575#endif 3744#endif
3576 3745
3746#if EV_PREPARE_ENABLE
3577 if (types & EV_PREPARE) 3747 if (types & EV_PREPARE)
3578 for (i = preparecnt; i--; ) 3748 for (i = preparecnt; i--; )
3579#if EV_EMBED_ENABLE 3749# if EV_EMBED_ENABLE
3580 if (ev_cb (prepares [i]) != embed_prepare_cb) 3750 if (ev_cb (prepares [i]) != embed_prepare_cb)
3581#endif 3751# endif
3582 cb (EV_A_ EV_PREPARE, prepares [i]); 3752 cb (EV_A_ EV_PREPARE, prepares [i]);
3753#endif
3583 3754
3755#if EV_CHECK_ENABLE
3584 if (types & EV_CHECK) 3756 if (types & EV_CHECK)
3585 for (i = checkcnt; i--; ) 3757 for (i = checkcnt; i--; )
3586 cb (EV_A_ EV_CHECK, checks [i]); 3758 cb (EV_A_ EV_CHECK, checks [i]);
3759#endif
3587 3760
3761#if EV_SIGNAL_ENABLE
3588 if (types & EV_SIGNAL) 3762 if (types & EV_SIGNAL)
3589 for (i = 0; i < EV_NSIG - 1; ++i) 3763 for (i = 0; i < EV_NSIG - 1; ++i)
3590 for (wl = signals [i].head; wl; ) 3764 for (wl = signals [i].head; wl; )
3591 { 3765 {
3592 wn = wl->next; 3766 wn = wl->next;
3593 cb (EV_A_ EV_SIGNAL, wl); 3767 cb (EV_A_ EV_SIGNAL, wl);
3594 wl = wn; 3768 wl = wn;
3595 } 3769 }
3770#endif
3596 3771
3772#if EV_CHILD_ENABLE
3597 if (types & EV_CHILD) 3773 if (types & EV_CHILD)
3598 for (i = EV_PID_HASHSIZE; i--; ) 3774 for (i = EV_PID_HASHSIZE; i--; )
3599 for (wl = childs [i]; wl; ) 3775 for (wl = childs [i]; wl; )
3600 { 3776 {
3601 wn = wl->next; 3777 wn = wl->next;
3602 cb (EV_A_ EV_CHILD, wl); 3778 cb (EV_A_ EV_CHILD, wl);
3603 wl = wn; 3779 wl = wn;
3604 } 3780 }
3781#endif
3605/* EV_STAT 0x00001000 /* stat data changed */ 3782/* EV_STAT 0x00001000 /* stat data changed */
3606/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3783/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3607} 3784}
3608#endif 3785#endif
3609 3786

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines