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.317 by root, Sat Nov 14 00:15:21 2009 UTC

… …
302# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
303# endif 303# endif
304#endif 304#endif
305 305
306#ifndef EV_USE_SIGNALFD 306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 308# define EV_USE_SIGNALFD 1
309# else 309# else
310# define EV_USE_SIGNALFD 0 310# define EV_USE_SIGNALFD 0
311# endif 311# endif
312#endif 312#endif
… …
402} 402}
403# endif 403# endif
404#endif 404#endif
405 405
406#if EV_USE_SIGNALFD 406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h> 407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
408#endif 411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
409 434
410/**/ 435/**/
411 436
412#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
425 */ 450 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 452
428#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 453#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) */ 454#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 455
432#if __GNUC__ >= 4 456#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
435#else 459#else
… …
474static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 498static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
475#endif 499#endif
476 500
477#if EV_USE_MONOTONIC 501#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
503#endif
504
505#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif
508#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
510#endif
511#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd)
479#endif 513#endif
480 514
481#ifdef _WIN32 515#ifdef _WIN32
482# include "ev_win32.c" 516# include "ev_win32.c"
483#endif 517#endif
… …
876 910
877#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
878 if (events) 912 if (events)
879 { 913 {
880 unsigned long arg; 914 unsigned long arg;
881 #ifdef EV_FD_TO_WIN32_HANDLE
882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 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)); 916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
887 } 917 }
888#endif 918#endif
889 919
890 { 920 {
… …
1621 close (evfd); 1651 close (evfd);
1622#endif 1652#endif
1623 1653
1624 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1625 { 1655 {
1626 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1627 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1628 } 1658 }
1629 } 1659 }
1630 1660
1631#if EV_USE_SIGNALFD 1661#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w)) 1662 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd); 1663 close (sigfd);
1638 }
1639#endif 1664#endif
1640 1665
1641#if EV_USE_INOTIFY 1666#if EV_USE_INOTIFY
1642 if (fs_fd >= 0) 1667 if (fs_fd >= 0)
1643 close (fs_fd); 1668 close (fs_fd);
… …
1728 close (evfd); 1753 close (evfd);
1729#endif 1754#endif
1730 1755
1731 if (evpipe [0] >= 0) 1756 if (evpipe [0] >= 0)
1732 { 1757 {
1733 close (evpipe [0]); 1758 EV_WIN32_CLOSE_FD (evpipe [0]);
1734 close (evpipe [1]); 1759 EV_WIN32_CLOSE_FD (evpipe [1]);
1735 } 1760 }
1736 1761
1737 evpipe_init (EV_A); 1762 evpipe_init (EV_A);
1738 /* now iterate over everything, in case we missed something */ 1763 /* now iterate over everything, in case we missed something */
1739 pipecb (EV_A_ &pipe_w, EV_READ); 1764 pipecb (EV_A_ &pipe_w, EV_READ);
… …
2722# if EV_USE_SIGNALFD 2747# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/ 2748 if (sigfd < 0) /*TODO*/
2724# endif 2749# endif
2725 { 2750 {
2726# if _WIN32 2751# if _WIN32
2752 evpipe_init (EV_A);
2753
2727 signal (w->signum, ev_sighandler); 2754 signal (w->signum, ev_sighandler);
2728# else 2755# else
2729 struct sigaction sa; 2756 struct sigaction sa;
2730 2757
2731 evpipe_init (EV_A); 2758 evpipe_init (EV_A);
… …
2861 } 2888 }
2862 } 2889 }
2863 2890
2864 if (w->wd >= 0) 2891 if (w->wd >= 0)
2865 { 2892 {
2893 struct statfs sfs;
2894
2866 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2895 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2867 2896
2868 /* now local changes will be tracked by inotify, but remote changes won't */ 2897 /* now local changes will be tracked by inotify, but remote changes won't */
2869 /* unless the filesystem it known to be local, we therefore still poll */ 2898 /* unless the filesystem is known to be local, we therefore still poll */
2870 /* also do poll on <2.6.25, but with normal frequency */ 2899 /* also do poll on <2.6.25, but with normal frequency */
2871 struct statfs sfs;
2872 2900
2873 if (fs_2625 && !statfs (w->path, &sfs)) 2901 if (fs_2625 && !statfs (w->path, &sfs))
2874 if (sfs.f_type == 0x1373 /* devfs */ 2902 if (sfs.f_type == 0x1373 /* devfs */
2875 || sfs.f_type == 0xEF53 /* ext2/3 */ 2903 || sfs.f_type == 0xEF53 /* ext2/3 */
2876 || sfs.f_type == 0x3153464a /* jfs */ 2904 || sfs.f_type == 0x3153464a /* jfs */
… …
2965 return; 2993 return;
2966 2994
2967 fs_2625 = 1; 2995 fs_2625 = 1;
2968} 2996}
2969 2997
2998inline_size int
2999infy_newfd (void)
3000{
3001#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3002 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3003 if (fd >= 0)
3004 return fd;
3005#endif
3006 return inotify_init ();
3007}
3008
2970inline_size void 3009inline_size void
2971infy_init (EV_P) 3010infy_init (EV_P)
2972{ 3011{
2973 if (fs_fd != -2) 3012 if (fs_fd != -2)
2974 return; 3013 return;
2975 3014
2976 fs_fd = -1; 3015 fs_fd = -1;
2977 3016
2978 check_2625 (EV_A); 3017 check_2625 (EV_A);
2979 3018
2980 fs_fd = inotify_init (); 3019 fs_fd = infy_newfd ();
2981 3020
2982 if (fs_fd >= 0) 3021 if (fs_fd >= 0)
2983 { 3022 {
3023 fd_intern (fs_fd);
2984 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3024 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2985 ev_set_priority (&fs_w, EV_MAXPRI); 3025 ev_set_priority (&fs_w, EV_MAXPRI);
2986 ev_io_start (EV_A_ &fs_w); 3026 ev_io_start (EV_A_ &fs_w);
3027 ev_unref (EV_A);
2987 } 3028 }
2988} 3029}
2989 3030
2990inline_size void 3031inline_size void
2991infy_fork (EV_P) 3032infy_fork (EV_P)
… …
2993 int slot; 3034 int slot;
2994 3035
2995 if (fs_fd < 0) 3036 if (fs_fd < 0)
2996 return; 3037 return;
2997 3038
3039 ev_ref (EV_A);
3040 ev_io_stop (EV_A_ &fs_w);
2998 close (fs_fd); 3041 close (fs_fd);
2999 fs_fd = inotify_init (); 3042 fs_fd = infy_newfd ();
3043
3044 if (fs_fd >= 0)
3045 {
3046 fd_intern (fs_fd);
3047 ev_io_set (&fs_w, fs_fd, EV_READ);
3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
3050 }
3000 3051
3001 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3002 { 3053 {
3003 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
3004 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;

Diff Legend

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