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

Comparing libev/ev.c (file contents):
Revision 1.303 by root, Sun Jul 19 01:36:34 2009 UTC vs.
Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC

… …
186# endif 186# endif
187#endif 187#endif
188 188
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
190 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
191#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
194# else 221# else
195# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
275# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
276# endif 303# endif
277#endif 304#endif
278 305
279#ifndef EV_USE_SIGNALFD 306#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 308# define EV_USE_SIGNALFD 1
282# else 309# else
283# define EV_USE_SIGNALFD 0 310# define EV_USE_SIGNALFD 0
284# endif 311# endif
285#endif 312#endif
… …
359# include <stdint.h> 386# include <stdint.h>
360# ifndef EFD_NONBLOCK 387# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 388# define EFD_NONBLOCK O_NONBLOCK
362# endif 389# endif
363# ifndef EFD_CLOEXEC 390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
365# endif 396# endif
366# ifdef __cplusplus 397# ifdef __cplusplus
367extern "C" { 398extern "C" {
368# endif 399# endif
369int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
… …
371} 402}
372# endif 403# endif
373#endif 404#endif
374 405
375#if EV_USE_SIGNALFD 406#if EV_USE_SIGNALFD
376# 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
377#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
378 434
379/**/ 435/**/
380 436
381#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
445 501
446#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
448#endif 504#endif
449 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)
514#endif
515
450#ifdef _WIN32 516#ifdef _WIN32
451# include "ev_win32.c" 517# include "ev_win32.c"
452#endif 518#endif
453 519
454/*****************************************************************************/ 520/*****************************************************************************/
… …
845 911
846#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
847 if (events) 913 if (events)
848 { 914 {
849 unsigned long arg; 915 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
852 #else
853 anfd->handle = _get_osfhandle (fd);
854 #endif
855 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));
856 } 918 }
857#endif 919#endif
858 920
859 { 921 {
… …
930 992
931 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 994 if (anfds [fd].events)
933 { 995 {
934 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
935 return; 997 break;
936 } 998 }
937} 999}
938 1000
939/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
940static void noinline 1002static void noinline
… …
1030 1092
1031 for (;;) 1093 for (;;)
1032 { 1094 {
1033 int c = k << 1; 1095 int c = k << 1;
1034 1096
1035 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
1036 break; 1098 break;
1037 1099
1038 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1039 ? 1 : 0; 1101 ? 1 : 0;
1040 1102
… …
1076 1138
1077/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1078inline_size void 1140inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1080{ 1142{
1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1082 upheap (heap, k); 1144 upheap (heap, k);
1083 else 1145 else
1084 downheap (heap, N, k); 1146 downheap (heap, N, k);
1085} 1147}
1086 1148
… …
1099/*****************************************************************************/ 1161/*****************************************************************************/
1100 1162
1101/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1102typedef struct 1164typedef struct
1103{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1104 WL head; 1170 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1171} ANSIG;
1107 1172
1108static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1174
1113/*****************************************************************************/ 1175/*****************************************************************************/
1114 1176
1115/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1116/* this is not fork-safe */ 1178/* this is not fork-safe */
… …
1184/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1186static void 1248static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1250{
1251 int i;
1252
1189#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1254 if (evfd >= 0)
1191 { 1255 {
1192 uint64_t counter; 1256 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1197 { 1261 {
1198 char dummy; 1262 char dummy;
1199 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1200 } 1264 }
1201 1265
1202 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1203 { 1267 {
1204 int signum; 1268 sig_pending = 0;
1205 gotsig = 0;
1206 1269
1207 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1273 }
1211 1274
1212#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1213 if (gotasync) 1276 if (async_pending)
1214 { 1277 {
1215 int i; 1278 async_pending = 0;
1216 gotasync = 0;
1217 1279
1218 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1220 { 1282 {
1221 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1229 1291
1230static void 1292static void
1231ev_sighandler (int signum) 1293ev_sighandler (int signum)
1232{ 1294{
1233#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1235#endif 1297#endif
1236 1298
1237#if _WIN32 1299#if _WIN32
1238 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1239#endif 1301#endif
1240 1302
1241 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1243} 1305}
1244 1306
1245void noinline 1307void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1247{ 1309{
1248 WL w; 1310 WL w;
1249 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1250#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1252#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1320
1254 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1322 return;
1323#endif
1258 1324
1259 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1260 1326
1261 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1329}
1264 1330
1265#if EV_USE_SIGNALFD 1331#if EV_USE_SIGNALFD
1266static void 1332static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1333sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1334{
1269 struct signalfd_siginfo si[4], *sip; 1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1336
1271 for (;;) 1337 for (;;)
1272 { 1338 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1339 ssize_t res = read (sigfd, si, sizeof (si));
1274 1340
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1575 have_monotonic = 1;
1510 } 1576 }
1511#endif 1577#endif
1512 1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1589
1513 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1591 mn_now = get_clock ();
1515 now_floor = mn_now; 1592 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1594#if EV_MINIMAL < 2
… …
1520 1597
1521 io_blocktime = 0.; 1598 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1523 backend = 0; 1600 backend = 0;
1524 backend_fd = -1; 1601 backend_fd = -1;
1525 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1526#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1527 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1608#endif
1529#if EV_USE_SIGNALFD 1609#if EV_USE_SIGNALFD
1530 sigfd = -2; 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1531#endif 1611#endif
1532
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV)
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543 1612
1544 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1546 1615
1547#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1583 close (evfd); 1652 close (evfd);
1584#endif 1653#endif
1585 1654
1586 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1587 { 1656 {
1588 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1659 }
1591 } 1660 }
1592 1661
1593#if EV_USE_SIGNALFD 1662#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1663 if (ev_is_active (&sigfd_w))
… …
1630#if EV_IDLE_ENABLE 1699#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1700 array_free (idle, [i]);
1632#endif 1701#endif
1633 } 1702 }
1634 1703
1635 ev_free (anfds); anfdmax = 0; 1704 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1705
1637 /* have to use the microsoft-never-gets-it-right macro */ 1706 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1707 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1708 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1709 array_free (timer, EMPTY);
… …
1675 1744
1676 if (ev_is_active (&pipe_w)) 1745 if (ev_is_active (&pipe_w))
1677 { 1746 {
1678 /* this "locks" the handlers against writing to the pipe */ 1747 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1748 /* while we modify the fd vars */
1680 gotsig = 1; 1749 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1750#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1751 async_pending = 1;
1683#endif 1752#endif
1684 1753
1685 ev_ref (EV_A); 1754 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1755 ev_io_stop (EV_A_ &pipe_w);
1687 1756
… …
1690 close (evfd); 1759 close (evfd);
1691#endif 1760#endif
1692 1761
1693 if (evpipe [0] >= 0) 1762 if (evpipe [0] >= 0)
1694 { 1763 {
1695 close (evpipe [0]); 1764 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1765 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1766 }
1698 1767
1699 evpipe_init (EV_A); 1768 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1769 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1770 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1707#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1708 1777
1709struct ev_loop * 1778struct ev_loop *
1710ev_loop_new (unsigned int flags) 1779ev_loop_new (unsigned int flags)
1711{ 1780{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1781 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1782
1714 memset (loop, 0, sizeof (struct ev_loop)); 1783 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1784 loop_init (EV_A_ flags);
1716 1785
1717 if (ev_backend (EV_A)) 1786 if (ev_backend (EV_A))
1718 return loop; 1787 return EV_A;
1719 1788
1720 return 0; 1789 return 0;
1721} 1790}
1722 1791
1723void 1792void
… …
1827 assert (checkmax >= checkcnt); 1896 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1897 array_verify (EV_A_ (W *)checks, checkcnt);
1829 1898
1830# if 0 1899# if 0
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1900 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1833# endif 1902# endif
1834#endif 1903#endif
1835} 1904}
1836#endif 1905#endif
1837 1906
… …
1844#endif 1913#endif
1845{ 1914{
1846 if (!ev_default_loop_ptr) 1915 if (!ev_default_loop_ptr)
1847 { 1916 {
1848#if EV_MULTIPLICITY 1917#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1918 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1919#else
1851 ev_default_loop_ptr = 1; 1920 ev_default_loop_ptr = 1;
1852#endif 1921#endif
1853 1922
1854 loop_init (EV_A_ flags); 1923 loop_init (EV_A_ flags);
… …
1871 1940
1872void 1941void
1873ev_default_destroy (void) 1942ev_default_destroy (void)
1874{ 1943{
1875#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1945 EV_P = ev_default_loop_ptr;
1877#endif 1946#endif
1878 1947
1879 ev_default_loop_ptr = 0; 1948 ev_default_loop_ptr = 0;
1880 1949
1881#ifndef _WIN32 1950#ifndef _WIN32
… …
1888 1957
1889void 1958void
1890ev_default_fork (void) 1959ev_default_fork (void)
1891{ 1960{
1892#if EV_MULTIPLICITY 1961#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 1962 EV_P = ev_default_loop_ptr;
1894#endif 1963#endif
1895 1964
1896 postfork = 1; /* must be in line with ev_loop_fork */ 1965 postfork = 1; /* must be in line with ev_loop_fork */
1897} 1966}
1898 1967
… …
2364inline_size void 2433inline_size void
2365wlist_del (WL *head, WL elem) 2434wlist_del (WL *head, WL elem)
2366{ 2435{
2367 while (*head) 2436 while (*head)
2368 { 2437 {
2369 if (*head == elem) 2438 if (expect_true (*head == elem))
2370 { 2439 {
2371 *head = elem->next; 2440 *head = elem->next;
2372 return; 2441 break;
2373 } 2442 }
2374 2443
2375 head = &(*head)->next; 2444 head = &(*head)->next;
2376 } 2445 }
2377} 2446}
… …
2631#endif 2700#endif
2632 2701
2633void noinline 2702void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2703ev_signal_start (EV_P_ ev_signal *w)
2635{ 2704{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2640 return; 2706 return;
2641 2707
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2708 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2709
2710#if EV_MULTIPLICITY
2711 assert (("libev: a signal must not be attached to two different loops",
2712 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2713
2714 signals [w->signum - 1].loop = EV_A;
2715#endif
2643 2716
2644 EV_FREQUENT_CHECK; 2717 EV_FREQUENT_CHECK;
2645 2718
2646#if EV_USE_SIGNALFD 2719#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2720 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2742 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2743 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2744
2672 signalfd (sigfd, &sigfd_set, 0); 2745 signalfd (sigfd, &sigfd_set, 0);
2673 } 2746 }
2674 else
2675#endif 2747#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688 if (sigfd < 0)/*TODO*/
2689 sigdelset (&prev, w->signum);
2690 sigprocmask (SIG_SETMASK, &prev, 0);
2691#endif
2692 }
2693 2748
2694 ev_start (EV_A_ (W)w, 1); 2749 ev_start (EV_A_ (W)w, 1);
2695 wlist_add (&signals [w->signum - 1].head, (WL)w); 2750 wlist_add (&signals [w->signum - 1].head, (WL)w);
2696 2751
2697 if (!((WL)w)->next) 2752 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/
2755# endif
2698 { 2756 {
2699#if _WIN32 2757# if _WIN32
2700 signal (w->signum, ev_sighandler); 2758 signal (w->signum, ev_sighandler);
2701#else 2759# else
2702 if (sigfd < 0) /*TODO*/
2703 {
2704 struct sigaction sa = { }; 2760 struct sigaction sa;
2761
2762 evpipe_init (EV_A);
2763
2705 sa.sa_handler = ev_sighandler; 2764 sa.sa_handler = ev_sighandler;
2706 sigfillset (&sa.sa_mask); 2765 sigfillset (&sa.sa_mask);
2707 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2708 sigaction (w->signum, &sa, 0); 2767 sigaction (w->signum, &sa, 0);
2768
2769 sigemptyset (&sa.sa_mask);
2770 sigaddset (&sa.sa_mask, w->signum);
2771 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2772#endif
2709 } 2773 }
2710#endif
2711 }
2712 2774
2713 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2714} 2776}
2715 2777
2716void noinline 2778void noinline
… …
2724 2786
2725 wlist_del (&signals [w->signum - 1].head, (WL)w); 2787 wlist_del (&signals [w->signum - 1].head, (WL)w);
2726 ev_stop (EV_A_ (W)w); 2788 ev_stop (EV_A_ (W)w);
2727 2789
2728 if (!signals [w->signum - 1].head) 2790 if (!signals [w->signum - 1].head)
2791 {
2792#if EV_MULTIPLICITY
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif
2729#if EV_USE_SIGNALFD 2795#if EV_USE_SIGNALFD
2730 if (sigfd >= 0) 2796 if (sigfd >= 0)
2731 { 2797 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2733 sigdelset (&sigfd_set, w->signum); 2799 sigdelset (&sigfd_set, w->signum);
2734 signalfd (sigfd, &sigfd_set, 0); 2800 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2736 /*TODO: maybe unblock signal? */ 2802 /*TODO: maybe unblock signal? */
2737 } 2803 }
2738 else 2804 else
2739#endif 2805#endif
2740 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2741 2808
2742 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2743} 2810}
2744 2811
2745void 2812void
… …
2825 } 2892 }
2826 } 2893 }
2827 2894
2828 if (w->wd >= 0) 2895 if (w->wd >= 0)
2829 { 2896 {
2897 struct statfs sfs;
2898
2830 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2831 2900
2832 /* now local changes will be tracked by inotify, but remote changes won't */ 2901 /* now local changes will be tracked by inotify, but remote changes won't */
2833 /* unless the filesystem it known to be local, we therefore still poll */ 2902 /* unless the filesystem it known to be local, we therefore still poll */
2834 /* also do poll on <2.6.25, but with normal frequency */ 2903 /* also do poll on <2.6.25, but with normal frequency */
2835 struct statfs sfs;
2836 2904
2837 if (fs_2625 && !statfs (w->path, &sfs)) 2905 if (fs_2625 && !statfs (w->path, &sfs))
2838 if (sfs.f_type == 0x1373 /* devfs */ 2906 if (sfs.f_type == 0x1373 /* devfs */
2839 || sfs.f_type == 0xEF53 /* ext2/3 */ 2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2840 || sfs.f_type == 0x3153464a /* jfs */ 2908 || sfs.f_type == 0x3153464a /* jfs */
… …
2929 return; 2997 return;
2930 2998
2931 fs_2625 = 1; 2999 fs_2625 = 1;
2932} 3000}
2933 3001
3002inline_size int
3003infy_newfd (void)
3004{
3005#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3006 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3007 if (fd >= 0)
3008 return fd;
3009#endif
3010 return inotify_init ();
3011}
3012
2934inline_size void 3013inline_size void
2935infy_init (EV_P) 3014infy_init (EV_P)
2936{ 3015{
2937 if (fs_fd != -2) 3016 if (fs_fd != -2)
2938 return; 3017 return;
2939 3018
2940 fs_fd = -1; 3019 fs_fd = -1;
2941 3020
2942 check_2625 (EV_A); 3021 check_2625 (EV_A);
2943 3022
2944 fs_fd = inotify_init (); 3023 fs_fd = infy_newfd ();
2945 3024
2946 if (fs_fd >= 0) 3025 if (fs_fd >= 0)
2947 { 3026 {
3027 fd_intern (fs_fd);
2948 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3028 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2949 ev_set_priority (&fs_w, EV_MAXPRI); 3029 ev_set_priority (&fs_w, EV_MAXPRI);
2950 ev_io_start (EV_A_ &fs_w); 3030 ev_io_start (EV_A_ &fs_w);
2951 } 3031 }
2952} 3032}
… …
2957 int slot; 3037 int slot;
2958 3038
2959 if (fs_fd < 0) 3039 if (fs_fd < 0)
2960 return; 3040 return;
2961 3041
3042 ev_io_stop (EV_A_ &fs_w);
2962 close (fs_fd); 3043 close (fs_fd);
2963 fs_fd = inotify_init (); 3044 fs_fd = infy_newfd ();
3045
3046 if (fs_fd >= 0)
3047 {
3048 fd_intern (fs_fd);
3049 ev_io_set (&fs_w, fs_fd, EV_READ);
3050 ev_io_start (EV_A_ &fs_w);
3051 }
2964 3052
2965 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3053 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2966 { 3054 {
2967 WL w_ = fs_hash [slot].head; 3055 WL w_ = fs_hash [slot].head;
2968 fs_hash [slot].head = 0; 3056 fs_hash [slot].head = 0;
… …
3225embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3313embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3226{ 3314{
3227 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3315 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3228 3316
3229 { 3317 {
3230 struct ev_loop *loop = w->other; 3318 EV_P = w->other;
3231 3319
3232 while (fdchangecnt) 3320 while (fdchangecnt)
3233 { 3321 {
3234 fd_reify (EV_A); 3322 fd_reify (EV_A);
3235 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3323 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3243 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3331 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3244 3332
3245 ev_embed_stop (EV_A_ w); 3333 ev_embed_stop (EV_A_ w);
3246 3334
3247 { 3335 {
3248 struct ev_loop *loop = w->other; 3336 EV_P = w->other;
3249 3337
3250 ev_loop_fork (EV_A); 3338 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3339 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 } 3340 }
3253 3341
… …
3267{ 3355{
3268 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
3269 return; 3357 return;
3270 3358
3271 { 3359 {
3272 struct ev_loop *loop = w->other; 3360 EV_P = w->other;
3273 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3361 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3274 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3362 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3275 } 3363 }
3276 3364
3277 EV_FREQUENT_CHECK; 3365 EV_FREQUENT_CHECK;
… …
3389 3477
3390void 3478void
3391ev_async_send (EV_P_ ev_async *w) 3479ev_async_send (EV_P_ ev_async *w)
3392{ 3480{
3393 w->sent = 1; 3481 w->sent = 1;
3394 evpipe_write (EV_A_ &gotasync); 3482 evpipe_write (EV_A_ &async_pending);
3395} 3483}
3396#endif 3484#endif
3397 3485
3398/*****************************************************************************/ 3486/*****************************************************************************/
3399 3487
… …
3548 if (types & EV_CHECK) 3636 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; ) 3637 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]); 3638 cb (EV_A_ EV_CHECK, checks [i]);
3551 3639
3552 if (types & EV_SIGNAL) 3640 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i) 3641 for (i = 0; i < EV_NSIG - 1; ++i)
3554 for (wl = signals [i].head; wl; ) 3642 for (wl = signals [i].head; wl; )
3555 { 3643 {
3556 wn = wl->next; 3644 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl); 3645 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn; 3646 wl = wn;

Diff Legend

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