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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.329 by root, Tue Feb 16 09:32:39 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
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
… …
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
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
… …
187#endif 189#endif
188 190
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
190 192
191/* try to deduce the maximum number of signals on this platform */ 193/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 194#if defined (EV_NSIG)
194/* use what's provided */ 195/* use what's provided */
195#elif defined (NSIG) 196#elif defined (NSIG)
196# define EV_NSIG (NSIG) 197# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 198#elif defined(_NSIG)
… …
303# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
304# endif 305# endif
305#endif 306#endif
306 307
307#ifndef EV_USE_SIGNALFD 308#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 310# define EV_USE_SIGNALFD 1
310# else 311# else
311# define EV_USE_SIGNALFD 0 312# define EV_USE_SIGNALFD 0
312# endif 313# endif
313#endif 314#endif
… …
344# endif 345# endif
345#endif 346#endif
346 347
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
349#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
352#endif 359#endif
353 360
… …
387# include <stdint.h> 394# include <stdint.h>
388# ifndef EFD_NONBLOCK 395# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 396# define EFD_NONBLOCK O_NONBLOCK
390# endif 397# endif
391# ifndef EFD_CLOEXEC 398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
393# endif 404# endif
394# ifdef __cplusplus 405# ifdef __cplusplus
395extern "C" { 406extern "C" {
396# endif 407# endif
397int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
398# ifdef __cplusplus 409# ifdef __cplusplus
399} 410}
400# endif 411# endif
401#endif 412#endif
402 413
403#if EV_USE_SIGNALFD 414#if EV_USE_SIGNALFD
404# include <sys/signalfd.h> 415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
405#endif 419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
406 442
407/**/ 443/**/
408 444
409#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
422 */ 458 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 460
425#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
428 463
429#if __GNUC__ >= 4 464#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
432#else 467#else
… …
471static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 506static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
472#endif 507#endif
473 508
474#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
511#endif
512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
476#endif 521#endif
477 522
478#ifdef _WIN32 523#ifdef _WIN32
479# include "ev_win32.c" 524# include "ev_win32.c"
480#endif 525#endif
… …
873 918
874#if EV_SELECT_IS_WINSOCKET 919#if EV_SELECT_IS_WINSOCKET
875 if (events) 920 if (events)
876 { 921 {
877 unsigned long arg; 922 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880 #else
881 anfd->handle = _get_osfhandle (fd);
882 #endif
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 924 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884 } 925 }
885#endif 926#endif
886 927
887 { 928 {
… …
930/* check whether the given fd is atcually valid, for error recovery */ 971/* check whether the given fd is atcually valid, for error recovery */
931inline_size int 972inline_size int
932fd_valid (int fd) 973fd_valid (int fd)
933{ 974{
934#ifdef _WIN32 975#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 977#else
937 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
938#endif 979#endif
939} 980}
940 981
… …
958 999
959 for (fd = anfdmax; fd--; ) 1000 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1001 if (anfds [fd].events)
961 { 1002 {
962 fd_kill (EV_A_ fd); 1003 fd_kill (EV_A_ fd);
963 return; 1004 break;
964 } 1005 }
965} 1006}
966 1007
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1008/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1009static void noinline
… …
1058 1099
1059 for (;;) 1100 for (;;)
1060 { 1101 {
1061 int c = k << 1; 1102 int c = k << 1;
1062 1103
1063 if (c > N + HEAP0 - 1) 1104 if (c >= N + HEAP0)
1064 break; 1105 break;
1065 1106
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1107 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1108 ? 1 : 0;
1068 1109
… …
1104 1145
1105/* move an element suitably so it is in a correct place */ 1146/* move an element suitably so it is in a correct place */
1106inline_size void 1147inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1148adjustheap (ANHE *heap, int N, int k)
1108{ 1149{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1150 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1151 upheap (heap, k);
1111 else 1152 else
1112 downheap (heap, N, k); 1153 downheap (heap, N, k);
1113} 1154}
1114 1155
… …
1127/*****************************************************************************/ 1168/*****************************************************************************/
1128 1169
1129/* associate signal watchers to a signal signal */ 1170/* associate signal watchers to a signal signal */
1130typedef struct 1171typedef struct
1131{ 1172{
1173 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1174#if EV_MULTIPLICITY
1133 EV_P; 1175 EV_P;
1134#endif 1176#endif
1135 WL head; 1177 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1178} ANSIG;
1138 1179
1139static ANSIG signals [EV_NSIG - 1]; 1180static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1181
1142/*****************************************************************************/ 1182/*****************************************************************************/
1143 1183
1144/* used to prepare libev internal fd's */ 1184/* used to prepare libev internal fd's */
1145/* this is not fork-safe */ 1185/* this is not fork-safe */
1146inline_speed void 1186inline_speed void
1147fd_intern (int fd) 1187fd_intern (int fd)
1148{ 1188{
1149#ifdef _WIN32 1189#ifdef _WIN32
1150 unsigned long arg = 1; 1190 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1152#else 1192#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif 1195#endif
1156} 1196}
… …
1213/* called whenever the libev signal pipe */ 1253/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1254/* got some events (signal, async) */
1215static void 1255static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1256pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1257{
1258 int i;
1259
1218#if EV_USE_EVENTFD 1260#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1261 if (evfd >= 0)
1220 { 1262 {
1221 uint64_t counter; 1263 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1264 read (evfd, &counter, sizeof (uint64_t));
… …
1226 { 1268 {
1227 char dummy; 1269 char dummy;
1228 read (evpipe [0], &dummy, 1); 1270 read (evpipe [0], &dummy, 1);
1229 } 1271 }
1230 1272
1231 if (gotsig && ev_is_default_loop (EV_A)) 1273 if (sig_pending)
1232 { 1274 {
1233 int signum; 1275 sig_pending = 0;
1234 gotsig = 0;
1235 1276
1236 for (signum = EV_NSIG - 1; signum--; ) 1277 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1278 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1279 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1280 }
1240 1281
1241#if EV_ASYNC_ENABLE 1282#if EV_ASYNC_ENABLE
1242 if (gotasync) 1283 if (async_pending)
1243 { 1284 {
1244 int i; 1285 async_pending = 0;
1245 gotasync = 0;
1246 1286
1247 for (i = asynccnt; i--; ) 1287 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1288 if (asyncs [i]->sent)
1249 { 1289 {
1250 asyncs [i]->sent = 0; 1290 asyncs [i]->sent = 0;
… …
1261{ 1301{
1262#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1303 EV_P = signals [signum - 1].loop;
1264#endif 1304#endif
1265 1305
1266#if _WIN32 1306#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1268#endif 1308#endif
1269 1309
1270 signals [signum - 1].gotsig = 1; 1310 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1311 evpipe_write (EV_A_ &sig_pending);
1272} 1312}
1273 1313
1274void noinline 1314void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1315ev_feed_signal_event (EV_P_ int signum)
1276{ 1316{
1277 WL w; 1317 WL w;
1278 1318
1319 if (expect_false (signum <= 0 || signum > EV_NSIG))
1320 return;
1321
1322 --signum;
1323
1279#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1325 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1326 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1327
1283 if (signum <= 0 || signum > EV_NSIG) 1328 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1329 return;
1330#endif
1285 1331
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1332 signals [signum].pending = 0;
1289 1333
1290 for (w = signals [signum].head; w; w = w->next) 1334 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1335 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1336}
1293 1337
… …
1560 1604
1561 io_blocktime = 0.; 1605 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1606 timeout_blocktime = 0.;
1563 backend = 0; 1607 backend = 0;
1564 backend_fd = -1; 1608 backend_fd = -1;
1565 gotasync = 0; 1609 sig_pending = 0;
1610#if EV_ASYNC_ENABLE
1611 async_pending = 0;
1612#endif
1566#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1615#endif
1569#if EV_USE_SIGNALFD 1616#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1618#endif
1572 1619
1573 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1575 1622
… …
1612 close (evfd); 1659 close (evfd);
1613#endif 1660#endif
1614 1661
1615 if (evpipe [0] >= 0) 1662 if (evpipe [0] >= 0)
1616 { 1663 {
1617 close (evpipe [0]); 1664 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1665 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1666 }
1620 } 1667 }
1621 1668
1622#if EV_USE_SIGNALFD 1669#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1670 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1671 close (sigfd);
1629 }
1630#endif 1672#endif
1631 1673
1632#if EV_USE_INOTIFY 1674#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1675 if (fs_fd >= 0)
1634 close (fs_fd); 1676 close (fs_fd);
… …
1704 1746
1705 if (ev_is_active (&pipe_w)) 1747 if (ev_is_active (&pipe_w))
1706 { 1748 {
1707 /* this "locks" the handlers against writing to the pipe */ 1749 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1750 /* while we modify the fd vars */
1709 gotsig = 1; 1751 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1752#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1753 async_pending = 1;
1712#endif 1754#endif
1713 1755
1714 ev_ref (EV_A); 1756 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1757 ev_io_stop (EV_A_ &pipe_w);
1716 1758
… …
1719 close (evfd); 1761 close (evfd);
1720#endif 1762#endif
1721 1763
1722 if (evpipe [0] >= 0) 1764 if (evpipe [0] >= 0)
1723 { 1765 {
1724 close (evpipe [0]); 1766 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1767 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1768 }
1727 1769
1728 evpipe_init (EV_A); 1770 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1771 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1772 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1856 assert (checkmax >= checkcnt); 1898 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1899 array_verify (EV_A_ (W *)checks, checkcnt);
1858 1900
1859# if 0 1901# if 0
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1902 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1862# endif 1904# endif
1863#endif 1905#endif
1864} 1906}
1865#endif 1907#endif
1866 1908
… …
2122 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
2123 } 2165 }
2124} 2166}
2125 2167
2126/* fetch new monotonic and realtime times from the kernel */ 2168/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2169/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2170inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
2130{ 2172{
2131#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
… …
2393inline_size void 2435inline_size void
2394wlist_del (WL *head, WL elem) 2436wlist_del (WL *head, WL elem)
2395{ 2437{
2396 while (*head) 2438 while (*head)
2397 { 2439 {
2398 if (*head == elem) 2440 if (expect_true (*head == elem))
2399 { 2441 {
2400 *head = elem->next; 2442 *head = elem->next;
2401 return; 2443 break;
2402 } 2444 }
2403 2445
2404 head = &(*head)->next; 2446 head = &(*head)->next;
2405 } 2447 }
2406} 2448}
… …
2466 2508
2467 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2468 return; 2510 return;
2469 2511
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2513 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2514
2473 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2474 2516
2475 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2546 timers [active] = timers [timercnt + HEAP0]; 2588 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2589 adjustheap (timers, timercnt, active);
2548 } 2590 }
2549 } 2591 }
2550 2592
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2593 ev_at (w) -= mn_now;
2554 2594
2555 ev_stop (EV_A_ (W)w); 2595 ev_stop (EV_A_ (W)w);
2596
2597 EV_FREQUENT_CHECK;
2556} 2598}
2557 2599
2558void noinline 2600void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2601ev_timer_again (EV_P_ ev_timer *w)
2560{ 2602{
… …
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2681 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2682 adjustheap (periodics, periodiccnt, active);
2641 } 2683 }
2642 } 2684 }
2643 2685
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2647} 2689}
2648 2690
2649void noinline 2691void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2692ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2693{
… …
2666 return; 2708 return;
2667 2709
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2710 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2711
2670#if EV_MULTIPLICITY 2712#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2713 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2714 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2715
2674 signals [w->signum - 1].loop = EV_A; 2716 signals [w->signum - 1].loop = EV_A;
2675#endif 2717#endif
2676 2718
… …
2712 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2755# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2756 if (sigfd < 0) /*TODO*/
2715# endif 2757# endif
2716 { 2758 {
2717# if _WIN32 2759# ifdef _WIN32
2760 evpipe_init (EV_A);
2761
2718 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2719# else 2763# else
2720 struct sigaction sa; 2764 struct sigaction sa;
2721 2765
2722 evpipe_init (EV_A); 2766 evpipe_init (EV_A);
… …
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2791 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2749 2793
2750 if (!signals [w->signum - 1].head) 2794 if (!signals [w->signum - 1].head)
2751 { 2795 {
2752 #if EV_MULTIPLICITY 2796#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2797 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2798#endif
2755 #if EV_USE_SIGNALFD 2799#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2800 if (sigfd >= 0)
2757 { 2801 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2802 sigset_t ss;
2803
2804 sigemptyset (&ss);
2805 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2806 sigdelset (&sigfd_set, w->signum);
2807
2760 signalfd (sigfd, &sigfd_set, 0); 2808 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2809 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2810 }
2764 else 2811 else
2765 #endif 2812#endif
2766 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2767 } 2814 }
2768 2815
2769 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2770} 2817}
… …
2813#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2814 2861
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2862static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 2863
2817#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 2865
2866/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2867# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 2868
2820static void noinline 2869static void noinline
2821infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2822{ 2871{
2823 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); 2872 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);
2824 2873
2825 if (w->wd < 0) 2874 if (w->wd >= 0)
2875 {
2876 struct statfs sfs;
2877
2878 /* now local changes will be tracked by inotify, but remote changes won't */
2879 /* unless the filesystem is known to be local, we therefore still poll */
2880 /* also do poll on <2.6.25, but with normal frequency */
2881
2882 if (!fs_2625)
2883 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2884 else if (!statfs (w->path, &sfs)
2885 && (sfs.f_type == 0x1373 /* devfs */
2886 || sfs.f_type == 0xEF53 /* ext2/3 */
2887 || sfs.f_type == 0x3153464a /* jfs */
2888 || sfs.f_type == 0x52654973 /* reiser3 */
2889 || sfs.f_type == 0x01021994 /* tempfs */
2890 || sfs.f_type == 0x58465342 /* xfs */))
2891 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2892 else
2893 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 2894 }
2895 else
2896 {
2897 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2898 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 2899
2830 /* monitor some parent directory for speedup hints */ 2900 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2901 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 2902 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2903 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 2904 {
2835 char path [4096]; 2905 char path [4096];
… …
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 2922 }
2853 } 2923 }
2854 2924
2855 if (w->wd >= 0) 2925 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2926 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2858 2927
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 2928 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 2929 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 2930 ev_timer_again (EV_A_ &w->timer);
2875 } 2931 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 2932}
2877 2933
2878static void noinline 2934static void noinline
2879infy_del (EV_P_ ev_stat *w) 2935infy_del (EV_P_ ev_stat *w)
2880{ 2936{
… …
2925 2981
2926static void 2982static void
2927infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2928{ 2984{
2929 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 2986 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2933 2988
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2989 for (ofs = 0; ofs < len; )
2990 {
2991 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2992 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len;
2994 }
2936} 2995}
2937 2996
2938inline_size void 2997inline_size void
2939check_2625 (EV_P) 2998check_2625 (EV_P)
2940{ 2999{
… …
2956 return; 3015 return;
2957 3016
2958 fs_2625 = 1; 3017 fs_2625 = 1;
2959} 3018}
2960 3019
3020inline_size int
3021infy_newfd (void)
3022{
3023#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3024 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3025 if (fd >= 0)
3026 return fd;
3027#endif
3028 return inotify_init ();
3029}
3030
2961inline_size void 3031inline_size void
2962infy_init (EV_P) 3032infy_init (EV_P)
2963{ 3033{
2964 if (fs_fd != -2) 3034 if (fs_fd != -2)
2965 return; 3035 return;
2966 3036
2967 fs_fd = -1; 3037 fs_fd = -1;
2968 3038
2969 check_2625 (EV_A); 3039 check_2625 (EV_A);
2970 3040
2971 fs_fd = inotify_init (); 3041 fs_fd = infy_newfd ();
2972 3042
2973 if (fs_fd >= 0) 3043 if (fs_fd >= 0)
2974 { 3044 {
3045 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3046 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3047 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
2978 } 3050 }
2979} 3051}
2980 3052
2981inline_size void 3053inline_size void
2982infy_fork (EV_P) 3054infy_fork (EV_P)
… …
2984 int slot; 3056 int slot;
2985 3057
2986 if (fs_fd < 0) 3058 if (fs_fd < 0)
2987 return; 3059 return;
2988 3060
3061 ev_ref (EV_A);
3062 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3063 close (fs_fd);
2990 fs_fd = inotify_init (); 3064 fs_fd = infy_newfd ();
3065
3066 if (fs_fd >= 0)
3067 {
3068 fd_intern (fs_fd);
3069 ev_io_set (&fs_w, fs_fd, EV_READ);
3070 ev_io_start (EV_A_ &fs_w);
3071 ev_unref (EV_A);
3072 }
2991 3073
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2993 { 3075 {
2994 WL w_ = fs_hash [slot].head; 3076 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3077 fs_hash [slot].head = 0;
… …
3002 w->wd = -1; 3084 w->wd = -1;
3003 3085
3004 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3087 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3088 else
3089 {
3090 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3091 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3092 ev_timer_again (EV_A_ &w->timer);
3093 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3094 }
3008 } 3095 }
3009 } 3096 }
3010} 3097}
3011 3098
3012#endif 3099#endif
… …
3029static void noinline 3116static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3118{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3120
3034 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
3038 3123
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3124 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3125 if (
3041 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3137 ) {
3138 /* we only update w->prev on actual differences */
3139 /* in case we test more often than invoke the callback, */
3140 /* to ensure that prev is always different to attr */
3141 w->prev = prev;
3142
3053 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
3055 { 3145 {
3056 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);
… …
3082 3172
3083 if (fs_fd >= 0) 3173 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3174 infy_add (EV_A_ w);
3085 else 3175 else
3086#endif 3176#endif
3177 {
3087 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 ev_unref (EV_A);
3180 }
3088 3181
3089 ev_start (EV_A_ (W)w, 1); 3182 ev_start (EV_A_ (W)w, 1);
3090 3183
3091 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
3092} 3185}
… …
3101 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
3102 3195
3103#if EV_USE_INOTIFY 3196#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3197 infy_del (EV_A_ w);
3105#endif 3198#endif
3199
3200 if (ev_is_active (&w->timer))
3201 {
3202 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3203 ev_timer_stop (EV_A_ &w->timer);
3204 }
3107 3205
3108 ev_stop (EV_A_ (W)w); 3206 ev_stop (EV_A_ (W)w);
3109 3207
3110 EV_FREQUENT_CHECK; 3208 EV_FREQUENT_CHECK;
3111} 3209}
… …
3331 3429
3332 ev_io_stop (EV_A_ &w->io); 3430 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3431 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3432 ev_fork_stop (EV_A_ &w->fork);
3335 3433
3434 ev_stop (EV_A_ (W)w);
3435
3336 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3337} 3437}
3338#endif 3438#endif
3339 3439
3340#if EV_FORK_ENABLE 3440#if EV_FORK_ENABLE
… …
3416 3516
3417void 3517void
3418ev_async_send (EV_P_ ev_async *w) 3518ev_async_send (EV_P_ ev_async *w)
3419{ 3519{
3420 w->sent = 1; 3520 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3521 evpipe_write (EV_A_ &async_pending);
3422} 3522}
3423#endif 3523#endif
3424 3524
3425/*****************************************************************************/ 3525/*****************************************************************************/
3426 3526

Diff Legend

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