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

Comparing libev/ev.c (file contents):
Revision 1.299 by root, Tue Jul 14 00:09:59 2009 UTC vs.
Revision 1.309 by root, Sun Jul 26 04:24:17 2009 UTC

… …
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
178# endif 186# endif
179#endif 187#endif
180 188
181/* 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 */
182 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
183#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
186# else 221# else
187# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
263#ifndef EV_USE_EVENTFD 298#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 300# define EV_USE_EVENTFD 1
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
303# endif
304#endif
305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
268# endif 311# endif
269#endif 312#endif
270 313
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
… …
339#endif 382#endif
340 383
341#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC
392# endif
344# ifdef __cplusplus 393# ifdef __cplusplus
345extern "C" { 394extern "C" {
346# endif 395# endif
347int eventfd (unsigned int initval, int flags); 396int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 397# ifdef __cplusplus
349} 398}
350# endif 399# endif
400#endif
401
402#if EV_USE_SIGNALFD
403# include <sys/signalfd.h>
351#endif 404#endif
352 405
353/**/ 406/**/
354 407
355#if EV_VERIFY >= 3 408#if EV_VERIFY >= 3
… …
647 700
648 tv.tv_sec = (time_t)delay; 701 tv.tv_sec = (time_t)delay;
649 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
650 703
651 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 704 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652 /* somehting not guaranteed by newer posix versions, but guaranteed */ 705 /* something not guaranteed by newer posix versions, but guaranteed */
653 /* by older ones */ 706 /* by older ones */
654 select (0, 0, 0, 0, &tv); 707 select (0, 0, 0, 0, &tv);
655#endif 708#endif
656 } 709 }
657} 710}
… …
904 957
905 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 959 if (anfds [fd].events)
907 { 960 {
908 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
909 return; 962 break;
910 } 963 }
911} 964}
912 965
913/* usually called after fork if backend needs to re-arm all fds from scratch */ 966/* usually called after fork if backend needs to re-arm all fds from scratch */
914static void noinline 967static void noinline
… …
1004 1057
1005 for (;;) 1058 for (;;)
1006 { 1059 {
1007 int c = k << 1; 1060 int c = k << 1;
1008 1061
1009 if (c > N + HEAP0 - 1) 1062 if (c >= N + HEAP0)
1010 break; 1063 break;
1011 1064
1012 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013 ? 1 : 0; 1066 ? 1 : 0;
1014 1067
… …
1073/*****************************************************************************/ 1126/*****************************************************************************/
1074 1127
1075/* associate signal watchers to a signal signal */ 1128/* associate signal watchers to a signal signal */
1076typedef struct 1129typedef struct
1077{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1078 WL head; 1135 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1136} ANSIG;
1081 1137
1082static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1139
1087/*****************************************************************************/ 1140/*****************************************************************************/
1088 1141
1089/* used to prepare libev internal fd's */ 1142/* used to prepare libev internal fd's */
1090/* this is not fork-safe */ 1143/* this is not fork-safe */
… …
1104evpipe_init (EV_P) 1157evpipe_init (EV_P)
1105{ 1158{
1106 if (!ev_is_active (&pipe_w)) 1159 if (!ev_is_active (&pipe_w))
1107 { 1160 {
1108#if EV_USE_EVENTFD 1161#if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1164 evfd = eventfd (0, 0);
1165
1166 if (evfd >= 0)
1110 { 1167 {
1111 evpipe [0] = -1; 1168 evpipe [0] = -1;
1112 fd_intern (evfd); 1169 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1170 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1171 }
1115 else 1172 else
1116#endif 1173#endif
1117 { 1174 {
… …
1154/* called whenever the libev signal pipe */ 1211/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1212/* got some events (signal, async) */
1156static void 1213static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1215{
1216 int i;
1217
1159#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1219 if (evfd >= 0)
1161 { 1220 {
1162 uint64_t counter; 1221 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
… …
1167 { 1226 {
1168 char dummy; 1227 char dummy;
1169 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1170 } 1229 }
1171 1230
1172 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1173 { 1232 {
1174 int signum; 1233 sig_pending = 0;
1175 gotsig = 0;
1176 1234
1177 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1238 }
1181 1239
1182#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1183 if (gotasync) 1241 if (async_pending)
1184 { 1242 {
1185 int i; 1243 async_pending = 0;
1186 gotasync = 0;
1187 1244
1188 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1190 { 1247 {
1191 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
… …
1199 1256
1200static void 1257static void
1201ev_sighandler (int signum) 1258ev_sighandler (int signum)
1202{ 1259{
1203#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1205#endif 1262#endif
1206 1263
1207#if _WIN32 1264#if _WIN32
1208 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1209#endif 1266#endif
1210 1267
1211 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1213} 1270}
1214 1271
1215void noinline 1272void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1217{ 1274{
1218 WL w; 1275 WL w;
1219 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1220#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1283 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1285
1224 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1287 return;
1288#endif
1228 1289
1229 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1230 1291
1231 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1294}
1295
1296#if EV_USE_SIGNALFD
1297static void
1298sigfdcb (EV_P_ ev_io *iow, int revents)
1299{
1300 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1301
1302 for (;;)
1303 {
1304 ssize_t res = read (sigfd, si, sizeof (si));
1305
1306 /* not ISO-C, as res might be -1, but works with SuS */
1307 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1308 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1309
1310 if (res < (ssize_t)sizeof (si))
1311 break;
1312 }
1313}
1314#endif
1234 1315
1235/*****************************************************************************/ 1316/*****************************************************************************/
1236 1317
1237static WL childs [EV_PID_HASHSIZE]; 1318static WL childs [EV_PID_HASHSIZE];
1238 1319
… …
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1540 have_monotonic = 1;
1460 } 1541 }
1461#endif 1542#endif
1462 1543
1544 /* pid check not overridable via env */
1545#ifndef _WIN32
1546 if (flags & EVFLAG_FORKCHECK)
1547 curpid = getpid ();
1548#endif
1549
1550 if (!(flags & EVFLAG_NOENV)
1551 && !enable_secure ()
1552 && getenv ("LIBEV_FLAGS"))
1553 flags = atoi (getenv ("LIBEV_FLAGS"));
1554
1463 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1556 mn_now = get_clock ();
1465 now_floor = mn_now; 1557 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1558 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1559#if EV_MINIMAL < 2
… …
1470 1562
1471 io_blocktime = 0.; 1563 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1473 backend = 0; 1565 backend = 0;
1474 backend_fd = -1; 1566 backend_fd = -1;
1475 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1476#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1477 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1573#endif
1479 1574#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1576#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1577
1491 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1493 1580
1494#if EV_USE_PORT 1581#if EV_USE_PORT
… …
1520{ 1607{
1521 int i; 1608 int i;
1522 1609
1523 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1524 { 1611 {
1525 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1614
1528#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1616 if (evfd >= 0)
1530 close (evfd); 1617 close (evfd);
1531#endif 1618#endif
… …
1535 close (evpipe [0]); 1622 close (evpipe [0]);
1536 close (evpipe [1]); 1623 close (evpipe [1]);
1537 } 1624 }
1538 } 1625 }
1539 1626
1627#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd);
1634 }
1635#endif
1636
1540#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1542 close (fs_fd); 1639 close (fs_fd);
1543#endif 1640#endif
1544 1641
… …
1567#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1665 array_free (idle, [i]);
1569#endif 1666#endif
1570 } 1667 }
1571 1668
1572 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1670
1574 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1612 1709
1613 if (ev_is_active (&pipe_w)) 1710 if (ev_is_active (&pipe_w))
1614 { 1711 {
1615 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1617 gotsig = 1; 1714 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1716 async_pending = 1;
1620#endif 1717#endif
1621 1718
1622 ev_ref (EV_A); 1719 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1720 ev_io_stop (EV_A_ &pipe_w);
1624 1721
… …
1644#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1645 1742
1646struct ev_loop * 1743struct ev_loop *
1647ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1648{ 1745{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1747
1651 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1654 1750
1655 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1656 return loop; 1752 return EV_A;
1657 1753
1658 return 0; 1754 return 0;
1659} 1755}
1660 1756
1661void 1757void
… …
1765 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1767 1863
1768# if 0 1864# if 0
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1771# endif 1867# endif
1772#endif 1868#endif
1773} 1869}
1774#endif 1870#endif
1775 1871
… …
1782#endif 1878#endif
1783{ 1879{
1784 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1785 { 1881 {
1786#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1884#else
1789 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1790#endif 1886#endif
1791 1887
1792 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
… …
1809 1905
1810void 1906void
1811ev_default_destroy (void) 1907ev_default_destroy (void)
1812{ 1908{
1813#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1815#endif 1911#endif
1816 1912
1817 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1818 1914
1819#ifndef _WIN32 1915#ifndef _WIN32
… …
1826 1922
1827void 1923void
1828ev_default_fork (void) 1924ev_default_fork (void)
1829{ 1925{
1830#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1832#endif 1928#endif
1833 1929
1834 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1835} 1931}
1836 1932
… …
1838 1934
1839void 1935void
1840ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1841{ 1937{
1842 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1939}
1940
1941unsigned int
1942ev_pending_count (EV_P)
1943{
1944 int pri;
1945 unsigned int count = 0;
1946
1947 for (pri = NUMPRI; pri--; )
1948 count += pendingcnt [pri];
1949
1950 return count;
1843} 1951}
1844 1952
1845void noinline 1953void noinline
1846ev_invoke_pending (EV_P) 1954ev_invoke_pending (EV_P)
1847{ 1955{
… …
2290inline_size void 2398inline_size void
2291wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2292{ 2400{
2293 while (*head) 2401 while (*head)
2294 { 2402 {
2295 if (*head == elem) 2403 if (expect_true (*head == elem))
2296 { 2404 {
2297 *head = elem->next; 2405 *head = elem->next;
2298 return; 2406 break;
2299 } 2407 }
2300 2408
2301 head = &(*head)->next; 2409 head = &(*head)->next;
2302 } 2410 }
2303} 2411}
… …
2475 } 2583 }
2476 2584
2477 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2478} 2586}
2479 2587
2588ev_tstamp
2589ev_timer_remaining (EV_P_ ev_timer *w)
2590{
2591 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2592}
2593
2480#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2481void noinline 2595void noinline
2482ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2483{ 2597{
2484 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2551#endif 2665#endif
2552 2666
2553void noinline 2667void noinline
2554ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2555{ 2669{
2556#if EV_MULTIPLICITY
2557 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2558#endif
2559 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2560 return; 2671 return;
2561 2672
2562 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2673 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2563 2674
2564 evpipe_init (EV_A); 2675#if EV_MULTIPLICITY
2676 assert (("libev: a signal must not be attached to two different loops",
2677 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2565 2678
2566 EV_FREQUENT_CHECK; 2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2567 2681
2682 EV_FREQUENT_CHECK;
2683
2684#if EV_USE_SIGNALFD
2685 if (sigfd == -2)
2568 { 2686 {
2569#ifndef _WIN32 2687 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2570 sigset_t full, prev; 2688 if (sigfd < 0 && errno == EINVAL)
2571 sigfillset (&full); 2689 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2572 sigprocmask (SIG_SETMASK, &full, &prev);
2573#endif
2574 2690
2575 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2691 if (sigfd >= 0)
2692 {
2693 fd_intern (sigfd); /* doing it twice will not hurt */
2576 2694
2577#ifndef _WIN32 2695 sigemptyset (&sigfd_set);
2578 sigprocmask (SIG_SETMASK, &prev, 0); 2696
2579#endif 2697 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2698 ev_set_priority (&sigfd_w, EV_MAXPRI);
2699 ev_io_start (EV_A_ &sigfd_w);
2700 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2701 }
2580 } 2702 }
2703
2704 if (sigfd >= 0)
2705 {
2706 /* TODO: check .head */
2707 sigaddset (&sigfd_set, w->signum);
2708 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2709
2710 signalfd (sigfd, &sigfd_set, 0);
2711 }
2712#endif
2581 2713
2582 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2583 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2584 2716
2585 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2586 { 2721 {
2587#if _WIN32 2722# if _WIN32
2588 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2589#else 2724# else
2590 struct sigaction sa = { }; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2591 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2592 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2593 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2731 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2594 sigaction (w->signum, &sa, 0); 2732 sigaction (w->signum, &sa, 0);
2733
2734 sigemptyset (&sa.sa_mask);
2735 sigaddset (&sa.sa_mask, w->signum);
2736 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2595#endif 2737#endif
2596 } 2738 }
2597 2739
2598 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2599} 2741}
2600 2742
2601void noinline 2743void noinline
… …
2609 2751
2610 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2611 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2612 2754
2613 if (!signals [w->signum - 1].head) 2755 if (!signals [w->signum - 1].head)
2756 {
2757#if EV_MULTIPLICITY
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif
2760#if EV_USE_SIGNALFD
2761 if (sigfd >= 0)
2762 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2764 sigdelset (&sigfd_set, w->signum);
2765 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2767 /*TODO: maybe unblock signal? */
2768 }
2769 else
2770#endif
2614 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2615 2773
2616 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2617} 2775}
2618 2776
2619void 2777void
… …
3099embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3100{ 3258{
3101 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3102 3260
3103 { 3261 {
3104 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
3105 3263
3106 while (fdchangecnt) 3264 while (fdchangecnt)
3107 { 3265 {
3108 fd_reify (EV_A); 3266 fd_reify (EV_A);
3109 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3117 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3275 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3118 3276
3119 ev_embed_stop (EV_A_ w); 3277 ev_embed_stop (EV_A_ w);
3120 3278
3121 { 3279 {
3122 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
3123 3281
3124 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
3125 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3126 } 3284 }
3127 3285
… …
3141{ 3299{
3142 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
3143 return; 3301 return;
3144 3302
3145 { 3303 {
3146 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
3147 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3305 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3148 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3306 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3149 } 3307 }
3150 3308
3151 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
… …
3263 3421
3264void 3422void
3265ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3266{ 3424{
3267 w->sent = 1; 3425 w->sent = 1;
3268 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3269} 3427}
3270#endif 3428#endif
3271 3429
3272/*****************************************************************************/ 3430/*****************************************************************************/
3273 3431
… …
3422 if (types & EV_CHECK) 3580 if (types & EV_CHECK)
3423 for (i = checkcnt; i--; ) 3581 for (i = checkcnt; i--; )
3424 cb (EV_A_ EV_CHECK, checks [i]); 3582 cb (EV_A_ EV_CHECK, checks [i]);
3425 3583
3426 if (types & EV_SIGNAL) 3584 if (types & EV_SIGNAL)
3427 for (i = 0; i < signalmax; ++i) 3585 for (i = 0; i < EV_NSIG - 1; ++i)
3428 for (wl = signals [i].head; wl; ) 3586 for (wl = signals [i].head; wl; )
3429 { 3587 {
3430 wn = wl->next; 3588 wn = wl->next;
3431 cb (EV_A_ EV_SIGNAL, wl); 3589 cb (EV_A_ EV_SIGNAL, wl);
3432 wl = wn; 3590 wl = wn;

Diff Legend

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