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.325 by root, Sun Jan 24 12:31:55 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
… …
343# endif 344# endif
344#endif 345#endif
345 346
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 348
349#ifdef _AIX
350/* AIX has a completely broken poll.h header */
351# undef EV_USE_POLL
352# define EV_USE_POLL 0
353#endif
354
348#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
351#endif 358#endif
352 359
… …
504 511
505#ifndef EV_FD_TO_WIN32_HANDLE 512#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 514#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 515#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 517#endif
511#ifndef EV_WIN32_CLOSE_FD 518#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 519# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 520#endif
514 521
… …
963/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
964inline_size int 971inline_size int
965fd_valid (int fd) 972fd_valid (int fd)
966{ 973{
967#ifdef _WIN32 974#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 976#else
970 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
971#endif 978#endif
972} 979}
973 980
… …
1178inline_speed void 1185inline_speed void
1179fd_intern (int fd) 1186fd_intern (int fd)
1180{ 1187{
1181#ifdef _WIN32 1188#ifdef _WIN32
1182 unsigned long arg = 1; 1189 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1184#else 1191#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif 1194#endif
1188} 1195}
… …
1293{ 1300{
1294#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop; 1302 EV_P = signals [signum - 1].loop;
1296#endif 1303#endif
1297 1304
1298#if _WIN32 1305#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1300#endif 1307#endif
1301 1308
1302 signals [signum - 1].pending = 1; 1309 signals [signum - 1].pending = 1;
1303 evpipe_write (EV_A_ &sig_pending); 1310 evpipe_write (EV_A_ &sig_pending);
… …
1604#endif 1611#endif
1605#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1614#endif
1608#if EV_USE_SIGNALFD 1615#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1617#endif
1611 1618
1612 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1613 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1614 1621
… …
2156 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
2157 } 2164 }
2158} 2165}
2159 2166
2160/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
2161/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
2162inline_speed void 2169inline_speed void
2163time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
2164{ 2171{
2165#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
2166 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
… …
2746 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD 2754# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/ 2755 if (sigfd < 0) /*TODO*/
2749# endif 2756# endif
2750 { 2757 {
2751# if _WIN32 2758# ifdef _WIN32
2752 evpipe_init (EV_A); 2759 evpipe_init (EV_A);
2753 2760
2754 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2755# else 2762# else
2756 struct sigaction sa; 2763 struct sigaction sa;
… …
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2796 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif 2797#endif
2791#if EV_USE_SIGNALFD 2798#if EV_USE_SIGNALFD
2792 if (sigfd >= 0) 2799 if (sigfd >= 0)
2793 { 2800 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2795 sigdelset (&sigfd_set, w->signum); 2805 sigdelset (&sigfd_set, w->signum);
2806
2796 signalfd (sigfd, &sigfd_set, 0); 2807 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2798 /*TODO: maybe unblock signal? */
2799 } 2809 }
2800 else 2810 else
2801#endif 2811#endif
2802 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2803 } 2813 }
… …
2856static void noinline 2866static void noinline
2857infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2858{ 2868{
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); 2869 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 2870
2861 if (w->wd < 0) 2871 if (w->wd >= 0)
2872 {
2873 struct statfs sfs;
2874
2875 /* now local changes will be tracked by inotify, but remote changes won't */
2876 /* unless the filesystem is known to be local, we therefore still poll */
2877 /* also do poll on <2.6.25, but with normal frequency */
2878
2879 if (!fs_2625)
2880 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2881 else if (!statfs (w->path, &sfs)
2882 && (sfs.f_type == 0x1373 /* devfs */
2883 || sfs.f_type == 0xEF53 /* ext2/3 */
2884 || sfs.f_type == 0x3153464a /* jfs */
2885 || sfs.f_type == 0x52654973 /* reiser3 */
2886 || sfs.f_type == 0x01021994 /* tempfs */
2887 || sfs.f_type == 0x58465342 /* xfs */))
2888 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2889 else
2890 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2862 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2863 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 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 2896
2866 /* monitor some parent directory for speedup hints */ 2897 /* 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, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2868 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2869 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2870 { 2901 {
2871 char path [4096]; 2902 char path [4096];
… …
2887 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2888 } 2919 }
2889 } 2920 }
2890 2921
2891 if (w->wd >= 0) 2922 if (w->wd >= 0)
2892 {
2893 struct statfs sfs;
2894
2895 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2923 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2896 2924
2897 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2898 /* unless the filesystem is known to be local, we therefore still poll */ 2926 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); 2927 ev_timer_again (EV_A_ &w->timer);
2912 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2913} 2929}
2914 2930
2915static void noinline 2931static void noinline
2916infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2917{ 2933{
… …
3062 w->wd = -1; 3078 w->wd = -1;
3063 3079
3064 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
3065 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
3066 else 3082 else
3083 {
3084 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3085 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3067 ev_timer_again (EV_A_ &w->timer); 3086 ev_timer_again (EV_A_ &w->timer);
3087 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3088 }
3068 } 3089 }
3069 } 3090 }
3070} 3091}
3071 3092
3072#endif 3093#endif
… …
3089static void noinline 3110static void noinline
3090stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3091{ 3112{
3092 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3093 3114
3094 /* we copy this here each the time so that */ 3115 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); 3116 ev_stat_stat (EV_A_ w);
3098 3117
3099 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3118 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3100 if ( 3119 if (
3101 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
3102 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
3103 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
3104 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
3105 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
3106 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
3107 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
3108 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
3109 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
3110 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
3111 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
3112 ) { 3131 ) {
3132 /* we only update w->prev on actual differences */
3133 /* in case we test more often than invoke the callback, */
3134 /* to ensure that prev is always different to attr */
3135 w->prev = prev;
3136
3113 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
3115 { 3139 {
3116 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
3117 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
… …
3142 3166
3143 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
3144 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
3145 else 3169 else
3146#endif 3170#endif
3171 {
3147 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
3148 3175
3149 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
3150 3177
3151 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
3152} 3179}
… …
3161 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
3162 3189
3163#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
3164 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
3165#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
3166 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
3167 3199
3168 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
3169 3201
3170 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
3171} 3203}

Diff Legend

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