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

Comparing libev/ev.c (file contents):
Revision 1.309 by root, Sun Jul 26 04:24:17 2009 UTC vs.
Revision 1.333 by root, Tue Mar 9 08:58:22 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 */
… …
302# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
303# endif 306# endif
304#endif 307#endif
305 308
306#ifndef EV_USE_SIGNALFD 309#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 311# define EV_USE_SIGNALFD 1
309# else 312# else
310# define EV_USE_SIGNALFD 0 313# define EV_USE_SIGNALFD 0
311# endif 314# endif
312#endif 315#endif
… …
343# endif 346# endif
344#endif 347#endif
345 348
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
348#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
351#endif 360#endif
352 361
… …
386# include <stdint.h> 395# include <stdint.h>
387# ifndef EFD_NONBLOCK 396# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK 397# define EFD_NONBLOCK O_NONBLOCK
389# endif 398# endif
390# ifndef EFD_CLOEXEC 399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC 401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
392# endif 405# endif
393# ifdef __cplusplus 406# ifdef __cplusplus
394extern "C" { 407extern "C" {
395# endif 408# endif
396int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
397# ifdef __cplusplus 410# ifdef __cplusplus
398} 411}
399# endif 412# endif
400#endif 413#endif
401 414
402#if EV_USE_SIGNALFD 415#if EV_USE_SIGNALFD
403# include <sys/signalfd.h> 416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
404#endif 420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
405 443
406/**/ 444/**/
407 445
408#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
409# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
421 */ 459 */
422#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
423 461
424#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
425#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
426/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
427 464
428#if __GNUC__ >= 4 465#if __GNUC__ >= 4
429# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
430# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
431#else 468#else
… …
472 509
473#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
475#endif 512#endif
476 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
477#ifdef _WIN32 524#ifdef _WIN32
478# include "ev_win32.c" 525# include "ev_win32.c"
479#endif 526#endif
480 527
481/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
482 537
483static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
484 539
485void 540void
486ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
… …
496 551
497 if (syserr_cb) 552 if (syserr_cb)
498 syserr_cb (msg); 553 syserr_cb (msg);
499 else 554 else
500 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
501 perror (msg); 564 perror (msg);
565#endif
502 abort (); 566 abort ();
503 } 567 }
504} 568}
505 569
506static void * 570static void *
… …
531{ 595{
532 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
533 597
534 if (!ptr && size) 598 if (!ptr && size)
535 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
536 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
537 abort (); 605 abort ();
538 } 606 }
539 607
540 return ptr; 608 return ptr;
541} 609}
… …
872 940
873#if EV_SELECT_IS_WINSOCKET 941#if EV_SELECT_IS_WINSOCKET
874 if (events) 942 if (events)
875 { 943 {
876 unsigned long arg; 944 unsigned long arg;
877 #ifdef EV_FD_TO_WIN32_HANDLE
878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 945 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
879 #else
880 anfd->handle = _get_osfhandle (fd);
881 #endif
882 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
883 } 947 }
884#endif 948#endif
885 949
886 { 950 {
… …
929/* check whether the given fd is atcually valid, for error recovery */ 993/* check whether the given fd is atcually valid, for error recovery */
930inline_size int 994inline_size int
931fd_valid (int fd) 995fd_valid (int fd)
932{ 996{
933#ifdef _WIN32 997#ifdef _WIN32
934 return _get_osfhandle (fd) != -1; 998 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
935#else 999#else
936 return fcntl (fd, F_GETFD) != -1; 1000 return fcntl (fd, F_GETFD) != -1;
937#endif 1001#endif
938} 1002}
939 1003
… …
1103 1167
1104/* move an element suitably so it is in a correct place */ 1168/* move an element suitably so it is in a correct place */
1105inline_size void 1169inline_size void
1106adjustheap (ANHE *heap, int N, int k) 1170adjustheap (ANHE *heap, int N, int k)
1107{ 1171{
1108 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1172 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1109 upheap (heap, k); 1173 upheap (heap, k);
1110 else 1174 else
1111 downheap (heap, N, k); 1175 downheap (heap, N, k);
1112} 1176}
1113 1177
… …
1144inline_speed void 1208inline_speed void
1145fd_intern (int fd) 1209fd_intern (int fd)
1146{ 1210{
1147#ifdef _WIN32 1211#ifdef _WIN32
1148 unsigned long arg = 1; 1212 unsigned long arg = 1;
1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1150#else 1214#else
1151 fcntl (fd, F_SETFD, FD_CLOEXEC); 1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1152 fcntl (fd, F_SETFL, O_NONBLOCK); 1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1153#endif 1217#endif
1154} 1218}
… …
1259{ 1323{
1260#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1261 EV_P = signals [signum - 1].loop; 1325 EV_P = signals [signum - 1].loop;
1262#endif 1326#endif
1263 1327
1264#if _WIN32 1328#ifdef _WIN32
1265 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1266#endif 1330#endif
1267 1331
1268 signals [signum - 1].pending = 1; 1332 signals [signum - 1].pending = 1;
1269 evpipe_write (EV_A_ &sig_pending); 1333 evpipe_write (EV_A_ &sig_pending);
… …
1570#endif 1634#endif
1571#if EV_USE_INOTIFY 1635#if EV_USE_INOTIFY
1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1573#endif 1637#endif
1574#if EV_USE_SIGNALFD 1638#if EV_USE_SIGNALFD
1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1576#endif 1640#endif
1577 1641
1578 if (!(flags & 0x0000ffffU)) 1642 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1643 flags |= ev_recommended_backends ();
1580 1644
… …
1617 close (evfd); 1681 close (evfd);
1618#endif 1682#endif
1619 1683
1620 if (evpipe [0] >= 0) 1684 if (evpipe [0] >= 0)
1621 { 1685 {
1622 close (evpipe [0]); 1686 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1687 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1688 }
1625 } 1689 }
1626 1690
1627#if EV_USE_SIGNALFD 1691#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1692 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1693 close (sigfd);
1634 }
1635#endif 1694#endif
1636 1695
1637#if EV_USE_INOTIFY 1696#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1697 if (fs_fd >= 0)
1639 close (fs_fd); 1698 close (fs_fd);
… …
1724 close (evfd); 1783 close (evfd);
1725#endif 1784#endif
1726 1785
1727 if (evpipe [0] >= 0) 1786 if (evpipe [0] >= 0)
1728 { 1787 {
1729 close (evpipe [0]); 1788 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1789 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1790 }
1732 1791
1733 evpipe_init (EV_A); 1792 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1793 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1794 pipecb (EV_A_ &pipe_w, EV_READ);
… …
2127 ANHE_at_cache (*he); 2186 ANHE_at_cache (*he);
2128 } 2187 }
2129} 2188}
2130 2189
2131/* fetch new monotonic and realtime times from the kernel */ 2190/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2191/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2192inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2193time_update (EV_P_ ev_tstamp max_block)
2135{ 2194{
2136#if EV_USE_MONOTONIC 2195#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2196 if (expect_true (have_monotonic))
… …
2471 2530
2472 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2473 return; 2532 return;
2474 2533
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2534 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2535 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2536
2478 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2479 2538
2480 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2551 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2553 } 2612 }
2554 } 2613 }
2555 2614
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2559 2616
2560 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2561} 2620}
2562 2621
2563void noinline 2622void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2565{ 2624{
… …
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2646 } 2705 }
2647 } 2706 }
2648 2707
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2652} 2711}
2653 2712
2654void noinline 2713void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2715{
… …
2717 if (!((WL)w)->next) 2776 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD 2777# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/ 2778 if (sigfd < 0) /*TODO*/
2720# endif 2779# endif
2721 { 2780 {
2722# if _WIN32 2781# ifdef _WIN32
2782 evpipe_init (EV_A);
2783
2723 signal (w->signum, ev_sighandler); 2784 signal (w->signum, ev_sighandler);
2724# else 2785# else
2725 struct sigaction sa; 2786 struct sigaction sa;
2726 2787
2727 evpipe_init (EV_A); 2788 evpipe_init (EV_A);
… …
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2819 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif 2820#endif
2760#if EV_USE_SIGNALFD 2821#if EV_USE_SIGNALFD
2761 if (sigfd >= 0) 2822 if (sigfd >= 0)
2762 { 2823 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2824 sigset_t ss;
2825
2826 sigemptyset (&ss);
2827 sigaddset (&ss, w->signum);
2764 sigdelset (&sigfd_set, w->signum); 2828 sigdelset (&sigfd_set, w->signum);
2829
2765 signalfd (sigfd, &sigfd_set, 0); 2830 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2831 sigprocmask (SIG_UNBLOCK, &ss, 0);
2767 /*TODO: maybe unblock signal? */
2768 } 2832 }
2769 else 2833 else
2770#endif 2834#endif
2771 signal (w->signum, SIG_DFL); 2835 signal (w->signum, SIG_DFL);
2772 } 2836 }
… …
2818#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2819 2883
2820static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2884static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2821 2885
2822#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2823# define EV_INOTIFY_BUFSIZE 8192 2887
2888/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2889# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2824 2890
2825static void noinline 2891static void noinline
2826infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2827{ 2893{
2828 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); 2894 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);
2829 2895
2830 if (w->wd < 0) 2896 if (w->wd >= 0)
2897 {
2898 struct statfs sfs;
2899
2900 /* now local changes will be tracked by inotify, but remote changes won't */
2901 /* unless the filesystem is known to be local, we therefore still poll */
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (!fs_2625)
2905 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2906 else if (!statfs (w->path, &sfs)
2907 && (sfs.f_type == 0x1373 /* devfs */
2908 || sfs.f_type == 0xEF53 /* ext2/3 */
2909 || sfs.f_type == 0x3153464a /* jfs */
2910 || sfs.f_type == 0x52654973 /* reiser3 */
2911 || sfs.f_type == 0x01021994 /* tempfs */
2912 || sfs.f_type == 0x58465342 /* xfs */))
2913 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2914 else
2915 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2831 { 2916 }
2917 else
2918 {
2919 /* can't use inotify, continue to stat */
2832 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2920 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2833 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2834 2921
2835 /* monitor some parent directory for speedup hints */ 2922 /* if path is not there, monitor some parent directory for speedup hints */
2836 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2923 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2837 /* but an efficiency issue only */ 2924 /* but an efficiency issue only */
2838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2925 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2839 { 2926 {
2840 char path [4096]; 2927 char path [4096];
… …
2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2857 } 2944 }
2858 } 2945 }
2859 2946
2860 if (w->wd >= 0) 2947 if (w->wd >= 0)
2861 {
2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2863 2949
2864 /* now local changes will be tracked by inotify, but remote changes won't */ 2950 /* now re-arm timer, if required */
2865 /* unless the filesystem it known to be local, we therefore still poll */ 2951 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2866 /* also do poll on <2.6.25, but with normal frequency */
2867 struct statfs sfs;
2868
2869 if (fs_2625 && !statfs (w->path, &sfs))
2870 if (sfs.f_type == 0x1373 /* devfs */
2871 || sfs.f_type == 0xEF53 /* ext2/3 */
2872 || sfs.f_type == 0x3153464a /* jfs */
2873 || sfs.f_type == 0x52654973 /* reiser3 */
2874 || sfs.f_type == 0x01021994 /* tempfs */
2875 || sfs.f_type == 0x58465342 /* xfs */)
2876 return;
2877
2878 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2879 ev_timer_again (EV_A_ &w->timer); 2952 ev_timer_again (EV_A_ &w->timer);
2880 } 2953 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2881} 2954}
2882 2955
2883static void noinline 2956static void noinline
2884infy_del (EV_P_ ev_stat *w) 2957infy_del (EV_P_ ev_stat *w)
2885{ 2958{
… …
2930 3003
2931static void 3004static void
2932infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2933{ 3006{
2934 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2935 struct inotify_event *ev = (struct inotify_event *)buf;
2936 int ofs; 3008 int ofs;
2937 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2938 3010
2939 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3011 for (ofs = 0; ofs < len; )
3012 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2940 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3014 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len;
3016 }
3017}
3018
3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
2941} 3049}
2942 3050
2943inline_size void 3051inline_size void
2944check_2625 (EV_P) 3052ev_check_2625 (EV_P)
2945{ 3053{
2946 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2947 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2948 */ 3056 */
2949 struct utsname buf; 3057 if (ev_linux_version () < 0x020619)
2950 int major, minor, micro;
2951
2952 if (uname (&buf))
2953 return; 3058 return;
2954 3059
2955 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2956 return;
2957
2958 if (major < 2
2959 || (major == 2 && minor < 6)
2960 || (major == 2 && minor == 6 && micro < 25))
2961 return;
2962
2963 fs_2625 = 1; 3060 fs_2625 = 1;
3061}
3062
3063inline_size int
3064infy_newfd (void)
3065{
3066#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3067 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3068 if (fd >= 0)
3069 return fd;
3070#endif
3071 return inotify_init ();
2964} 3072}
2965 3073
2966inline_size void 3074inline_size void
2967infy_init (EV_P) 3075infy_init (EV_P)
2968{ 3076{
2969 if (fs_fd != -2) 3077 if (fs_fd != -2)
2970 return; 3078 return;
2971 3079
2972 fs_fd = -1; 3080 fs_fd = -1;
2973 3081
2974 check_2625 (EV_A); 3082 ev_check_2625 (EV_A);
2975 3083
2976 fs_fd = inotify_init (); 3084 fs_fd = infy_newfd ();
2977 3085
2978 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2979 { 3087 {
3088 fd_intern (fs_fd);
2980 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3089 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2981 ev_set_priority (&fs_w, EV_MAXPRI); 3090 ev_set_priority (&fs_w, EV_MAXPRI);
2982 ev_io_start (EV_A_ &fs_w); 3091 ev_io_start (EV_A_ &fs_w);
3092 ev_unref (EV_A);
2983 } 3093 }
2984} 3094}
2985 3095
2986inline_size void 3096inline_size void
2987infy_fork (EV_P) 3097infy_fork (EV_P)
… …
2989 int slot; 3099 int slot;
2990 3100
2991 if (fs_fd < 0) 3101 if (fs_fd < 0)
2992 return; 3102 return;
2993 3103
3104 ev_ref (EV_A);
3105 ev_io_stop (EV_A_ &fs_w);
2994 close (fs_fd); 3106 close (fs_fd);
2995 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
3108
3109 if (fs_fd >= 0)
3110 {
3111 fd_intern (fs_fd);
3112 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A);
3115 }
2996 3116
2997 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2998 { 3118 {
2999 WL w_ = fs_hash [slot].head; 3119 WL w_ = fs_hash [slot].head;
3000 fs_hash [slot].head = 0; 3120 fs_hash [slot].head = 0;
… …
3007 w->wd = -1; 3127 w->wd = -1;
3008 3128
3009 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
3010 infy_add (EV_A_ w); /* re-add, no matter what */ 3130 infy_add (EV_A_ w); /* re-add, no matter what */
3011 else 3131 else
3132 {
3133 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3134 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3012 ev_timer_again (EV_A_ &w->timer); 3135 ev_timer_again (EV_A_ &w->timer);
3136 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3137 }
3013 } 3138 }
3014 } 3139 }
3015} 3140}
3016 3141
3017#endif 3142#endif
… …
3034static void noinline 3159static void noinline
3035stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3160stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3036{ 3161{
3037 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3162 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3038 3163
3039 /* we copy this here each the time so that */ 3164 ev_statdata prev = w->attr;
3040 /* prev has the old value when the callback gets invoked */
3041 w->prev = w->attr;
3042 ev_stat_stat (EV_A_ w); 3165 ev_stat_stat (EV_A_ w);
3043 3166
3044 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3167 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3045 if ( 3168 if (
3046 w->prev.st_dev != w->attr.st_dev 3169 prev.st_dev != w->attr.st_dev
3047 || w->prev.st_ino != w->attr.st_ino 3170 || prev.st_ino != w->attr.st_ino
3048 || w->prev.st_mode != w->attr.st_mode 3171 || prev.st_mode != w->attr.st_mode
3049 || w->prev.st_nlink != w->attr.st_nlink 3172 || prev.st_nlink != w->attr.st_nlink
3050 || w->prev.st_uid != w->attr.st_uid 3173 || prev.st_uid != w->attr.st_uid
3051 || w->prev.st_gid != w->attr.st_gid 3174 || prev.st_gid != w->attr.st_gid
3052 || w->prev.st_rdev != w->attr.st_rdev 3175 || prev.st_rdev != w->attr.st_rdev
3053 || w->prev.st_size != w->attr.st_size 3176 || prev.st_size != w->attr.st_size
3054 || w->prev.st_atime != w->attr.st_atime 3177 || prev.st_atime != w->attr.st_atime
3055 || w->prev.st_mtime != w->attr.st_mtime 3178 || prev.st_mtime != w->attr.st_mtime
3056 || w->prev.st_ctime != w->attr.st_ctime 3179 || prev.st_ctime != w->attr.st_ctime
3057 ) { 3180 ) {
3181 /* we only update w->prev on actual differences */
3182 /* in case we test more often than invoke the callback, */
3183 /* to ensure that prev is always different to attr */
3184 w->prev = prev;
3185
3058 #if EV_USE_INOTIFY 3186 #if EV_USE_INOTIFY
3059 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
3060 { 3188 {
3061 infy_del (EV_A_ w); 3189 infy_del (EV_A_ w);
3062 infy_add (EV_A_ w); 3190 infy_add (EV_A_ w);
… …
3087 3215
3088 if (fs_fd >= 0) 3216 if (fs_fd >= 0)
3089 infy_add (EV_A_ w); 3217 infy_add (EV_A_ w);
3090 else 3218 else
3091#endif 3219#endif
3220 {
3092 ev_timer_again (EV_A_ &w->timer); 3221 ev_timer_again (EV_A_ &w->timer);
3222 ev_unref (EV_A);
3223 }
3093 3224
3094 ev_start (EV_A_ (W)w, 1); 3225 ev_start (EV_A_ (W)w, 1);
3095 3226
3096 EV_FREQUENT_CHECK; 3227 EV_FREQUENT_CHECK;
3097} 3228}
… …
3106 EV_FREQUENT_CHECK; 3237 EV_FREQUENT_CHECK;
3107 3238
3108#if EV_USE_INOTIFY 3239#if EV_USE_INOTIFY
3109 infy_del (EV_A_ w); 3240 infy_del (EV_A_ w);
3110#endif 3241#endif
3242
3243 if (ev_is_active (&w->timer))
3244 {
3245 ev_ref (EV_A);
3111 ev_timer_stop (EV_A_ &w->timer); 3246 ev_timer_stop (EV_A_ &w->timer);
3247 }
3112 3248
3113 ev_stop (EV_A_ (W)w); 3249 ev_stop (EV_A_ (W)w);
3114 3250
3115 EV_FREQUENT_CHECK; 3251 EV_FREQUENT_CHECK;
3116} 3252}
… …
3335 EV_FREQUENT_CHECK; 3471 EV_FREQUENT_CHECK;
3336 3472
3337 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
3338 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
3339 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
3476
3477 ev_stop (EV_A_ (W)w);
3340 3478
3341 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
3342} 3480}
3343#endif 3481#endif
3344 3482

Diff Legend

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