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

Comparing libev/ev.c (file contents):
Revision 1.250 by root, Thu May 22 02:44:57 2008 UTC vs.
Revision 1.275 by root, Fri Dec 12 20:35:21 2008 UTC

… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
… …
154#ifndef _WIN32 166#ifndef _WIN32
155# include <sys/time.h> 167# include <sys/time.h>
156# include <sys/wait.h> 168# include <sys/wait.h>
157# include <unistd.h> 169# include <unistd.h>
158#else 170#else
171# include <io.h>
159# define WIN32_LEAN_AND_MEAN 172# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 173# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 174# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 175# define EV_SELECT_IS_WINSOCKET 1
163# endif 176# endif
164#endif 177#endif
165 178
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
167 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
168#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1
192# else
169# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif
170#endif 195#endif
171 196
172#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME 0
174#endif 199#endif
175 200
176#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1
204# else
177# define EV_USE_NANOSLEEP 0 205# define EV_USE_NANOSLEEP 0
206# endif
178#endif 207#endif
179 208
180#ifndef EV_USE_SELECT 209#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 210# define EV_USE_SELECT 1
182#endif 211#endif
… …
277# include <sys/select.h> 306# include <sys/select.h>
278# endif 307# endif
279#endif 308#endif
280 309
281#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
282# include <sys/inotify.h> 313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
283#endif 319#endif
284 320
285#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 322# include <winsock.h>
323#endif
324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
287#endif 332#endif
288 333
289#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
290/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
291# include <stdint.h> 336# include <stdint.h>
… …
373{ 418{
374 syserr_cb = cb; 419 syserr_cb = cb;
375} 420}
376 421
377static void noinline 422static void noinline
378syserr (const char *msg) 423ev_syserr (const char *msg)
379{ 424{
380 if (!msg) 425 if (!msg)
381 msg = "(libev) system error"; 426 msg = "(libev) system error";
382 427
383 if (syserr_cb) 428 if (syserr_cb)
… …
434typedef struct 479typedef struct
435{ 480{
436 WL head; 481 WL head;
437 unsigned char events; 482 unsigned char events;
438 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
439#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 490 SOCKET handle;
441#endif 491#endif
442} ANFD; 492} ANFD;
443 493
… …
556 struct timeval tv; 606 struct timeval tv;
557 607
558 tv.tv_sec = (time_t)delay; 608 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 609 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 610
611 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
612 /* somehting nto guaranteed by newer posix versions, but guaranteed */
613 /* by older ones */
561 select (0, 0, 0, 0, &tv); 614 select (0, 0, 0, 0, &tv);
562#endif 615#endif
563 } 616 }
564} 617}
565 618
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 645array_realloc (int elem, void *base, int *cur, int cnt)
593{ 646{
594 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
596} 649}
650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 653
598#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
600 { \ 656 { \
601 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
… …
645 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
646} 702}
647 703
648/*****************************************************************************/ 704/*****************************************************************************/
649 705
650void inline_size
651anfds_init (ANFD *base, int count)
652{
653 while (count--)
654 {
655 base->head = 0;
656 base->events = EV_NONE;
657 base->reify = 0;
658
659 ++base;
660 }
661}
662
663void inline_speed 706void inline_speed
664fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
665{ 708{
666 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
667 ev_io *w; 710 ev_io *w;
… …
699 events |= (unsigned char)w->events; 742 events |= (unsigned char)w->events;
700 743
701#if EV_SELECT_IS_WINSOCKET 744#if EV_SELECT_IS_WINSOCKET
702 if (events) 745 if (events)
703 { 746 {
704 unsigned long argp; 747 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 748 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 750 #else
708 anfd->handle = _get_osfhandle (fd); 751 anfd->handle = _get_osfhandle (fd);
709 #endif 752 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 754 }
712#endif 755#endif
713 756
714 { 757 {
715 unsigned char o_events = anfd->events; 758 unsigned char o_events = anfd->events;
… …
768{ 811{
769 int fd; 812 int fd;
770 813
771 for (fd = 0; fd < anfdmax; ++fd) 814 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 815 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 816 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 817 fd_kill (EV_A_ fd);
775} 818}
776 819
777/* called on ENOMEM in select/poll to kill some fds and retry */ 820/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 821static void noinline
… …
796 839
797 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 841 if (anfds [fd].events)
799 { 842 {
800 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
802 } 846 }
803} 847}
804 848
805/*****************************************************************************/ 849/*****************************************************************************/
… …
937/* rebuild the heap: this function is used only once and executed rarely */ 981/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 982void inline_size
939reheap (ANHE *heap, int N) 983reheap (ANHE *heap, int N)
940{ 984{
941 int i; 985 int i;
986
942 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 987 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
943 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */ 988 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
944 for (i = 0; i < N; ++i) 989 for (i = 0; i < N; ++i)
945 upheap (heap, i + HEAP0); 990 upheap (heap, i + HEAP0);
946} 991}
947 992
948#if EV_VERIFY
949static void
950checkheap (ANHE *heap, int N)
951{
952 int i;
953
954 for (i = HEAP0; i < N + HEAP0; ++i)
955 {
956 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
957 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
958 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
959 }
960}
961#endif
962
963/*****************************************************************************/ 993/*****************************************************************************/
964 994
965typedef struct 995typedef struct
966{ 996{
967 WL head; 997 WL head;
… …
971static ANSIG *signals; 1001static ANSIG *signals;
972static int signalmax; 1002static int signalmax;
973 1003
974static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
975 1005
976void inline_size
977signals_init (ANSIG *base, int count)
978{
979 while (count--)
980 {
981 base->head = 0;
982 base->gotsig = 0;
983
984 ++base;
985 }
986}
987
988/*****************************************************************************/ 1006/*****************************************************************************/
989 1007
990void inline_speed 1008void inline_speed
991fd_intern (int fd) 1009fd_intern (int fd)
992{ 1010{
993#ifdef _WIN32 1011#ifdef _WIN32
994 int arg = 1; 1012 unsigned long arg = 1;
995 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1013 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
996#else 1014#else
997 fcntl (fd, F_SETFD, FD_CLOEXEC); 1015 fcntl (fd, F_SETFD, FD_CLOEXEC);
998 fcntl (fd, F_SETFL, O_NONBLOCK); 1016 fcntl (fd, F_SETFL, O_NONBLOCK);
999#endif 1017#endif
… …
1013 } 1031 }
1014 else 1032 else
1015#endif 1033#endif
1016 { 1034 {
1017 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1018 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1019 1037
1020 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1021 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1022 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1023 } 1041 }
… …
1513{ 1531{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1532 postfork = 1; /* must be in line with ev_default_fork */
1515} 1533}
1516 1534
1517#if EV_VERIFY 1535#if EV_VERIFY
1518static void 1536static void noinline
1537verify_watcher (EV_P_ W w)
1538{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540
1541 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543}
1544
1545static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N)
1547{
1548 int i;
1549
1550 for (i = HEAP0; i < N + HEAP0; ++i)
1551 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1553 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1554 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 }
1558}
1559
1560static void noinline
1519array_check (W **ws, int cnt) 1561array_verify (EV_P_ W *ws, int cnt)
1520{ 1562{
1521 while (cnt--) 1563 while (cnt--)
1564 {
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]);
1567 }
1523} 1568}
1524#endif 1569#endif
1525 1570
1526void 1571void
1527ev_loop_verify (EV_P) 1572ev_loop_verify (EV_P)
1528{ 1573{
1529#if EV_VERIFY 1574#if EV_VERIFY
1530 int i; 1575 int i;
1576 WL w;
1531 1577
1578 assert (activecnt >= -1);
1579
1580 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1583
1584 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next)
1587 {
1588 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1590 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 }
1592
1593 assert (timermax >= timercnt);
1532 checkheap (timers, timercnt); 1594 verify_heap (EV_A_ timers, timercnt);
1595
1533#if EV_PERIODIC_ENABLE 1596#if EV_PERIODIC_ENABLE
1597 assert (periodicmax >= periodiccnt);
1534 checkheap (periodics, periodiccnt); 1598 verify_heap (EV_A_ periodics, periodiccnt);
1535#endif 1599#endif
1536 1600
1601 for (i = NUMPRI; i--; )
1602 {
1603 assert (pendingmax [i] >= pendingcnt [i]);
1537#if EV_IDLE_ENABLE 1604#if EV_IDLE_ENABLE
1538 for (i = NUMPRI; i--; ) 1605 assert (idleall >= 0);
1606 assert (idlemax [i] >= idlecnt [i]);
1539 array_check ((W **)idles [i], idlecnt [i]); 1607 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1540#endif 1608#endif
1609 }
1610
1541#if EV_FORK_ENABLE 1611#if EV_FORK_ENABLE
1612 assert (forkmax >= forkcnt);
1542 array_check ((W **)forks, forkcnt); 1613 array_verify (EV_A_ (W *)forks, forkcnt);
1543#endif 1614#endif
1615
1544#if EV_ASYNC_ENABLE 1616#if EV_ASYNC_ENABLE
1617 assert (asyncmax >= asynccnt);
1545 array_check ((W **)asyncs, asynccnt); 1618 array_verify (EV_A_ (W *)asyncs, asynccnt);
1619#endif
1620
1621 assert (preparemax >= preparecnt);
1622 array_verify (EV_A_ (W *)prepares, preparecnt);
1623
1624 assert (checkmax >= checkcnt);
1625 array_verify (EV_A_ (W *)checks, checkcnt);
1626
1627# if 0
1628 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1629 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1546#endif 1630# endif
1547 array_check ((W **)prepares, preparecnt);
1548 array_check ((W **)checks, checkcnt);
1549#endif 1631#endif
1550} 1632}
1551 1633
1552#endif /* multiplicity */ 1634#endif /* multiplicity */
1553 1635
… …
1590{ 1672{
1591#if EV_MULTIPLICITY 1673#if EV_MULTIPLICITY
1592 struct ev_loop *loop = ev_default_loop_ptr; 1674 struct ev_loop *loop = ev_default_loop_ptr;
1593#endif 1675#endif
1594 1676
1677 ev_default_loop_ptr = 0;
1678
1595#ifndef _WIN32 1679#ifndef _WIN32
1596 ev_ref (EV_A); /* child watcher */ 1680 ev_ref (EV_A); /* child watcher */
1597 ev_signal_stop (EV_A_ &childev); 1681 ev_signal_stop (EV_A_ &childev);
1598#endif 1682#endif
1599 1683
… …
1605{ 1689{
1606#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1607 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1608#endif 1692#endif
1609 1693
1610 if (backend)
1611 postfork = 1; /* must be in line with ev_loop_fork */ 1694 postfork = 1; /* must be in line with ev_loop_fork */
1612} 1695}
1613 1696
1614/*****************************************************************************/ 1697/*****************************************************************************/
1615 1698
1616void 1699void
… …
1847ev_unref (EV_P) 1930ev_unref (EV_P)
1848{ 1931{
1849 --activecnt; 1932 --activecnt;
1850} 1933}
1851 1934
1935void
1936ev_now_update (EV_P)
1937{
1938 time_update (EV_A_ 1e100);
1939}
1940
1852static int loop_done; 1941static int loop_done;
1853 1942
1854void 1943void
1855ev_loop (EV_P_ int flags) 1944ev_loop (EV_P_ int flags)
1856{ 1945{
… …
2065 2154
2066 if (expect_false (ev_is_active (w))) 2155 if (expect_false (ev_is_active (w)))
2067 return; 2156 return;
2068 2157
2069 assert (("ev_io_start called with negative fd", fd >= 0)); 2158 assert (("ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2070 2160
2071 EV_FREQUENT_CHECK; 2161 EV_FREQUENT_CHECK;
2072 2162
2073 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
2074 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2075 wlist_add (&anfds[fd].head, (WL)w); 2165 wlist_add (&anfds[fd].head, (WL)w);
2076 2166
2077 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2078 w->events &= ~EV_IOFDSET; 2168 w->events &= ~EV_IOFDSET;
2079 2169
… …
2271 sigset_t full, prev; 2361 sigset_t full, prev;
2272 sigfillset (&full); 2362 sigfillset (&full);
2273 sigprocmask (SIG_SETMASK, &full, &prev); 2363 sigprocmask (SIG_SETMASK, &full, &prev);
2274#endif 2364#endif
2275 2365
2276 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2277 2367
2278#ifndef _WIN32 2368#ifndef _WIN32
2279 sigprocmask (SIG_SETMASK, &prev, 0); 2369 sigprocmask (SIG_SETMASK, &prev, 0);
2280#endif 2370#endif
2281 } 2371 }
… …
2354# ifdef _WIN32 2444# ifdef _WIN32
2355# undef lstat 2445# undef lstat
2356# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
2357# endif 2447# endif
2358 2448
2359#define DEF_STAT_INTERVAL 5.0074891 2449#define DEF_STAT_INTERVAL 5.0074891
2450#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2360#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
2361 2452
2362static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2453static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2363 2454
2364#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
2365# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
2369{ 2460{
2370 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); 2461 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);
2371 2462
2372 if (w->wd < 0) 2463 if (w->wd < 0)
2373 { 2464 {
2465 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2374 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2466 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2375 2467
2376 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2377 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2378 /* but an efficiency issue only */ 2470 /* but an efficiency issue only */
2379 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2380 { 2472 {
2381 char path [4096]; 2473 char path [4096];
2382 strcpy (path, w->path); 2474 strcpy (path, w->path);
… …
2386 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2478 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2387 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2479 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2388 2480
2389 char *pend = strrchr (path, '/'); 2481 char *pend = strrchr (path, '/');
2390 2482
2391 if (!pend) 2483 if (!pend || pend == path)
2392 break; /* whoops, no '/', complain to your admin */ 2484 break;
2393 2485
2394 *pend = 0; 2486 *pend = 0;
2395 w->wd = inotify_add_watch (fs_fd, path, mask); 2487 w->wd = inotify_add_watch (fs_fd, path, mask);
2396 } 2488 }
2397 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2398 } 2490 }
2399 } 2491 }
2400 else
2401 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2402 2492
2403 if (w->wd >= 0) 2493 if (w->wd >= 0)
2494 {
2404 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2495 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2496
2497 /* now local changes will be tracked by inotify, but remote changes won't */
2498 /* unless the filesystem it known to be local, we therefore still poll */
2499 /* also do poll on <2.6.25, but with normal frequency */
2500 struct statfs sfs;
2501
2502 if (fs_2625 && !statfs (w->path, &sfs))
2503 if (sfs.f_type == 0x1373 /* devfs */
2504 || sfs.f_type == 0xEF53 /* ext2/3 */
2505 || sfs.f_type == 0x3153464a /* jfs */
2506 || sfs.f_type == 0x52654973 /* reiser3 */
2507 || sfs.f_type == 0x01021994 /* tempfs */
2508 || sfs.f_type == 0x58465342 /* xfs */)
2509 return;
2510
2511 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2512 ev_timer_again (EV_A_ &w->timer);
2513 }
2405} 2514}
2406 2515
2407static void noinline 2516static void noinline
2408infy_del (EV_P_ ev_stat *w) 2517infy_del (EV_P_ ev_stat *w)
2409{ 2518{
… …
2423 2532
2424static void noinline 2533static void noinline
2425infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2534infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2426{ 2535{
2427 if (slot < 0) 2536 if (slot < 0)
2428 /* overflow, need to check for all hahs slots */ 2537 /* overflow, need to check for all hash slots */
2429 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2538 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2430 infy_wd (EV_A_ slot, wd, ev); 2539 infy_wd (EV_A_ slot, wd, ev);
2431 else 2540 else
2432 { 2541 {
2433 WL w_; 2542 WL w_;
… …
2439 2548
2440 if (w->wd == wd || wd == -1) 2549 if (w->wd == wd || wd == -1)
2441 { 2550 {
2442 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2551 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2443 { 2552 {
2553 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2444 w->wd = -1; 2554 w->wd = -1;
2445 infy_add (EV_A_ w); /* re-add, no matter what */ 2555 infy_add (EV_A_ w); /* re-add, no matter what */
2446 } 2556 }
2447 2557
2448 stat_timer_cb (EV_A_ &w->timer, 0); 2558 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2462 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2572 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2463 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2573 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2464} 2574}
2465 2575
2466void inline_size 2576void inline_size
2577check_2625 (EV_P)
2578{
2579 /* kernels < 2.6.25 are borked
2580 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2581 */
2582 struct utsname buf;
2583 int major, minor, micro;
2584
2585 if (uname (&buf))
2586 return;
2587
2588 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2589 return;
2590
2591 if (major < 2
2592 || (major == 2 && minor < 6)
2593 || (major == 2 && minor == 6 && micro < 25))
2594 return;
2595
2596 fs_2625 = 1;
2597}
2598
2599void inline_size
2467infy_init (EV_P) 2600infy_init (EV_P)
2468{ 2601{
2469 if (fs_fd != -2) 2602 if (fs_fd != -2)
2470 return; 2603 return;
2604
2605 fs_fd = -1;
2606
2607 check_2625 (EV_A);
2471 2608
2472 fs_fd = inotify_init (); 2609 fs_fd = inotify_init ();
2473 2610
2474 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2475 { 2612 {
… …
2503 w->wd = -1; 2640 w->wd = -1;
2504 2641
2505 if (fs_fd >= 0) 2642 if (fs_fd >= 0)
2506 infy_add (EV_A_ w); /* re-add, no matter what */ 2643 infy_add (EV_A_ w); /* re-add, no matter what */
2507 else 2644 else
2508 ev_timer_start (EV_A_ &w->timer); 2645 ev_timer_again (EV_A_ &w->timer);
2509 } 2646 }
2510
2511 } 2647 }
2512} 2648}
2513 2649
2650#endif
2651
2652#ifdef _WIN32
2653# define EV_LSTAT(p,b) _stati64 (p, b)
2654#else
2655# define EV_LSTAT(p,b) lstat (p, b)
2514#endif 2656#endif
2515 2657
2516void 2658void
2517ev_stat_stat (EV_P_ ev_stat *w) 2659ev_stat_stat (EV_P_ ev_stat *w)
2518{ 2660{
… …
2545 || w->prev.st_atime != w->attr.st_atime 2687 || w->prev.st_atime != w->attr.st_atime
2546 || w->prev.st_mtime != w->attr.st_mtime 2688 || w->prev.st_mtime != w->attr.st_mtime
2547 || w->prev.st_ctime != w->attr.st_ctime 2689 || w->prev.st_ctime != w->attr.st_ctime
2548 ) { 2690 ) {
2549 #if EV_USE_INOTIFY 2691 #if EV_USE_INOTIFY
2692 if (fs_fd >= 0)
2693 {
2550 infy_del (EV_A_ w); 2694 infy_del (EV_A_ w);
2551 infy_add (EV_A_ w); 2695 infy_add (EV_A_ w);
2552 ev_stat_stat (EV_A_ w); /* avoid race... */ 2696 ev_stat_stat (EV_A_ w); /* avoid race... */
2697 }
2553 #endif 2698 #endif
2554 2699
2555 ev_feed_event (EV_A_ w, EV_STAT); 2700 ev_feed_event (EV_A_ w, EV_STAT);
2556 } 2701 }
2557} 2702}
… …
2560ev_stat_start (EV_P_ ev_stat *w) 2705ev_stat_start (EV_P_ ev_stat *w)
2561{ 2706{
2562 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2563 return; 2708 return;
2564 2709
2565 /* since we use memcmp, we need to clear any padding data etc. */
2566 memset (&w->prev, 0, sizeof (ev_statdata));
2567 memset (&w->attr, 0, sizeof (ev_statdata));
2568
2569 ev_stat_stat (EV_A_ w); 2710 ev_stat_stat (EV_A_ w);
2570 2711
2712 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2571 if (w->interval < MIN_STAT_INTERVAL) 2713 w->interval = MIN_STAT_INTERVAL;
2572 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2573 2714
2574 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2715 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2575 ev_set_priority (&w->timer, ev_priority (w)); 2716 ev_set_priority (&w->timer, ev_priority (w));
2576 2717
2577#if EV_USE_INOTIFY 2718#if EV_USE_INOTIFY
2578 infy_init (EV_A); 2719 infy_init (EV_A);
2579 2720
2580 if (fs_fd >= 0) 2721 if (fs_fd >= 0)
2581 infy_add (EV_A_ w); 2722 infy_add (EV_A_ w);
2582 else 2723 else
2583#endif 2724#endif
2584 ev_timer_start (EV_A_ &w->timer); 2725 ev_timer_again (EV_A_ &w->timer);
2585 2726
2586 ev_start (EV_A_ (W)w, 1); 2727 ev_start (EV_A_ (W)w, 1);
2587 2728
2588 EV_FREQUENT_CHECK; 2729 EV_FREQUENT_CHECK;
2589} 2730}
… …
2759 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2900 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2760 } 2901 }
2761 } 2902 }
2762} 2903}
2763 2904
2905static void
2906embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2907{
2908 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2909
2910 {
2911 struct ev_loop *loop = w->other;
2912
2913 ev_loop_fork (EV_A);
2914 }
2915}
2916
2764#if 0 2917#if 0
2765static void 2918static void
2766embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2919embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2767{ 2920{
2768 ev_idle_stop (EV_A_ idle); 2921 ev_idle_stop (EV_A_ idle);
… …
2788 2941
2789 ev_prepare_init (&w->prepare, embed_prepare_cb); 2942 ev_prepare_init (&w->prepare, embed_prepare_cb);
2790 ev_set_priority (&w->prepare, EV_MINPRI); 2943 ev_set_priority (&w->prepare, EV_MINPRI);
2791 ev_prepare_start (EV_A_ &w->prepare); 2944 ev_prepare_start (EV_A_ &w->prepare);
2792 2945
2946 ev_fork_init (&w->fork, embed_fork_cb);
2947 ev_fork_start (EV_A_ &w->fork);
2948
2793 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2949 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2794 2950
2795 ev_start (EV_A_ (W)w, 1); 2951 ev_start (EV_A_ (W)w, 1);
2796 2952
2797 EV_FREQUENT_CHECK; 2953 EV_FREQUENT_CHECK;
… …
2804 if (expect_false (!ev_is_active (w))) 2960 if (expect_false (!ev_is_active (w)))
2805 return; 2961 return;
2806 2962
2807 EV_FREQUENT_CHECK; 2963 EV_FREQUENT_CHECK;
2808 2964
2809 ev_io_stop (EV_A_ &w->io); 2965 ev_io_stop (EV_A_ &w->io);
2810 ev_prepare_stop (EV_A_ &w->prepare); 2966 ev_prepare_stop (EV_A_ &w->prepare);
2811 2967 ev_fork_stop (EV_A_ &w->fork);
2812 ev_stop (EV_A_ (W)w);
2813 2968
2814 EV_FREQUENT_CHECK; 2969 EV_FREQUENT_CHECK;
2815} 2970}
2816#endif 2971#endif
2817 2972
… …
2914once_cb (EV_P_ struct ev_once *once, int revents) 3069once_cb (EV_P_ struct ev_once *once, int revents)
2915{ 3070{
2916 void (*cb)(int revents, void *arg) = once->cb; 3071 void (*cb)(int revents, void *arg) = once->cb;
2917 void *arg = once->arg; 3072 void *arg = once->arg;
2918 3073
2919 ev_io_stop (EV_A_ &once->io); 3074 ev_io_stop (EV_A_ &once->io);
2920 ev_timer_stop (EV_A_ &once->to); 3075 ev_timer_stop (EV_A_ &once->to);
2921 ev_free (once); 3076 ev_free (once);
2922 3077
2923 cb (revents, arg); 3078 cb (revents, arg);
2924} 3079}
2925 3080
2926static void 3081static void
2927once_cb_io (EV_P_ ev_io *w, int revents) 3082once_cb_io (EV_P_ ev_io *w, int revents)
2928{ 3083{
2929 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3084 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3085
3086 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2930} 3087}
2931 3088
2932static void 3089static void
2933once_cb_to (EV_P_ ev_timer *w, int revents) 3090once_cb_to (EV_P_ ev_timer *w, int revents)
2934{ 3091{
2935 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3092 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3093
3094 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2936} 3095}
2937 3096
2938void 3097void
2939ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3098ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2940{ 3099{

Diff Legend

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