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

Comparing libev/ev.c (file contents):
Revision 1.319 by root, Wed Nov 18 10:25:22 2009 UTC vs.
Revision 1.323 by root, Wed Jan 13 12:44:33 2010 UTC

… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
505 505
506#ifndef EV_FD_TO_WIN32_HANDLE 506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 511#endif
512#ifndef EV_WIN32_CLOSE_FD 512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 513# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 514#endif
515 515
… …
964/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
965inline_size int 965inline_size int
966fd_valid (int fd) 966fd_valid (int fd)
967{ 967{
968#ifdef _WIN32 968#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 970#else
971 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
972#endif 972#endif
973} 973}
974 974
… …
1179inline_speed void 1179inline_speed void
1180fd_intern (int fd) 1180fd_intern (int fd)
1181{ 1181{
1182#ifdef _WIN32 1182#ifdef _WIN32
1183 unsigned long arg = 1; 1183 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1185#else 1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif 1188#endif
1189} 1189}
… …
1294{ 1294{
1295#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1296 EV_P = signals [signum - 1].loop;
1297#endif 1297#endif
1298 1298
1299#if _WIN32 1299#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1301#endif 1301#endif
1302 1302
1303 signals [signum - 1].pending = 1; 1303 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1304 evpipe_write (EV_A_ &sig_pending);
… …
1605#endif 1605#endif
1606#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1608#endif
1609#if EV_USE_SIGNALFD 1609#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1611#endif
1612 1612
1613 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1615 1615
… …
2747 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD 2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/ 2749 if (sigfd < 0) /*TODO*/
2750# endif 2750# endif
2751 { 2751 {
2752# if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A); 2753 evpipe_init (EV_A);
2754 2754
2755 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2756# else 2756# else
2757 struct sigaction sa; 2757 struct sigaction sa;
… …
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif 2791#endif
2792#if EV_USE_SIGNALFD 2792#if EV_USE_SIGNALFD
2793 if (sigfd >= 0) 2793 if (sigfd >= 0)
2794 { 2794 {
2795 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2796 sigdelset (&sigfd_set, w->signum); 2799 sigdelset (&sigfd_set, w->signum);
2800
2797 signalfd (sigfd, &sigfd_set, 0); 2801 signalfd (sigfd, &sigfd_set, 0);
2798 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2799 /*TODO: maybe unblock signal? */
2800 } 2803 }
2801 else 2804 else
2802#endif 2805#endif
2803 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2804 } 2807 }
… …
3101static void noinline 3104static void noinline
3102stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3103{ 3106{
3104 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3105 3108
3106 /* we copy this here each the time so that */ 3109 ev_statdata prev = w->attr;
3107 /* prev has the old value when the callback gets invoked */
3108 w->prev = w->attr;
3109 ev_stat_stat (EV_A_ w); 3110 ev_stat_stat (EV_A_ w);
3110 3111
3111 /* 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 */
3112 if ( 3113 if (
3113 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
3114 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
3115 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
3116 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
3117 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
3118 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
3119 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
3120 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
3121 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
3122 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
3123 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
3124 ) { 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
3125 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
3126 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
3127 { 3133 {
3128 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
3129 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);

Diff Legend

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