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

Comparing libev/ev.c (file contents):
Revision 1.313 by root, Wed Aug 19 23:44:51 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
… …
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
… …
480 505
481#ifndef EV_FD_TO_WIN32_HANDLE 506#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif 508#endif
484#ifndef EV_WIN32_HANDLE_TO_FD 509#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
486#endif 511#endif
487#ifndef EV_WIN32_CLOSE_FD 512#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd) 513# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif 514#endif
490 515
… …
939/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
940inline_size int 965inline_size int
941fd_valid (int fd) 966fd_valid (int fd)
942{ 967{
943#ifdef _WIN32 968#ifdef _WIN32
944 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
945#else 970#else
946 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
947#endif 972#endif
948} 973}
949 974
… …
1154inline_speed void 1179inline_speed void
1155fd_intern (int fd) 1180fd_intern (int fd)
1156{ 1181{
1157#ifdef _WIN32 1182#ifdef _WIN32
1158 unsigned long arg = 1; 1183 unsigned long arg = 1;
1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1160#else 1185#else
1161 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1162 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1163#endif 1188#endif
1164} 1189}
… …
1269{ 1294{
1270#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1271 EV_P = signals [signum - 1].loop; 1296 EV_P = signals [signum - 1].loop;
1272#endif 1297#endif
1273 1298
1274#if _WIN32 1299#ifdef _WIN32
1275 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1276#endif 1301#endif
1277 1302
1278 signals [signum - 1].pending = 1; 1303 signals [signum - 1].pending = 1;
1279 evpipe_write (EV_A_ &sig_pending); 1304 evpipe_write (EV_A_ &sig_pending);
… …
1580#endif 1605#endif
1581#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1583#endif 1608#endif
1584#if EV_USE_SIGNALFD 1609#if EV_USE_SIGNALFD
1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1586#endif 1611#endif
1587 1612
1588 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1589 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1590 1615
… …
1634 } 1659 }
1635 } 1660 }
1636 1661
1637#if EV_USE_SIGNALFD 1662#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w)) 1663 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd); 1664 close (sigfd);
1644 }
1645#endif 1665#endif
1646 1666
1647#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1648 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1649 close (fs_fd); 1669 close (fs_fd);
… …
2727 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD 2748# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/ 2749 if (sigfd < 0) /*TODO*/
2730# endif 2750# endif
2731 { 2751 {
2732# if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2733 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2734# else 2756# else
2735 struct sigaction sa; 2757 struct sigaction sa;
2736 2758
2737 evpipe_init (EV_A); 2759 evpipe_init (EV_A);
… …
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif 2791#endif
2770#if EV_USE_SIGNALFD 2792#if EV_USE_SIGNALFD
2771 if (sigfd >= 0) 2793 if (sigfd >= 0)
2772 { 2794 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2774 sigdelset (&sigfd_set, w->signum); 2799 sigdelset (&sigfd_set, w->signum);
2800
2775 signalfd (sigfd, &sigfd_set, 0); 2801 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2777 /*TODO: maybe unblock signal? */
2778 } 2803 }
2779 else 2804 else
2780#endif 2805#endif
2781 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2782 } 2807 }
… …
2835static void noinline 2860static void noinline
2836infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2837{ 2862{
2838 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);
2839 2864
2840 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 */
2841 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2843 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2844 2890
2845 /* monitor some parent directory for speedup hints */ 2891 /* if path is not there, monitor some parent directory for speedup hints */
2846 /* 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, */
2847 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2849 { 2895 {
2850 char path [4096]; 2896 char path [4096];
… …
2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2867 } 2913 }
2868 } 2914 }
2869 2915
2870 if (w->wd >= 0) 2916 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2874 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);
2875 2918
2876 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2877 /* unless the filesystem it known to be local, we therefore still poll */ 2920 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2878 /* also do poll on <2.6.25, but with normal frequency */
2879
2880 if (fs_2625 && !statfs (w->path, &sfs))
2881 if (sfs.f_type == 0x1373 /* devfs */
2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2883 || sfs.f_type == 0x3153464a /* jfs */
2884 || sfs.f_type == 0x52654973 /* reiser3 */
2885 || sfs.f_type == 0x01021994 /* tempfs */
2886 || sfs.f_type == 0x58465342 /* xfs */)
2887 return;
2888
2889 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2890 ev_timer_again (EV_A_ &w->timer); 2921 ev_timer_again (EV_A_ &w->timer);
2891 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2892} 2923}
2893 2924
2894static void noinline 2925static void noinline
2895infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2896{ 2927{
… …
2972 return; 3003 return;
2973 3004
2974 fs_2625 = 1; 3005 fs_2625 = 1;
2975} 3006}
2976 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
2977inline_size void 3019inline_size void
2978infy_init (EV_P) 3020infy_init (EV_P)
2979{ 3021{
2980 if (fs_fd != -2) 3022 if (fs_fd != -2)
2981 return; 3023 return;
2982 3024
2983 fs_fd = -1; 3025 fs_fd = -1;
2984 3026
2985 check_2625 (EV_A); 3027 check_2625 (EV_A);
2986 3028
2987 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2988 3030
2989 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2990 { 3032 {
3033 fd_intern (fs_fd);
2991 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2992 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2993 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2994 } 3038 }
2995} 3039}
2996 3040
2997inline_size void 3041inline_size void
2998infy_fork (EV_P) 3042infy_fork (EV_P)
… …
3000 int slot; 3044 int slot;
3001 3045
3002 if (fs_fd < 0) 3046 if (fs_fd < 0)
3003 return; 3047 return;
3004 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
3005 close (fs_fd); 3051 close (fs_fd);
3006 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 }
3007 3061
3008 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3009 { 3063 {
3010 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
3011 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
… …
3018 w->wd = -1; 3072 w->wd = -1;
3019 3073
3020 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
3021 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
3022 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);
3023 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 }
3024 } 3083 }
3025 } 3084 }
3026} 3085}
3027 3086
3028#endif 3087#endif
… …
3045static void noinline 3104static void noinline
3046stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3047{ 3106{
3048 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3049 3108
3050 /* we copy this here each the time so that */ 3109 ev_statdata prev = w->attr;
3051 /* prev has the old value when the callback gets invoked */
3052 w->prev = w->attr;
3053 ev_stat_stat (EV_A_ w); 3110 ev_stat_stat (EV_A_ w);
3054 3111
3055 /* 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 */
3056 if ( 3113 if (
3057 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
3058 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
3059 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
3060 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
3061 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
3062 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
3063 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
3064 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
3065 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
3066 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
3067 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
3068 ) { 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
3069 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
3070 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
3071 { 3133 {
3072 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
3073 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
… …
3098 3160
3099 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
3100 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
3101 else 3163 else
3102#endif 3164#endif
3165 {
3103 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
3104 3169
3105 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
3106 3171
3107 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
3108} 3173}
… …
3117 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
3118 3183
3119#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
3120 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
3121#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
3122 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
3123 3193
3124 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
3125 3195
3126 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
3127} 3197}

Diff Legend

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