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.319 by root, Wed Nov 18 10:25:22 2009 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
… …
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 (fd, 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 {
… …
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);
… …
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# if _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);
… …
2829static void noinline 2857static void noinline
2830infy_add (EV_P_ ev_stat *w) 2858infy_add (EV_P_ ev_stat *w)
2831{ 2859{
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); 2860 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 2861
2834 if (w->wd < 0) 2862 if (w->wd >= 0)
2863 {
2864 struct statfs sfs;
2865
2866 /* now local changes will be tracked by inotify, but remote changes won't */
2867 /* unless the filesystem is known to be local, we therefore still poll */
2868 /* also do poll on <2.6.25, but with normal frequency */
2869
2870 if (!fs_2625)
2871 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2872 else if (!statfs (w->path, &sfs)
2873 && (sfs.f_type == 0x1373 /* devfs */
2874 || sfs.f_type == 0xEF53 /* ext2/3 */
2875 || sfs.f_type == 0x3153464a /* jfs */
2876 || sfs.f_type == 0x52654973 /* reiser3 */
2877 || sfs.f_type == 0x01021994 /* tempfs */
2878 || sfs.f_type == 0x58465342 /* xfs */))
2879 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2880 else
2881 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2835 { 2882 }
2883 else
2884 {
2885 /* can't use inotify, continue to stat */
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2886 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 2887
2839 /* monitor some parent directory for speedup hints */ 2888 /* 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, */ 2889 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2841 /* but an efficiency issue only */ 2890 /* but an efficiency issue only */
2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2891 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2843 { 2892 {
2844 char path [4096]; 2893 char path [4096];
… …
2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2909 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2861 } 2910 }
2862 } 2911 }
2863 2912
2864 if (w->wd >= 0) 2913 if (w->wd >= 0)
2865 {
2866 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2914 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2867 2915
2868 /* now local changes will be tracked by inotify, but remote changes won't */ 2916 /* now re-arm timer, if required */
2869 /* unless the filesystem it known to be local, we therefore still poll */ 2917 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); 2918 ev_timer_again (EV_A_ &w->timer);
2884 } 2919 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2885} 2920}
2886 2921
2887static void noinline 2922static void noinline
2888infy_del (EV_P_ ev_stat *w) 2923infy_del (EV_P_ ev_stat *w)
2889{ 2924{
… …
2965 return; 3000 return;
2966 3001
2967 fs_2625 = 1; 3002 fs_2625 = 1;
2968} 3003}
2969 3004
3005inline_size int
3006infy_newfd (void)
3007{
3008#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3009 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3010 if (fd >= 0)
3011 return fd;
3012#endif
3013 return inotify_init ();
3014}
3015
2970inline_size void 3016inline_size void
2971infy_init (EV_P) 3017infy_init (EV_P)
2972{ 3018{
2973 if (fs_fd != -2) 3019 if (fs_fd != -2)
2974 return; 3020 return;
2975 3021
2976 fs_fd = -1; 3022 fs_fd = -1;
2977 3023
2978 check_2625 (EV_A); 3024 check_2625 (EV_A);
2979 3025
2980 fs_fd = inotify_init (); 3026 fs_fd = infy_newfd ();
2981 3027
2982 if (fs_fd >= 0) 3028 if (fs_fd >= 0)
2983 { 3029 {
3030 fd_intern (fs_fd);
2984 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3031 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2985 ev_set_priority (&fs_w, EV_MAXPRI); 3032 ev_set_priority (&fs_w, EV_MAXPRI);
2986 ev_io_start (EV_A_ &fs_w); 3033 ev_io_start (EV_A_ &fs_w);
3034 ev_unref (EV_A);
2987 } 3035 }
2988} 3036}
2989 3037
2990inline_size void 3038inline_size void
2991infy_fork (EV_P) 3039infy_fork (EV_P)
… …
2993 int slot; 3041 int slot;
2994 3042
2995 if (fs_fd < 0) 3043 if (fs_fd < 0)
2996 return; 3044 return;
2997 3045
3046 ev_ref (EV_A);
3047 ev_io_stop (EV_A_ &fs_w);
2998 close (fs_fd); 3048 close (fs_fd);
2999 fs_fd = inotify_init (); 3049 fs_fd = infy_newfd ();
3050
3051 if (fs_fd >= 0)
3052 {
3053 fd_intern (fs_fd);
3054 ev_io_set (&fs_w, fs_fd, EV_READ);
3055 ev_io_start (EV_A_ &fs_w);
3056 ev_unref (EV_A);
3057 }
3000 3058
3001 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3059 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3002 { 3060 {
3003 WL w_ = fs_hash [slot].head; 3061 WL w_ = fs_hash [slot].head;
3004 fs_hash [slot].head = 0; 3062 fs_hash [slot].head = 0;
… …
3011 w->wd = -1; 3069 w->wd = -1;
3012 3070
3013 if (fs_fd >= 0) 3071 if (fs_fd >= 0)
3014 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
3015 else 3073 else
3074 {
3075 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3076 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3016 ev_timer_again (EV_A_ &w->timer); 3077 ev_timer_again (EV_A_ &w->timer);
3078 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3079 }
3017 } 3080 }
3018 } 3081 }
3019} 3082}
3020 3083
3021#endif 3084#endif
… …
3091 3154
3092 if (fs_fd >= 0) 3155 if (fs_fd >= 0)
3093 infy_add (EV_A_ w); 3156 infy_add (EV_A_ w);
3094 else 3157 else
3095#endif 3158#endif
3159 {
3096 ev_timer_again (EV_A_ &w->timer); 3160 ev_timer_again (EV_A_ &w->timer);
3161 ev_unref (EV_A);
3162 }
3097 3163
3098 ev_start (EV_A_ (W)w, 1); 3164 ev_start (EV_A_ (W)w, 1);
3099 3165
3100 EV_FREQUENT_CHECK; 3166 EV_FREQUENT_CHECK;
3101} 3167}
… …
3110 EV_FREQUENT_CHECK; 3176 EV_FREQUENT_CHECK;
3111 3177
3112#if EV_USE_INOTIFY 3178#if EV_USE_INOTIFY
3113 infy_del (EV_A_ w); 3179 infy_del (EV_A_ w);
3114#endif 3180#endif
3181
3182 if (ev_is_active (&w->timer))
3183 {
3184 ev_ref (EV_A);
3115 ev_timer_stop (EV_A_ &w->timer); 3185 ev_timer_stop (EV_A_ &w->timer);
3186 }
3116 3187
3117 ev_stop (EV_A_ (W)w); 3188 ev_stop (EV_A_ (W)w);
3118 3189
3119 EV_FREQUENT_CHECK; 3190 EV_FREQUENT_CHECK;
3120} 3191}

Diff Legend

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