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

Comparing libev/ev.c (file contents):
Revision 1.312 by root, Wed Aug 12 18:48:17 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 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
… …
302# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
303# endif 305# endif
304#endif 306#endif
305 307
306#ifndef EV_USE_SIGNALFD 308#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 310# define EV_USE_SIGNALFD 1
309# else 311# else
310# define EV_USE_SIGNALFD 0 312# define EV_USE_SIGNALFD 0
311# endif 313# endif
312#endif 314#endif
… …
343# endif 345# endif
344#endif 346#endif
345 347
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
348#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
351#endif 359#endif
352 360
… …
395# endif 403# endif
396# endif 404# endif
397# ifdef __cplusplus 405# ifdef __cplusplus
398extern "C" { 406extern "C" {
399# endif 407# endif
400int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 409# ifdef __cplusplus
402} 410}
403# endif 411# endif
404#endif 412#endif
405 413
406#if EV_USE_SIGNALFD 414#if EV_USE_SIGNALFD
407# include <sys/signalfd.h> 415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
408#endif 419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
409 442
410/**/ 443/**/
411 444
412#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
425 */ 458 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 460
428#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#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) */ 462#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 463
432#if __GNUC__ >= 4 464#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
435#else 467#else
… …
476 508
477#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
479#endif 511#endif
480 512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
521#endif
522
481#ifdef _WIN32 523#ifdef _WIN32
482# include "ev_win32.c" 524# include "ev_win32.c"
483#endif 525#endif
484 526
485/*****************************************************************************/ 527/*****************************************************************************/
… …
500 542
501 if (syserr_cb) 543 if (syserr_cb)
502 syserr_cb (msg); 544 syserr_cb (msg);
503 else 545 else
504 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
505 perror (msg); 554 perror (msg);
555#endif
506 abort (); 556 abort ();
507 } 557 }
508} 558}
509 559
510static void * 560static void *
… …
535{ 585{
536 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
537 587
538 if (!ptr && size) 588 if (!ptr && size)
539 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
540 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
541 abort (); 596 abort ();
542 } 597 }
543 598
544 return ptr; 599 return ptr;
545} 600}
… …
876 931
877#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
878 if (events) 933 if (events)
879 { 934 {
880 unsigned long arg; 935 unsigned long arg;
881 #ifdef EV_FD_TO_WIN32_HANDLE
882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 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)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
887 } 938 }
888#endif 939#endif
889 940
890 { 941 {
… …
933/* check whether the given fd is atcually valid, for error recovery */ 984/* check whether the given fd is atcually valid, for error recovery */
934inline_size int 985inline_size int
935fd_valid (int fd) 986fd_valid (int fd)
936{ 987{
937#ifdef _WIN32 988#ifdef _WIN32
938 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
939#else 990#else
940 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
941#endif 992#endif
942} 993}
943 994
… …
1148inline_speed void 1199inline_speed void
1149fd_intern (int fd) 1200fd_intern (int fd)
1150{ 1201{
1151#ifdef _WIN32 1202#ifdef _WIN32
1152 unsigned long arg = 1; 1203 unsigned long arg = 1;
1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1154#else 1205#else
1155 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1156 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1157#endif 1208#endif
1158} 1209}
… …
1263{ 1314{
1264#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1265 EV_P = signals [signum - 1].loop; 1316 EV_P = signals [signum - 1].loop;
1266#endif 1317#endif
1267 1318
1268#if _WIN32 1319#ifdef _WIN32
1269 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1270#endif 1321#endif
1271 1322
1272 signals [signum - 1].pending = 1; 1323 signals [signum - 1].pending = 1;
1273 evpipe_write (EV_A_ &sig_pending); 1324 evpipe_write (EV_A_ &sig_pending);
… …
1574#endif 1625#endif
1575#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1577#endif 1628#endif
1578#if EV_USE_SIGNALFD 1629#if EV_USE_SIGNALFD
1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1580#endif 1631#endif
1581 1632
1582 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1583 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1584 1635
… …
1621 close (evfd); 1672 close (evfd);
1622#endif 1673#endif
1623 1674
1624 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1625 { 1676 {
1626 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1627 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1628 } 1679 }
1629 } 1680 }
1630 1681
1631#if EV_USE_SIGNALFD 1682#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w)) 1683 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd); 1684 close (sigfd);
1638 }
1639#endif 1685#endif
1640 1686
1641#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1642 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1643 close (fs_fd); 1689 close (fs_fd);
… …
1728 close (evfd); 1774 close (evfd);
1729#endif 1775#endif
1730 1776
1731 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1732 { 1778 {
1733 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1734 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1735 } 1781 }
1736 1782
1737 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1738 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1739 pipecb (EV_A_ &pipe_w, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
… …
2131 ANHE_at_cache (*he); 2177 ANHE_at_cache (*he);
2132 } 2178 }
2133} 2179}
2134 2180
2135/* fetch new monotonic and realtime times from the kernel */ 2181/* fetch new monotonic and realtime times from the kernel */
2136/* also detetc if there was a timejump, and act accordingly */ 2182/* also detect if there was a timejump, and act accordingly */
2137inline_speed void 2183inline_speed void
2138time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
2139{ 2185{
2140#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
2141 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
… …
2475 2521
2476 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2477 return; 2523 return;
2478 2524
2479 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 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)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2481 2527
2482 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2483 2529
2484 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2555 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2556 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2557 } 2603 }
2558 } 2604 }
2559 2605
2560 EV_FREQUENT_CHECK;
2561
2562 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2563 2607
2564 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2565} 2611}
2566 2612
2567void noinline 2613void noinline
2568ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2569{ 2615{
… …
2648 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2649 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2650 } 2696 }
2651 } 2697 }
2652 2698
2653 EV_FREQUENT_CHECK;
2654
2655 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2656} 2702}
2657 2703
2658void noinline 2704void noinline
2659ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2660{ 2706{
… …
2721 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD 2768# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/ 2769 if (sigfd < 0) /*TODO*/
2724# endif 2770# endif
2725 { 2771 {
2726# if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2727 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2728# else 2776# else
2729 struct sigaction sa; 2777 struct sigaction sa;
2730 2778
2731 evpipe_init (EV_A); 2779 evpipe_init (EV_A);
… …
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif 2811#endif
2764#if EV_USE_SIGNALFD 2812#if EV_USE_SIGNALFD
2765 if (sigfd >= 0) 2813 if (sigfd >= 0)
2766 { 2814 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2768 sigdelset (&sigfd_set, w->signum); 2819 sigdelset (&sigfd_set, w->signum);
2820
2769 signalfd (sigfd, &sigfd_set, 0); 2821 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2771 /*TODO: maybe unblock signal? */
2772 } 2823 }
2773 else 2824 else
2774#endif 2825#endif
2775 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2776 } 2827 }
… …
2822#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2823 2874
2824static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2825 2876
2826#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2827# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2828 2881
2829static void noinline 2882static void noinline
2830infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2831{ 2884{
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); 2885 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 2886
2834 if (w->wd < 0) 2887 if (w->wd >= 0)
2888 {
2889 struct statfs sfs;
2890
2891 /* now local changes will be tracked by inotify, but remote changes won't */
2892 /* unless the filesystem is known to be local, we therefore still poll */
2893 /* also do poll on <2.6.25, but with normal frequency */
2894
2895 if (!fs_2625)
2896 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2897 else if (!statfs (w->path, &sfs)
2898 && (sfs.f_type == 0x1373 /* devfs */
2899 || sfs.f_type == 0xEF53 /* ext2/3 */
2900 || sfs.f_type == 0x3153464a /* jfs */
2901 || sfs.f_type == 0x52654973 /* reiser3 */
2902 || sfs.f_type == 0x01021994 /* tempfs */
2903 || sfs.f_type == 0x58465342 /* xfs */))
2904 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2905 else
2906 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2835 { 2907 }
2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2911 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 2912
2839 /* monitor some parent directory for speedup hints */ 2913 /* 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, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2841 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2843 { 2917 {
2844 char path [4096]; 2918 char path [4096];
… …
2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2861 } 2935 }
2862 } 2936 }
2863 2937
2864 if (w->wd >= 0) 2938 if (w->wd >= 0)
2865 {
2866 struct statfs sfs;
2867
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869 2940
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2941 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2942 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 /* also do poll on <2.6.25, but with normal frequency */
2873
2874 if (fs_2625 && !statfs (w->path, &sfs))
2875 if (sfs.f_type == 0x1373 /* devfs */
2876 || sfs.f_type == 0xEF53 /* ext2/3 */
2877 || sfs.f_type == 0x3153464a /* jfs */
2878 || sfs.f_type == 0x52654973 /* reiser3 */
2879 || sfs.f_type == 0x01021994 /* tempfs */
2880 || sfs.f_type == 0x58465342 /* xfs */)
2881 return;
2882
2883 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2884 ev_timer_again (EV_A_ &w->timer); 2943 ev_timer_again (EV_A_ &w->timer);
2885 } 2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2886} 2945}
2887 2946
2888static void noinline 2947static void noinline
2889infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2890{ 2949{
… …
2935 2994
2936static void 2995static void
2937infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2938{ 2997{
2939 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2940 struct inotify_event *ev = (struct inotify_event *)buf;
2941 int ofs; 2999 int ofs;
2942 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2943 3001
2944 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2945 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
2946} 3040}
2947 3041
2948inline_size void 3042inline_size void
2949check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2950{ 3044{
2951 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2952 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2953 */ 3047 */
2954 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2955 int major, minor, micro;
2956
2957 if (uname (&buf))
2958 return; 3049 return;
2959 3050
2960 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2961 return;
2962
2963 if (major < 2
2964 || (major == 2 && minor < 6)
2965 || (major == 2 && minor == 6 && micro < 25))
2966 return;
2967
2968 fs_2625 = 1; 3051 fs_2625 = 1;
3052}
3053
3054inline_size int
3055infy_newfd (void)
3056{
3057#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3058 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3059 if (fd >= 0)
3060 return fd;
3061#endif
3062 return inotify_init ();
2969} 3063}
2970 3064
2971inline_size void 3065inline_size void
2972infy_init (EV_P) 3066infy_init (EV_P)
2973{ 3067{
2974 if (fs_fd != -2) 3068 if (fs_fd != -2)
2975 return; 3069 return;
2976 3070
2977 fs_fd = -1; 3071 fs_fd = -1;
2978 3072
2979 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
2980 3074
2981 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2982 3076
2983 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2984 { 3078 {
3079 fd_intern (fs_fd);
2985 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2986 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2987 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2988 } 3084 }
2989} 3085}
2990 3086
2991inline_size void 3087inline_size void
2992infy_fork (EV_P) 3088infy_fork (EV_P)
… …
2994 int slot; 3090 int slot;
2995 3091
2996 if (fs_fd < 0) 3092 if (fs_fd < 0)
2997 return; 3093 return;
2998 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2999 close (fs_fd); 3097 close (fs_fd);
3000 fs_fd = inotify_init (); 3098 fs_fd = infy_newfd ();
3099
3100 if (fs_fd >= 0)
3101 {
3102 fd_intern (fs_fd);
3103 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A);
3106 }
3001 3107
3002 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3003 { 3109 {
3004 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
3005 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
… …
3012 w->wd = -1; 3118 w->wd = -1;
3013 3119
3014 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
3015 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
3016 else 3122 else
3123 {
3124 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3125 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3017 ev_timer_again (EV_A_ &w->timer); 3126 ev_timer_again (EV_A_ &w->timer);
3127 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3128 }
3018 } 3129 }
3019 } 3130 }
3020} 3131}
3021 3132
3022#endif 3133#endif
… …
3039static void noinline 3150static void noinline
3040stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3041{ 3152{
3042 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3043 3154
3044 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
3045 /* prev has the old value when the callback gets invoked */
3046 w->prev = w->attr;
3047 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
3048 3157
3049 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3158 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3050 if ( 3159 if (
3051 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
3052 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
3053 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
3054 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
3055 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
3056 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
3057 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
3058 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
3059 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
3060 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
3061 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
3062 ) { 3171 ) {
3172 /* we only update w->prev on actual differences */
3173 /* in case we test more often than invoke the callback, */
3174 /* to ensure that prev is always different to attr */
3175 w->prev = prev;
3176
3063 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
3064 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
3065 { 3179 {
3066 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
3067 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
… …
3092 3206
3093 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
3094 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
3095 else 3209 else
3096#endif 3210#endif
3211 {
3097 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
3098 3215
3099 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
3100 3217
3101 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
3102} 3219}
… …
3111 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
3112 3229
3113#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
3114 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
3115#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
3116 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
3117 3239
3118 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
3119 3241
3120 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
3121} 3243}
… …
3340 EV_FREQUENT_CHECK; 3462 EV_FREQUENT_CHECK;
3341 3463
3342 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3343 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3344 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3467
3468 ev_stop (EV_A_ (W)w);
3345 3469
3346 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3347} 3471}
3348#endif 3472#endif
3349 3473

Diff Legend

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