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.322 by root, Thu Jan 7 06:49:31 2010 UTC

… …
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
… …
504 505
505#ifndef EV_FD_TO_WIN32_HANDLE 506#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif 508#endif
508#ifndef EV_WIN32_HANDLE_TO_FD 509#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
510#endif 511#endif
511#ifndef EV_WIN32_CLOSE_FD 512#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd) 513# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif 514#endif
514 515
… …
963/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
964inline_size int 965inline_size int
965fd_valid (int fd) 966fd_valid (int fd)
966{ 967{
967#ifdef _WIN32 968#ifdef _WIN32
968 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
969#else 970#else
970 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
971#endif 972#endif
972} 973}
973 974
… …
1178inline_speed void 1179inline_speed void
1179fd_intern (int fd) 1180fd_intern (int fd)
1180{ 1181{
1181#ifdef _WIN32 1182#ifdef _WIN32
1182 unsigned long arg = 1; 1183 unsigned long arg = 1;
1183 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1184#else 1185#else
1185 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1186 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1187#endif 1188#endif
1188} 1189}
… …
1293{ 1294{
1294#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1295 EV_P = signals [signum - 1].loop; 1296 EV_P = signals [signum - 1].loop;
1296#endif 1297#endif
1297 1298
1298#if _WIN32 1299#ifdef _WIN32
1299 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1300#endif 1301#endif
1301 1302
1302 signals [signum - 1].pending = 1; 1303 signals [signum - 1].pending = 1;
1303 evpipe_write (EV_A_ &sig_pending); 1304 evpipe_write (EV_A_ &sig_pending);
… …
1604#endif 1605#endif
1605#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1607#endif 1608#endif
1608#if EV_USE_SIGNALFD 1609#if EV_USE_SIGNALFD
1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1610#endif 1611#endif
1611 1612
1612 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1613 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1614 1615
… …
2746 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD 2748# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/ 2749 if (sigfd < 0) /*TODO*/
2749# endif 2750# endif
2750 { 2751 {
2751# if _WIN32 2752# ifdef _WIN32
2752 evpipe_init (EV_A); 2753 evpipe_init (EV_A);
2753 2754
2754 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2755# else 2756# else
2756 struct sigaction sa; 2757 struct sigaction sa;
… …
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif 2791#endif
2791#if EV_USE_SIGNALFD 2792#if EV_USE_SIGNALFD
2792 if (sigfd >= 0) 2793 if (sigfd >= 0)
2793 { 2794 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2795 sigdelset (&sigfd_set, w->signum); 2799 sigdelset (&sigfd_set, w->signum);
2800
2796 signalfd (sigfd, &sigfd_set, 0); 2801 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2798 /*TODO: maybe unblock signal? */
2799 } 2803 }
2800 else 2804 else
2801#endif 2805#endif
2802 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2803 } 2807 }
… …
2856static void noinline 2860static void noinline
2857infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2858{ 2862{
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); 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);
2860 2864
2861 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 */
2862 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2863 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 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 2890
2866 /* monitor some parent directory for speedup hints */ 2891 /* 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, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2868 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2869 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2870 { 2895 {
2871 char path [4096]; 2896 char path [4096];
… …
2887 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2888 } 2913 }
2889 } 2914 }
2890 2915
2891 if (w->wd >= 0) 2916 if (w->wd >= 0)
2892 {
2893 struct statfs sfs;
2894
2895 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);
2896 2918
2897 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2898 /* unless the filesystem is known to be local, we therefore still poll */ 2920 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); 2921 ev_timer_again (EV_A_ &w->timer);
2912 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2913} 2923}
2914 2924
2915static void noinline 2925static void noinline
2916infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2917{ 2927{
… …
3062 w->wd = -1; 3072 w->wd = -1;
3063 3073
3064 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
3065 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
3066 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);
3067 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 }
3068 } 3083 }
3069 } 3084 }
3070} 3085}
3071 3086
3072#endif 3087#endif
… …
3089static void noinline 3104static void noinline
3090stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3091{ 3106{
3092 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3093 3108
3094 /* we copy this here each the time so that */ 3109 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); 3110 ev_stat_stat (EV_A_ w);
3098 3111
3099 /* 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 */
3100 if ( 3113 if (
3101 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
3102 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
3103 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
3104 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
3105 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
3106 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
3107 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
3108 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
3109 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
3110 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
3111 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
3112 ) { 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
3113 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
3114 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
3115 { 3133 {
3116 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
3117 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
… …
3142 3160
3143 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
3144 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
3145 else 3163 else
3146#endif 3164#endif
3165 {
3147 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
3148 3169
3149 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
3150 3171
3151 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
3152} 3173}
… …
3161 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
3162 3183
3163#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
3164 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
3165#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
3166 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
3167 3193
3168 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
3169 3195
3170 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
3171} 3197}

Diff Legend

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