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

Comparing libev/ev.c (file contents):
Revision 1.317 by root, Sat Nov 14 00:15:21 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 */
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
504 513
505#ifndef EV_FD_TO_WIN32_HANDLE 514#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 516#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 517#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 519#endif
511#ifndef EV_WIN32_CLOSE_FD 520#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 521# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 522#endif
514 523
515#ifdef _WIN32 524#ifdef _WIN32
516# include "ev_win32.c" 525# include "ev_win32.c"
517#endif 526#endif
518 527
519/*****************************************************************************/ 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
520 537
521static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
522 539
523void 540void
524ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
534 551
535 if (syserr_cb) 552 if (syserr_cb)
536 syserr_cb (msg); 553 syserr_cb (msg);
537 else 554 else
538 { 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
539 perror (msg); 564 perror (msg);
565#endif
540 abort (); 566 abort ();
541 } 567 }
542} 568}
543 569
544static void * 570static void *
545ev_realloc_emul (void *ptr, long size) 571ev_realloc_emul (void *ptr, long size)
546{ 572{
573#if __GLIBC__
574 return realloc (ptr, size);
575#else
547 /* some systems, notably openbsd and darwin, fail to properly 576 /* some systems, notably openbsd and darwin, fail to properly
548 * 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
549 * the single unix specification, so work around them here. 578 * the single unix specification, so work around them here.
550 */ 579 */
551 580
552 if (size) 581 if (size)
553 return realloc (ptr, size); 582 return realloc (ptr, size);
554 583
555 free (ptr); 584 free (ptr);
556 return 0; 585 return 0;
586#endif
557} 587}
558 588
559static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 589static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
560 590
561void 591void
569{ 599{
570 ptr = alloc (ptr, size); 600 ptr = alloc (ptr, size);
571 601
572 if (!ptr && size) 602 if (!ptr && size)
573 { 603 {
604#if EV_AVOID_STDIO
605 ev_printerr ("libev: memory allocation failed, aborting.\n");
606#else
574 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 607 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
608#endif
575 abort (); 609 abort ();
576 } 610 }
577 611
578 return ptr; 612 return ptr;
579} 613}
963/* check whether the given fd is atcually valid, for error recovery */ 997/* check whether the given fd is atcually valid, for error recovery */
964inline_size int 998inline_size int
965fd_valid (int fd) 999fd_valid (int fd)
966{ 1000{
967#ifdef _WIN32 1001#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 1002 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 1003#else
970 return fcntl (fd, F_GETFD) != -1; 1004 return fcntl (fd, F_GETFD) != -1;
971#endif 1005#endif
972} 1006}
973 1007
1178inline_speed void 1212inline_speed void
1179fd_intern (int fd) 1213fd_intern (int fd)
1180{ 1214{
1181#ifdef _WIN32 1215#ifdef _WIN32
1182 unsigned long arg = 1; 1216 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1217 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1184#else 1218#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC); 1219 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK); 1220 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif 1221#endif
1188} 1222}
1293{ 1327{
1294#if EV_MULTIPLICITY 1328#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop; 1329 EV_P = signals [signum - 1].loop;
1296#endif 1330#endif
1297 1331
1298#if _WIN32 1332#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1333 signal (signum, ev_sighandler);
1300#endif 1334#endif
1301 1335
1302 signals [signum - 1].pending = 1; 1336 signals [signum - 1].pending = 1;
1303 evpipe_write (EV_A_ &sig_pending); 1337 evpipe_write (EV_A_ &sig_pending);
1604#endif 1638#endif
1605#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1641#endif
1608#if EV_USE_SIGNALFD 1642#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1644#endif
1611 1645
1612 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1613 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1614 1648
2156 ANHE_at_cache (*he); 2190 ANHE_at_cache (*he);
2157 } 2191 }
2158} 2192}
2159 2193
2160/* fetch new monotonic and realtime times from the kernel */ 2194/* fetch new monotonic and realtime times from the kernel */
2161/* also detetc if there was a timejump, and act accordingly */ 2195/* also detect if there was a timejump, and act accordingly */
2162inline_speed void 2196inline_speed void
2163time_update (EV_P_ ev_tstamp max_block) 2197time_update (EV_P_ ev_tstamp max_block)
2164{ 2198{
2165#if EV_USE_MONOTONIC 2199#if EV_USE_MONOTONIC
2166 if (expect_true (have_monotonic)) 2200 if (expect_true (have_monotonic))
2500 2534
2501 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
2502 return; 2536 return;
2503 2537
2504 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2538 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2505 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))));
2506 2540
2507 EV_FREQUENT_CHECK; 2541 EV_FREQUENT_CHECK;
2508 2542
2509 ev_start (EV_A_ (W)w, 1); 2543 ev_start (EV_A_ (W)w, 1);
2510 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2544 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2580 timers [active] = timers [timercnt + HEAP0]; 2614 timers [active] = timers [timercnt + HEAP0];
2581 adjustheap (timers, timercnt, active); 2615 adjustheap (timers, timercnt, active);
2582 } 2616 }
2583 } 2617 }
2584 2618
2585 EV_FREQUENT_CHECK;
2586
2587 ev_at (w) -= mn_now; 2619 ev_at (w) -= mn_now;
2588 2620
2589 ev_stop (EV_A_ (W)w); 2621 ev_stop (EV_A_ (W)w);
2622
2623 EV_FREQUENT_CHECK;
2590} 2624}
2591 2625
2592void noinline 2626void noinline
2593ev_timer_again (EV_P_ ev_timer *w) 2627ev_timer_again (EV_P_ ev_timer *w)
2594{ 2628{
2673 periodics [active] = periodics [periodiccnt + HEAP0]; 2707 periodics [active] = periodics [periodiccnt + HEAP0];
2674 adjustheap (periodics, periodiccnt, active); 2708 adjustheap (periodics, periodiccnt, active);
2675 } 2709 }
2676 } 2710 }
2677 2711
2678 EV_FREQUENT_CHECK;
2679
2680 ev_stop (EV_A_ (W)w); 2712 ev_stop (EV_A_ (W)w);
2713
2714 EV_FREQUENT_CHECK;
2681} 2715}
2682 2716
2683void noinline 2717void noinline
2684ev_periodic_again (EV_P_ ev_periodic *w) 2718ev_periodic_again (EV_P_ ev_periodic *w)
2685{ 2719{
2746 if (!((WL)w)->next) 2780 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD 2781# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/ 2782 if (sigfd < 0) /*TODO*/
2749# endif 2783# endif
2750 { 2784 {
2751# if _WIN32 2785# ifdef _WIN32
2752 evpipe_init (EV_A); 2786 evpipe_init (EV_A);
2753 2787
2754 signal (w->signum, ev_sighandler); 2788 signal (w->signum, ev_sighandler);
2755# else 2789# else
2756 struct sigaction sa; 2790 struct sigaction sa;
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2823 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif 2824#endif
2791#if EV_USE_SIGNALFD 2825#if EV_USE_SIGNALFD
2792 if (sigfd >= 0) 2826 if (sigfd >= 0)
2793 { 2827 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2828 sigset_t ss;
2829
2830 sigemptyset (&ss);
2831 sigaddset (&ss, w->signum);
2795 sigdelset (&sigfd_set, w->signum); 2832 sigdelset (&sigfd_set, w->signum);
2833
2796 signalfd (sigfd, &sigfd_set, 0); 2834 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2835 sigprocmask (SIG_UNBLOCK, &ss, 0);
2798 /*TODO: maybe unblock signal? */
2799 } 2836 }
2800 else 2837 else
2801#endif 2838#endif
2802 signal (w->signum, SIG_DFL); 2839 signal (w->signum, SIG_DFL);
2803 } 2840 }
2849#define MIN_STAT_INTERVAL 0.1074891 2886#define MIN_STAT_INTERVAL 0.1074891
2850 2887
2851static 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);
2852 2889
2853#if EV_USE_INOTIFY 2890#if EV_USE_INOTIFY
2854# 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)
2855 2894
2856static void noinline 2895static void noinline
2857infy_add (EV_P_ ev_stat *w) 2896infy_add (EV_P_ ev_stat *w)
2858{ 2897{
2859 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);
2860 2899
2861 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 */
2862 { 2920 }
2921 else
2922 {
2923 /* can't use inotify, continue to stat */
2863 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2924 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2864 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2865 2925
2866 /* monitor some parent directory for speedup hints */ 2926 /* if path is not there, monitor some parent directory for speedup hints */
2867 /* 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, */
2868 /* but an efficiency issue only */ 2928 /* but an efficiency issue only */
2869 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2929 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2870 { 2930 {
2871 char path [4096]; 2931 char path [4096];
2887 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2947 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2888 } 2948 }
2889 } 2949 }
2890 2950
2891 if (w->wd >= 0) 2951 if (w->wd >= 0)
2892 {
2893 struct statfs sfs;
2894
2895 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);
2896 2953
2897 /* now local changes will be tracked by inotify, but remote changes won't */ 2954 /* now re-arm timer, if required */
2898 /* unless the filesystem is known to be local, we therefore still poll */ 2955 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2899 /* also do poll on <2.6.25, but with normal frequency */
2900
2901 if (fs_2625 && !statfs (w->path, &sfs))
2902 if (sfs.f_type == 0x1373 /* devfs */
2903 || sfs.f_type == 0xEF53 /* ext2/3 */
2904 || sfs.f_type == 0x3153464a /* jfs */
2905 || sfs.f_type == 0x52654973 /* reiser3 */
2906 || sfs.f_type == 0x01021994 /* tempfs */
2907 || sfs.f_type == 0x58465342 /* xfs */)
2908 return;
2909
2910 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2911 ev_timer_again (EV_A_ &w->timer); 2956 ev_timer_again (EV_A_ &w->timer);
2912 } 2957 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2913} 2958}
2914 2959
2915static void noinline 2960static void noinline
2916infy_del (EV_P_ ev_stat *w) 2961infy_del (EV_P_ ev_stat *w)
2917{ 2962{
2962 3007
2963static void 3008static void
2964infy_cb (EV_P_ ev_io *w, int revents) 3009infy_cb (EV_P_ ev_io *w, int revents)
2965{ 3010{
2966 char buf [EV_INOTIFY_BUFSIZE]; 3011 char buf [EV_INOTIFY_BUFSIZE];
2967 struct inotify_event *ev = (struct inotify_event *)buf;
2968 int ofs; 3012 int ofs;
2969 int len = read (fs_fd, buf, sizeof (buf)); 3013 int len = read (fs_fd, buf, sizeof (buf));
2970 3014
2971 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);
2972 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;
2973} 3053}
2974 3054
2975inline_size void 3055inline_size void
2976check_2625 (EV_P) 3056ev_check_2625 (EV_P)
2977{ 3057{
2978 /* kernels < 2.6.25 are borked 3058 /* kernels < 2.6.25 are borked
2979 * 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
2980 */ 3060 */
2981 struct utsname buf; 3061 if (ev_linux_version () < 0x020619)
2982 int major, minor, micro;
2983
2984 if (uname (&buf))
2985 return;
2986
2987 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2988 return;
2989
2990 if (major < 2
2991 || (major == 2 && minor < 6)
2992 || (major == 2 && minor == 6 && micro < 25))
2993 return; 3062 return;
2994 3063
2995 fs_2625 = 1; 3064 fs_2625 = 1;
2996} 3065}
2997 3066
3012 if (fs_fd != -2) 3081 if (fs_fd != -2)
3013 return; 3082 return;
3014 3083
3015 fs_fd = -1; 3084 fs_fd = -1;
3016 3085
3017 check_2625 (EV_A); 3086 ev_check_2625 (EV_A);
3018 3087
3019 fs_fd = infy_newfd (); 3088 fs_fd = infy_newfd ();
3020 3089
3021 if (fs_fd >= 0) 3090 if (fs_fd >= 0)
3022 { 3091 {
3062 w->wd = -1; 3131 w->wd = -1;
3063 3132
3064 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
3065 infy_add (EV_A_ w); /* re-add, no matter what */ 3134 infy_add (EV_A_ w); /* re-add, no matter what */
3066 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);
3067 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 }
3068 } 3142 }
3069 } 3143 }
3070} 3144}
3071 3145
3072#endif 3146#endif
3089static void noinline 3163static void noinline
3090stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3164stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3091{ 3165{
3092 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3166 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3093 3167
3094 /* we copy this here each the time so that */ 3168 ev_statdata prev = w->attr;
3095 /* prev has the old value when the callback gets invoked */
3096 w->prev = w->attr;
3097 ev_stat_stat (EV_A_ w); 3169 ev_stat_stat (EV_A_ w);
3098 3170
3099 /* 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 */
3100 if ( 3172 if (
3101 w->prev.st_dev != w->attr.st_dev 3173 prev.st_dev != w->attr.st_dev
3102 || w->prev.st_ino != w->attr.st_ino 3174 || prev.st_ino != w->attr.st_ino
3103 || w->prev.st_mode != w->attr.st_mode 3175 || prev.st_mode != w->attr.st_mode
3104 || w->prev.st_nlink != w->attr.st_nlink 3176 || prev.st_nlink != w->attr.st_nlink
3105 || w->prev.st_uid != w->attr.st_uid 3177 || prev.st_uid != w->attr.st_uid
3106 || w->prev.st_gid != w->attr.st_gid 3178 || prev.st_gid != w->attr.st_gid
3107 || w->prev.st_rdev != w->attr.st_rdev 3179 || prev.st_rdev != w->attr.st_rdev
3108 || w->prev.st_size != w->attr.st_size 3180 || prev.st_size != w->attr.st_size
3109 || w->prev.st_atime != w->attr.st_atime 3181 || prev.st_atime != w->attr.st_atime
3110 || w->prev.st_mtime != w->attr.st_mtime 3182 || prev.st_mtime != w->attr.st_mtime
3111 || w->prev.st_ctime != w->attr.st_ctime 3183 || prev.st_ctime != w->attr.st_ctime
3112 ) { 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
3113 #if EV_USE_INOTIFY 3190 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0) 3191 if (fs_fd >= 0)
3115 { 3192 {
3116 infy_del (EV_A_ w); 3193 infy_del (EV_A_ w);
3117 infy_add (EV_A_ w); 3194 infy_add (EV_A_ w);
3142 3219
3143 if (fs_fd >= 0) 3220 if (fs_fd >= 0)
3144 infy_add (EV_A_ w); 3221 infy_add (EV_A_ w);
3145 else 3222 else
3146#endif 3223#endif
3224 {
3147 ev_timer_again (EV_A_ &w->timer); 3225 ev_timer_again (EV_A_ &w->timer);
3226 ev_unref (EV_A);
3227 }
3148 3228
3149 ev_start (EV_A_ (W)w, 1); 3229 ev_start (EV_A_ (W)w, 1);
3150 3230
3151 EV_FREQUENT_CHECK; 3231 EV_FREQUENT_CHECK;
3152} 3232}
3161 EV_FREQUENT_CHECK; 3241 EV_FREQUENT_CHECK;
3162 3242
3163#if EV_USE_INOTIFY 3243#if EV_USE_INOTIFY
3164 infy_del (EV_A_ w); 3244 infy_del (EV_A_ w);
3165#endif 3245#endif
3246
3247 if (ev_is_active (&w->timer))
3248 {
3249 ev_ref (EV_A);
3166 ev_timer_stop (EV_A_ &w->timer); 3250 ev_timer_stop (EV_A_ &w->timer);
3251 }
3167 3252
3168 ev_stop (EV_A_ (W)w); 3253 ev_stop (EV_A_ (W)w);
3169 3254
3170 EV_FREQUENT_CHECK; 3255 EV_FREQUENT_CHECK;
3171} 3256}
3390 EV_FREQUENT_CHECK; 3475 EV_FREQUENT_CHECK;
3391 3476
3392 ev_io_stop (EV_A_ &w->io); 3477 ev_io_stop (EV_A_ &w->io);
3393 ev_prepare_stop (EV_A_ &w->prepare); 3478 ev_prepare_stop (EV_A_ &w->prepare);
3394 ev_fork_stop (EV_A_ &w->fork); 3479 ev_fork_stop (EV_A_ &w->fork);
3480
3481 ev_stop (EV_A_ (W)w);
3395 3482
3396 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3397} 3484}
3398#endif 3485#endif
3399 3486

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines