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.323 by root, Wed Jan 13 12:44:33 2010 UTC

… …
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
… …
302# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
303# endif 304# endif
304#endif 305#endif
305 306
306#ifndef EV_USE_SIGNALFD 307#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 309# define EV_USE_SIGNALFD 1
309# else 310# else
310# define EV_USE_SIGNALFD 0 311# define EV_USE_SIGNALFD 0
311# endif 312# endif
312#endif 313#endif
… …
402} 403}
403# endif 404# endif
404#endif 405#endif
405 406
406#if EV_USE_SIGNALFD 407#if EV_USE_SIGNALFD
407# include <sys/signalfd.h> 408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
408#endif 412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
409 435
410/**/ 436/**/
411 437
412#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
425 */ 451 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 453
428#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#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) */ 455#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 456
432#if __GNUC__ >= 4 457#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
435#else 460#else
… …
474static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
475#endif 500#endif
476 501
477#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504#endif
505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
479#endif 514#endif
480 515
481#ifdef _WIN32 516#ifdef _WIN32
482# include "ev_win32.c" 517# include "ev_win32.c"
483#endif 518#endif
… …
876 911
877#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
878 if (events) 913 if (events)
879 { 914 {
880 unsigned long arg; 915 unsigned long arg;
881 #ifdef EV_FD_TO_WIN32_HANDLE
882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
887 } 918 }
888#endif 919#endif
889 920
890 { 921 {
… …
933/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
934inline_size int 965inline_size int
935fd_valid (int fd) 966fd_valid (int fd)
936{ 967{
937#ifdef _WIN32 968#ifdef _WIN32
938 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
939#else 970#else
940 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
941#endif 972#endif
942} 973}
943 974
… …
1148inline_speed void 1179inline_speed void
1149fd_intern (int fd) 1180fd_intern (int fd)
1150{ 1181{
1151#ifdef _WIN32 1182#ifdef _WIN32
1152 unsigned long arg = 1; 1183 unsigned long arg = 1;
1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1154#else 1185#else
1155 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1156 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1157#endif 1188#endif
1158} 1189}
… …
1263{ 1294{
1264#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1265 EV_P = signals [signum - 1].loop; 1296 EV_P = signals [signum - 1].loop;
1266#endif 1297#endif
1267 1298
1268#if _WIN32 1299#ifdef _WIN32
1269 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1270#endif 1301#endif
1271 1302
1272 signals [signum - 1].pending = 1; 1303 signals [signum - 1].pending = 1;
1273 evpipe_write (EV_A_ &sig_pending); 1304 evpipe_write (EV_A_ &sig_pending);
… …
1574#endif 1605#endif
1575#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1577#endif 1608#endif
1578#if EV_USE_SIGNALFD 1609#if EV_USE_SIGNALFD
1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1580#endif 1611#endif
1581 1612
1582 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1583 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1584 1615
… …
1621 close (evfd); 1652 close (evfd);
1622#endif 1653#endif
1623 1654
1624 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1625 { 1656 {
1626 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1627 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1628 } 1659 }
1629 } 1660 }
1630 1661
1631#if EV_USE_SIGNALFD 1662#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w)) 1663 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd); 1664 close (sigfd);
1638 }
1639#endif 1665#endif
1640 1666
1641#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1642 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1643 close (fs_fd); 1669 close (fs_fd);
… …
1728 close (evfd); 1754 close (evfd);
1729#endif 1755#endif
1730 1756
1731 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1732 { 1758 {
1733 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1734 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1735 } 1761 }
1736 1762
1737 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1738 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1739 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
… …
2721 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD 2748# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/ 2749 if (sigfd < 0) /*TODO*/
2724# endif 2750# endif
2725 { 2751 {
2726# if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2727 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2728# else 2756# else
2729 struct sigaction sa; 2757 struct sigaction sa;
2730 2758
2731 evpipe_init (EV_A); 2759 evpipe_init (EV_A);
… …
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif 2791#endif
2764#if EV_USE_SIGNALFD 2792#if EV_USE_SIGNALFD
2765 if (sigfd >= 0) 2793 if (sigfd >= 0)
2766 { 2794 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2768 sigdelset (&sigfd_set, w->signum); 2799 sigdelset (&sigfd_set, w->signum);
2800
2769 signalfd (sigfd, &sigfd_set, 0); 2801 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2771 /*TODO: maybe unblock signal? */
2772 } 2803 }
2773 else 2804 else
2774#endif 2805#endif
2775 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2776 } 2807 }
… …
2829static void noinline 2860static void noinline
2830infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2831{ 2862{
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); 2863 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 2864
2834 if (w->wd < 0) 2865 if (w->wd >= 0)
2866 {
2867 struct statfs sfs;
2868
2869 /* now local changes will be tracked by inotify, but remote changes won't */
2870 /* unless the filesystem is known to be local, we therefore still poll */
2871 /* also do poll on <2.6.25, but with normal frequency */
2872
2873 if (!fs_2625)
2874 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2875 else if (!statfs (w->path, &sfs)
2876 && (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */))
2882 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2883 else
2884 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2835 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 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 2890
2839 /* monitor some parent directory for speedup hints */ 2891 /* 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, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2841 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2843 { 2895 {
2844 char path [4096]; 2896 char path [4096];
… …
2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2861 } 2913 }
2862 } 2914 }
2863 2915
2864 if (w->wd >= 0) 2916 if (w->wd >= 0)
2865 {
2866 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2867 2918
2868 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2869 /* unless the filesystem it known to be local, we therefore still poll */ 2920 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); 2921 ev_timer_again (EV_A_ &w->timer);
2884 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2885} 2923}
2886 2924
2887static void noinline 2925static void noinline
2888infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2889{ 2927{
… …
2965 return; 3003 return;
2966 3004
2967 fs_2625 = 1; 3005 fs_2625 = 1;
2968} 3006}
2969 3007
3008inline_size int
3009infy_newfd (void)
3010{
3011#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3012 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3013 if (fd >= 0)
3014 return fd;
3015#endif
3016 return inotify_init ();
3017}
3018
2970inline_size void 3019inline_size void
2971infy_init (EV_P) 3020infy_init (EV_P)
2972{ 3021{
2973 if (fs_fd != -2) 3022 if (fs_fd != -2)
2974 return; 3023 return;
2975 3024
2976 fs_fd = -1; 3025 fs_fd = -1;
2977 3026
2978 check_2625 (EV_A); 3027 check_2625 (EV_A);
2979 3028
2980 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2981 3030
2982 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2983 { 3032 {
3033 fd_intern (fs_fd);
2984 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2985 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2986 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2987 } 3038 }
2988} 3039}
2989 3040
2990inline_size void 3041inline_size void
2991infy_fork (EV_P) 3042infy_fork (EV_P)
… …
2993 int slot; 3044 int slot;
2994 3045
2995 if (fs_fd < 0) 3046 if (fs_fd < 0)
2996 return; 3047 return;
2997 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2998 close (fs_fd); 3051 close (fs_fd);
2999 fs_fd = inotify_init (); 3052 fs_fd = infy_newfd ();
3053
3054 if (fs_fd >= 0)
3055 {
3056 fd_intern (fs_fd);
3057 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A);
3060 }
3000 3061
3001 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3002 { 3063 {
3003 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
3004 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
… …
3011 w->wd = -1; 3072 w->wd = -1;
3012 3073
3013 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
3014 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
3015 else 3076 else
3077 {
3078 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3079 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3016 ev_timer_again (EV_A_ &w->timer); 3080 ev_timer_again (EV_A_ &w->timer);
3081 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3082 }
3017 } 3083 }
3018 } 3084 }
3019} 3085}
3020 3086
3021#endif 3087#endif
… …
3038static void noinline 3104static void noinline
3039stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3040{ 3106{
3041 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3042 3108
3043 /* we copy this here each the time so that */ 3109 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); 3110 ev_stat_stat (EV_A_ w);
3047 3111
3048 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3112 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3049 if ( 3113 if (
3050 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
3051 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
3052 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
3053 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
3054 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
3055 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
3056 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
3057 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
3058 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
3059 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
3060 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
3061 ) { 3125 ) {
3126 /* we only update w->prev on actual differences */
3127 /* in case we test more often than invoke the callback, */
3128 /* to ensure that prev is always different to attr */
3129 w->prev = prev;
3130
3062 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
3063 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
3064 { 3133 {
3065 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
3066 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
… …
3091 3160
3092 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
3093 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
3094 else 3163 else
3095#endif 3164#endif
3165 {
3096 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
3097 3169
3098 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
3099 3171
3100 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
3101} 3173}
… …
3110 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
3111 3183
3112#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
3113 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
3114#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
3115 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
3116 3193
3117 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
3118 3195
3119 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
3120} 3197}

Diff Legend

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