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

Comparing libev/ev.c (file contents):
Revision 1.312 by root, Wed Aug 12 18:48:17 2009 UTC vs.
Revision 1.316 by root, Fri Sep 18 21:02:12 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))
… …
1728 close (evfd); 1758 close (evfd);
1729#endif 1759#endif
1730 1760
1731 if (evpipe [0] >= 0) 1761 if (evpipe [0] >= 0)
1732 { 1762 {
1733 close (evpipe [0]); 1763 EV_WIN32_CLOSE_FD (evpipe [0]);
1734 close (evpipe [1]); 1764 EV_WIN32_CLOSE_FD (evpipe [1]);
1735 } 1765 }
1736 1766
1737 evpipe_init (EV_A); 1767 evpipe_init (EV_A);
1738 /* now iterate over everything, in case we missed something */ 1768 /* now iterate over everything, in case we missed something */
1739 pipecb (EV_A_ &pipe_w, EV_READ); 1769 pipecb (EV_A_ &pipe_w, EV_READ);
… …
2966 return; 2996 return;
2967 2997
2968 fs_2625 = 1; 2998 fs_2625 = 1;
2969} 2999}
2970 3000
3001inline_size int
3002infy_newfd (void)
3003{
3004#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3005 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3006 if (fd >= 0)
3007 return fd;
3008#endif
3009 return inotify_init ();
3010}
3011
2971inline_size void 3012inline_size void
2972infy_init (EV_P) 3013infy_init (EV_P)
2973{ 3014{
2974 if (fs_fd != -2) 3015 if (fs_fd != -2)
2975 return; 3016 return;
2976 3017
2977 fs_fd = -1; 3018 fs_fd = -1;
2978 3019
2979 check_2625 (EV_A); 3020 check_2625 (EV_A);
2980 3021
2981 fs_fd = inotify_init (); 3022 fs_fd = infy_newfd ();
2982 3023
2983 if (fs_fd >= 0) 3024 if (fs_fd >= 0)
2984 { 3025 {
3026 fd_intern (fs_fd);
2985 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2986 ev_set_priority (&fs_w, EV_MAXPRI); 3028 ev_set_priority (&fs_w, EV_MAXPRI);
2987 ev_io_start (EV_A_ &fs_w); 3029 ev_io_start (EV_A_ &fs_w);
2988 } 3030 }
2989} 3031}
… …
2994 int slot; 3036 int slot;
2995 3037
2996 if (fs_fd < 0) 3038 if (fs_fd < 0)
2997 return; 3039 return;
2998 3040
3041 ev_io_stop (EV_A_ &fs_w);
2999 close (fs_fd); 3042 close (fs_fd);
3000 fs_fd = inotify_init (); 3043 fs_fd = infy_newfd ();
3044
3045 if (fs_fd >= 0)
3046 {
3047 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w);
3050 }
3001 3051
3002 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3003 { 3053 {
3004 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
3005 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;

Diff Legend

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