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.335 by root, Tue Mar 9 09:02:03 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
… …
395# endif 404# endif
396# endif 405# endif
397# ifdef __cplusplus 406# ifdef __cplusplus
398extern "C" { 407extern "C" {
399# endif 408# endif
400int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 410# ifdef __cplusplus
402} 411}
403# endif 412# endif
404#endif 413#endif
405 414
406#if EV_USE_SIGNALFD 415#if EV_USE_SIGNALFD
407# 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
408#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
409 443
410/**/ 444/**/
411 445
412#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
425 */ 459 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 461
428#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) */
429#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) */
430/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
431 464
432#if __GNUC__ >= 4 465#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
435#else 468#else
… …
476 509
477#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
479#endif 512#endif
480 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
481#ifdef _WIN32 524#ifdef _WIN32
482# include "ev_win32.c" 525# include "ev_win32.c"
483#endif 526#endif
484 527
485/*****************************************************************************/ 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
486 537
487static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
488 539
489void 540void
490ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
… …
500 551
501 if (syserr_cb) 552 if (syserr_cb)
502 syserr_cb (msg); 553 syserr_cb (msg);
503 else 554 else
504 { 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
505 perror (msg); 564 perror (msg);
565#endif
506 abort (); 566 abort ();
507 } 567 }
508} 568}
509 569
510static void * 570static void *
511ev_realloc_emul (void *ptr, long size) 571ev_realloc_emul (void *ptr, long size)
512{ 572{
573#if __GLIBC__
574 return realloc (ptr, size);
575#else
513 /* some systems, notably openbsd and darwin, fail to properly 576 /* some systems, notably openbsd and darwin, fail to properly
514 * implement realloc (x, 0) (as required by both ansi c-98 and 577 * implement realloc (x, 0) (as required by both ansi c-89 and
515 * the single unix specification, so work around them here. 578 * the single unix specification, so work around them here.
516 */ 579 */
517 580
518 if (size) 581 if (size)
519 return realloc (ptr, size); 582 return realloc (ptr, size);
520 583
521 free (ptr); 584 free (ptr);
522 return 0; 585 return 0;
586#endif
523} 587}
524 588
525static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 589static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
526 590
527void 591void
… …
535{ 599{
536 ptr = alloc (ptr, size); 600 ptr = alloc (ptr, size);
537 601
538 if (!ptr && size) 602 if (!ptr && size)
539 { 603 {
604#if EV_AVOID_STDIO
605 ev_printerr ("libev: memory allocation failed, aborting.\n");
606#else
540 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 607 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
608#endif
541 abort (); 609 abort ();
542 } 610 }
543 611
544 return ptr; 612 return ptr;
545} 613}
… …
876 944
877#if EV_SELECT_IS_WINSOCKET 945#if EV_SELECT_IS_WINSOCKET
878 if (events) 946 if (events)
879 { 947 {
880 unsigned long arg; 948 unsigned long arg;
881 #ifdef EV_FD_TO_WIN32_HANDLE
882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 949 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)); 950 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
887 } 951 }
888#endif 952#endif
889 953
890 { 954 {
… …
933/* check whether the given fd is atcually valid, for error recovery */ 997/* check whether the given fd is atcually valid, for error recovery */
934inline_size int 998inline_size int
935fd_valid (int fd) 999fd_valid (int fd)
936{ 1000{
937#ifdef _WIN32 1001#ifdef _WIN32
938 return _get_osfhandle (fd) != -1; 1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
939#else 1003#else
940 return fcntl (fd, F_GETFD) != -1; 1004 return fcntl (fd, F_GETFD) != -1;
941#endif 1005#endif
942} 1006}
943 1007
… …
1148inline_speed void 1212inline_speed void
1149fd_intern (int fd) 1213fd_intern (int fd)
1150{ 1214{
1151#ifdef _WIN32 1215#ifdef _WIN32
1152 unsigned long arg = 1; 1216 unsigned long arg = 1;
1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1154#else 1218#else
1155 fcntl (fd, F_SETFD, FD_CLOEXEC); 1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1156 fcntl (fd, F_SETFL, O_NONBLOCK); 1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1157#endif 1221#endif
1158} 1222}
… …
1263{ 1327{
1264#if EV_MULTIPLICITY 1328#if EV_MULTIPLICITY
1265 EV_P = signals [signum - 1].loop; 1329 EV_P = signals [signum - 1].loop;
1266#endif 1330#endif
1267 1331
1268#if _WIN32 1332#ifdef _WIN32
1269 signal (signum, ev_sighandler); 1333 signal (signum, ev_sighandler);
1270#endif 1334#endif
1271 1335
1272 signals [signum - 1].pending = 1; 1336 signals [signum - 1].pending = 1;
1273 evpipe_write (EV_A_ &sig_pending); 1337 evpipe_write (EV_A_ &sig_pending);
… …
1574#endif 1638#endif
1575#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1577#endif 1641#endif
1578#if EV_USE_SIGNALFD 1642#if EV_USE_SIGNALFD
1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1580#endif 1644#endif
1581 1645
1582 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1583 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1584 1648
… …
1621 close (evfd); 1685 close (evfd);
1622#endif 1686#endif
1623 1687
1624 if (evpipe [0] >= 0) 1688 if (evpipe [0] >= 0)
1625 { 1689 {
1626 close (evpipe [0]); 1690 EV_WIN32_CLOSE_FD (evpipe [0]);
1627 close (evpipe [1]); 1691 EV_WIN32_CLOSE_FD (evpipe [1]);
1628 } 1692 }
1629 } 1693 }
1630 1694
1631#if EV_USE_SIGNALFD 1695#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w)) 1696 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd); 1697 close (sigfd);
1638 }
1639#endif 1698#endif
1640 1699
1641#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1642 if (fs_fd >= 0) 1701 if (fs_fd >= 0)
1643 close (fs_fd); 1702 close (fs_fd);
… …
1728 close (evfd); 1787 close (evfd);
1729#endif 1788#endif
1730 1789
1731 if (evpipe [0] >= 0) 1790 if (evpipe [0] >= 0)
1732 { 1791 {
1733 close (evpipe [0]); 1792 EV_WIN32_CLOSE_FD (evpipe [0]);
1734 close (evpipe [1]); 1793 EV_WIN32_CLOSE_FD (evpipe [1]);
1735 } 1794 }
1736 1795
1737 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1738 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1739 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
… …
2131 ANHE_at_cache (*he); 2190 ANHE_at_cache (*he);
2132 } 2191 }
2133} 2192}
2134 2193
2135/* fetch new monotonic and realtime times from the kernel */ 2194/* fetch new monotonic and realtime times from the kernel */
2136/* also detetc if there was a timejump, and act accordingly */ 2195/* also detect if there was a timejump, and act accordingly */
2137inline_speed void 2196inline_speed void
2138time_update (EV_P_ ev_tstamp max_block) 2197time_update (EV_P_ ev_tstamp max_block)
2139{ 2198{
2140#if EV_USE_MONOTONIC 2199#if EV_USE_MONOTONIC
2141 if (expect_true (have_monotonic)) 2200 if (expect_true (have_monotonic))
… …
2475 2534
2476 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
2477 return; 2536 return;
2478 2537
2479 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2538 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)))); 2539 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2481 2540
2482 EV_FREQUENT_CHECK; 2541 EV_FREQUENT_CHECK;
2483 2542
2484 ev_start (EV_A_ (W)w, 1); 2543 ev_start (EV_A_ (W)w, 1);
2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2544 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2555 timers [active] = timers [timercnt + HEAP0]; 2614 timers [active] = timers [timercnt + HEAP0];
2556 adjustheap (timers, timercnt, active); 2615 adjustheap (timers, timercnt, active);
2557 } 2616 }
2558 } 2617 }
2559 2618
2560 EV_FREQUENT_CHECK;
2561
2562 ev_at (w) -= mn_now; 2619 ev_at (w) -= mn_now;
2563 2620
2564 ev_stop (EV_A_ (W)w); 2621 ev_stop (EV_A_ (W)w);
2622
2623 EV_FREQUENT_CHECK;
2565} 2624}
2566 2625
2567void noinline 2626void noinline
2568ev_timer_again (EV_P_ ev_timer *w) 2627ev_timer_again (EV_P_ ev_timer *w)
2569{ 2628{
… …
2648 periodics [active] = periodics [periodiccnt + HEAP0]; 2707 periodics [active] = periodics [periodiccnt + HEAP0];
2649 adjustheap (periodics, periodiccnt, active); 2708 adjustheap (periodics, periodiccnt, active);
2650 } 2709 }
2651 } 2710 }
2652 2711
2653 EV_FREQUENT_CHECK;
2654
2655 ev_stop (EV_A_ (W)w); 2712 ev_stop (EV_A_ (W)w);
2713
2714 EV_FREQUENT_CHECK;
2656} 2715}
2657 2716
2658void noinline 2717void noinline
2659ev_periodic_again (EV_P_ ev_periodic *w) 2718ev_periodic_again (EV_P_ ev_periodic *w)
2660{ 2719{
… …
2721 if (!((WL)w)->next) 2780 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD 2781# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/ 2782 if (sigfd < 0) /*TODO*/
2724# endif 2783# endif
2725 { 2784 {
2726# if _WIN32 2785# ifdef _WIN32
2786 evpipe_init (EV_A);
2787
2727 signal (w->signum, ev_sighandler); 2788 signal (w->signum, ev_sighandler);
2728# else 2789# else
2729 struct sigaction sa; 2790 struct sigaction sa;
2730 2791
2731 evpipe_init (EV_A); 2792 evpipe_init (EV_A);
… …
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2823 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif 2824#endif
2764#if EV_USE_SIGNALFD 2825#if EV_USE_SIGNALFD
2765 if (sigfd >= 0) 2826 if (sigfd >= 0)
2766 { 2827 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2828 sigset_t ss;
2829
2830 sigemptyset (&ss);
2831 sigaddset (&ss, w->signum);
2768 sigdelset (&sigfd_set, w->signum); 2832 sigdelset (&sigfd_set, w->signum);
2833
2769 signalfd (sigfd, &sigfd_set, 0); 2834 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2835 sigprocmask (SIG_UNBLOCK, &ss, 0);
2771 /*TODO: maybe unblock signal? */
2772 } 2836 }
2773 else 2837 else
2774#endif 2838#endif
2775 signal (w->signum, SIG_DFL); 2839 signal (w->signum, SIG_DFL);
2776 } 2840 }
… …
2822#define MIN_STAT_INTERVAL 0.1074891 2886#define MIN_STAT_INTERVAL 0.1074891
2823 2887
2824static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2888static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2825 2889
2826#if EV_USE_INOTIFY 2890#if EV_USE_INOTIFY
2827# define EV_INOTIFY_BUFSIZE 8192 2891
2892/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2893# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2828 2894
2829static void noinline 2895static void noinline
2830infy_add (EV_P_ ev_stat *w) 2896infy_add (EV_P_ ev_stat *w)
2831{ 2897{
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); 2898 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 2899
2834 if (w->wd < 0) 2900 if (w->wd >= 0)
2901 {
2902 struct statfs sfs;
2903
2904 /* now local changes will be tracked by inotify, but remote changes won't */
2905 /* unless the filesystem is known to be local, we therefore still poll */
2906 /* also do poll on <2.6.25, but with normal frequency */
2907
2908 if (!fs_2625)
2909 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2910 else if (!statfs (w->path, &sfs)
2911 && (sfs.f_type == 0x1373 /* devfs */
2912 || sfs.f_type == 0xEF53 /* ext2/3 */
2913 || sfs.f_type == 0x3153464a /* jfs */
2914 || sfs.f_type == 0x52654973 /* reiser3 */
2915 || sfs.f_type == 0x01021994 /* tempfs */
2916 || sfs.f_type == 0x58465342 /* xfs */))
2917 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2918 else
2919 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2835 { 2920 }
2921 else
2922 {
2923 /* can't use inotify, continue to stat */
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2924 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 2925
2839 /* monitor some parent directory for speedup hints */ 2926 /* 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, */ 2927 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2841 /* but an efficiency issue only */ 2928 /* but an efficiency issue only */
2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2929 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2843 { 2930 {
2844 char path [4096]; 2931 char path [4096];
… …
2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2861 } 2948 }
2862 } 2949 }
2863 2950
2864 if (w->wd >= 0) 2951 if (w->wd >= 0)
2865 {
2866 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2952 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2867 2953
2868 /* now local changes will be tracked by inotify, but remote changes won't */ 2954 /* now re-arm timer, if required */
2869 /* unless the filesystem it known to be local, we therefore still poll */ 2955 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); 2956 ev_timer_again (EV_A_ &w->timer);
2884 } 2957 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2885} 2958}
2886 2959
2887static void noinline 2960static void noinline
2888infy_del (EV_P_ ev_stat *w) 2961infy_del (EV_P_ ev_stat *w)
2889{ 2962{
… …
2934 3007
2935static void 3008static void
2936infy_cb (EV_P_ ev_io *w, int revents) 3009infy_cb (EV_P_ ev_io *w, int revents)
2937{ 3010{
2938 char buf [EV_INOTIFY_BUFSIZE]; 3011 char buf [EV_INOTIFY_BUFSIZE];
2939 struct inotify_event *ev = (struct inotify_event *)buf;
2940 int ofs; 3012 int ofs;
2941 int len = read (fs_fd, buf, sizeof (buf)); 3013 int len = read (fs_fd, buf, sizeof (buf));
2942 3014
2943 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3015 for (ofs = 0; ofs < len; )
3016 {
3017 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2944 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3018 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3019 ofs += sizeof (struct inotify_event) + ev->len;
3020 }
3021}
3022
3023inline_size unsigned int
3024ev_linux_version (void)
3025{
3026 struct utsname buf;
3027 unsigned int v;
3028 int i;
3029 char *p = buf.release;
3030
3031 if (uname (&buf))
3032 return 0;
3033
3034 for (i = 3+1; --i; )
3035 {
3036 unsigned int c = 0;
3037
3038 for (;;)
3039 {
3040 if (*p >= '0' && *p <= '9')
3041 c = c * 10 + *p++ - '0';
3042 else
3043 {
3044 p += *p == '.';
3045 break;
3046 }
3047 }
3048
3049 v = (v << 8) | c;
3050 }
3051
3052 return v;
2945} 3053}
2946 3054
2947inline_size void 3055inline_size void
2948check_2625 (EV_P) 3056ev_check_2625 (EV_P)
2949{ 3057{
2950 /* kernels < 2.6.25 are borked 3058 /* kernels < 2.6.25 are borked
2951 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3059 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2952 */ 3060 */
2953 struct utsname buf; 3061 if (ev_linux_version () < 0x020619)
2954 int major, minor, micro;
2955
2956 if (uname (&buf))
2957 return; 3062 return;
2958 3063
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; 3064 fs_2625 = 1;
3065}
3066
3067inline_size int
3068infy_newfd (void)
3069{
3070#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3071 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3072 if (fd >= 0)
3073 return fd;
3074#endif
3075 return inotify_init ();
2968} 3076}
2969 3077
2970inline_size void 3078inline_size void
2971infy_init (EV_P) 3079infy_init (EV_P)
2972{ 3080{
2973 if (fs_fd != -2) 3081 if (fs_fd != -2)
2974 return; 3082 return;
2975 3083
2976 fs_fd = -1; 3084 fs_fd = -1;
2977 3085
2978 check_2625 (EV_A); 3086 ev_check_2625 (EV_A);
2979 3087
2980 fs_fd = inotify_init (); 3088 fs_fd = infy_newfd ();
2981 3089
2982 if (fs_fd >= 0) 3090 if (fs_fd >= 0)
2983 { 3091 {
3092 fd_intern (fs_fd);
2984 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3093 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2985 ev_set_priority (&fs_w, EV_MAXPRI); 3094 ev_set_priority (&fs_w, EV_MAXPRI);
2986 ev_io_start (EV_A_ &fs_w); 3095 ev_io_start (EV_A_ &fs_w);
3096 ev_unref (EV_A);
2987 } 3097 }
2988} 3098}
2989 3099
2990inline_size void 3100inline_size void
2991infy_fork (EV_P) 3101infy_fork (EV_P)
… …
2993 int slot; 3103 int slot;
2994 3104
2995 if (fs_fd < 0) 3105 if (fs_fd < 0)
2996 return; 3106 return;
2997 3107
3108 ev_ref (EV_A);
3109 ev_io_stop (EV_A_ &fs_w);
2998 close (fs_fd); 3110 close (fs_fd);
2999 fs_fd = inotify_init (); 3111 fs_fd = infy_newfd ();
3112
3113 if (fs_fd >= 0)
3114 {
3115 fd_intern (fs_fd);
3116 ev_io_set (&fs_w, fs_fd, EV_READ);
3117 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A);
3119 }
3000 3120
3001 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3121 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3002 { 3122 {
3003 WL w_ = fs_hash [slot].head; 3123 WL w_ = fs_hash [slot].head;
3004 fs_hash [slot].head = 0; 3124 fs_hash [slot].head = 0;
… …
3011 w->wd = -1; 3131 w->wd = -1;
3012 3132
3013 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
3014 infy_add (EV_A_ w); /* re-add, no matter what */ 3134 infy_add (EV_A_ w); /* re-add, no matter what */
3015 else 3135 else
3136 {
3137 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3138 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3016 ev_timer_again (EV_A_ &w->timer); 3139 ev_timer_again (EV_A_ &w->timer);
3140 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3141 }
3017 } 3142 }
3018 } 3143 }
3019} 3144}
3020 3145
3021#endif 3146#endif
… …
3038static void noinline 3163static void noinline
3039stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3164stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3040{ 3165{
3041 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3166 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3042 3167
3043 /* we copy this here each the time so that */ 3168 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); 3169 ev_stat_stat (EV_A_ w);
3047 3170
3048 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3171 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3049 if ( 3172 if (
3050 w->prev.st_dev != w->attr.st_dev 3173 prev.st_dev != w->attr.st_dev
3051 || w->prev.st_ino != w->attr.st_ino 3174 || prev.st_ino != w->attr.st_ino
3052 || w->prev.st_mode != w->attr.st_mode 3175 || prev.st_mode != w->attr.st_mode
3053 || w->prev.st_nlink != w->attr.st_nlink 3176 || prev.st_nlink != w->attr.st_nlink
3054 || w->prev.st_uid != w->attr.st_uid 3177 || prev.st_uid != w->attr.st_uid
3055 || w->prev.st_gid != w->attr.st_gid 3178 || prev.st_gid != w->attr.st_gid
3056 || w->prev.st_rdev != w->attr.st_rdev 3179 || prev.st_rdev != w->attr.st_rdev
3057 || w->prev.st_size != w->attr.st_size 3180 || prev.st_size != w->attr.st_size
3058 || w->prev.st_atime != w->attr.st_atime 3181 || prev.st_atime != w->attr.st_atime
3059 || w->prev.st_mtime != w->attr.st_mtime 3182 || prev.st_mtime != w->attr.st_mtime
3060 || w->prev.st_ctime != w->attr.st_ctime 3183 || prev.st_ctime != w->attr.st_ctime
3061 ) { 3184 ) {
3185 /* we only update w->prev on actual differences */
3186 /* in case we test more often than invoke the callback, */
3187 /* to ensure that prev is always different to attr */
3188 w->prev = prev;
3189
3062 #if EV_USE_INOTIFY 3190 #if EV_USE_INOTIFY
3063 if (fs_fd >= 0) 3191 if (fs_fd >= 0)
3064 { 3192 {
3065 infy_del (EV_A_ w); 3193 infy_del (EV_A_ w);
3066 infy_add (EV_A_ w); 3194 infy_add (EV_A_ w);
… …
3091 3219
3092 if (fs_fd >= 0) 3220 if (fs_fd >= 0)
3093 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
3094 else 3222 else
3095#endif 3223#endif
3224 {
3096 ev_timer_again (EV_A_ &w->timer); 3225 ev_timer_again (EV_A_ &w->timer);
3226 ev_unref (EV_A);
3227 }
3097 3228
3098 ev_start (EV_A_ (W)w, 1); 3229 ev_start (EV_A_ (W)w, 1);
3099 3230
3100 EV_FREQUENT_CHECK; 3231 EV_FREQUENT_CHECK;
3101} 3232}
… …
3110 EV_FREQUENT_CHECK; 3241 EV_FREQUENT_CHECK;
3111 3242
3112#if EV_USE_INOTIFY 3243#if EV_USE_INOTIFY
3113 infy_del (EV_A_ w); 3244 infy_del (EV_A_ w);
3114#endif 3245#endif
3246
3247 if (ev_is_active (&w->timer))
3248 {
3249 ev_ref (EV_A);
3115 ev_timer_stop (EV_A_ &w->timer); 3250 ev_timer_stop (EV_A_ &w->timer);
3251 }
3116 3252
3117 ev_stop (EV_A_ (W)w); 3253 ev_stop (EV_A_ (W)w);
3118 3254
3119 EV_FREQUENT_CHECK; 3255 EV_FREQUENT_CHECK;
3120} 3256}
… …
3339 EV_FREQUENT_CHECK; 3475 EV_FREQUENT_CHECK;
3340 3476
3341 ev_io_stop (EV_A_ &w->io); 3477 ev_io_stop (EV_A_ &w->io);
3342 ev_prepare_stop (EV_A_ &w->prepare); 3478 ev_prepare_stop (EV_A_ &w->prepare);
3343 ev_fork_stop (EV_A_ &w->fork); 3479 ev_fork_stop (EV_A_ &w->fork);
3480
3481 ev_stop (EV_A_ (W)w);
3344 3482
3345 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3346} 3484}
3347#endif 3485#endif
3348 3486

Diff Legend

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