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

Comparing libev/ev.c (file contents):
Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC vs.
Revision 1.312 by root, Wed Aug 12 18:48: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# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
344# ifdef __cplusplus 397# ifdef __cplusplus
345extern "C" { 398extern "C" {
346# endif 399# endif
347int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 401# ifdef __cplusplus
349} 402}
350# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
351#endif 408#endif
352 409
353/**/ 410/**/
354 411
355#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
904 961
905 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 963 if (anfds [fd].events)
907 { 964 {
908 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
909 return; 966 break;
910 } 967 }
911} 968}
912 969
913/* usually called after fork if backend needs to re-arm all fds from scratch */ 970/* usually called after fork if backend needs to re-arm all fds from scratch */
914static void noinline 971static void noinline
… …
1004 1061
1005 for (;;) 1062 for (;;)
1006 { 1063 {
1007 int c = k << 1; 1064 int c = k << 1;
1008 1065
1009 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
1010 break; 1067 break;
1011 1068
1012 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1069 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013 ? 1 : 0; 1070 ? 1 : 0;
1014 1071
… …
1050 1107
1051/* move an element suitably so it is in a correct place */ 1108/* move an element suitably so it is in a correct place */
1052inline_size void 1109inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
1054{ 1111{
1055 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1112 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1056 upheap (heap, k); 1113 upheap (heap, k);
1057 else 1114 else
1058 downheap (heap, N, k); 1115 downheap (heap, N, k);
1059} 1116}
1060 1117
… …
1073/*****************************************************************************/ 1130/*****************************************************************************/
1074 1131
1075/* associate signal watchers to a signal signal */ 1132/* associate signal watchers to a signal signal */
1076typedef struct 1133typedef struct
1077{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
1078 WL head; 1139 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1140} ANSIG;
1081 1141
1082static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1143
1087/*****************************************************************************/ 1144/*****************************************************************************/
1088 1145
1089/* used to prepare libev internal fd's */ 1146/* used to prepare libev internal fd's */
1090/* this is not fork-safe */ 1147/* this is not fork-safe */
… …
1104evpipe_init (EV_P) 1161evpipe_init (EV_P)
1105{ 1162{
1106 if (!ev_is_active (&pipe_w)) 1163 if (!ev_is_active (&pipe_w))
1107 { 1164 {
1108#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1110 { 1171 {
1111 evpipe [0] = -1; 1172 evpipe [0] = -1;
1112 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1175 }
1115 else 1176 else
1116#endif 1177#endif
1117 { 1178 {
… …
1154/* called whenever the libev signal pipe */ 1215/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1216/* got some events (signal, async) */
1156static void 1217static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1219{
1220 int i;
1221
1159#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1223 if (evfd >= 0)
1161 { 1224 {
1162 uint64_t counter; 1225 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
… …
1167 { 1230 {
1168 char dummy; 1231 char dummy;
1169 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1170 } 1233 }
1171 1234
1172 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1173 { 1236 {
1174 int signum; 1237 sig_pending = 0;
1175 gotsig = 0;
1176 1238
1177 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1242 }
1181 1243
1182#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1183 if (gotasync) 1245 if (async_pending)
1184 { 1246 {
1185 int i; 1247 async_pending = 0;
1186 gotasync = 0;
1187 1248
1188 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1190 { 1251 {
1191 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
… …
1199 1260
1200static void 1261static void
1201ev_sighandler (int signum) 1262ev_sighandler (int signum)
1202{ 1263{
1203#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1205#endif 1266#endif
1206 1267
1207#if _WIN32 1268#if _WIN32
1208 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1209#endif 1270#endif
1210 1271
1211 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1213} 1274}
1214 1275
1215void noinline 1276void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1217{ 1278{
1218 WL w; 1279 WL w;
1219 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1220#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1287 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1289
1224 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1291 return;
1292#endif
1228 1293
1229 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1230 1295
1231 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1298}
1299
1300#if EV_USE_SIGNALFD
1301static void
1302sigfdcb (EV_P_ ev_io *iow, int revents)
1303{
1304 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1305
1306 for (;;)
1307 {
1308 ssize_t res = read (sigfd, si, sizeof (si));
1309
1310 /* not ISO-C, as res might be -1, but works with SuS */
1311 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1312 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1313
1314 if (res < (ssize_t)sizeof (si))
1315 break;
1316 }
1317}
1318#endif
1234 1319
1235/*****************************************************************************/ 1320/*****************************************************************************/
1236 1321
1237static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1238 1323
… …
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1544 have_monotonic = 1;
1460 } 1545 }
1461#endif 1546#endif
1462 1547
1548 /* pid check not overridable via env */
1549#ifndef _WIN32
1550 if (flags & EVFLAG_FORKCHECK)
1551 curpid = getpid ();
1552#endif
1553
1554 if (!(flags & EVFLAG_NOENV)
1555 && !enable_secure ()
1556 && getenv ("LIBEV_FLAGS"))
1557 flags = atoi (getenv ("LIBEV_FLAGS"));
1558
1463 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1560 mn_now = get_clock ();
1465 now_floor = mn_now; 1561 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1562 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1563#if EV_MINIMAL < 2
… …
1470 1566
1471 io_blocktime = 0.; 1567 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1473 backend = 0; 1569 backend = 0;
1474 backend_fd = -1; 1570 backend_fd = -1;
1475 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1476#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1477 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1577#endif
1479 1578#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1580#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1581
1491 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1493 1584
1494#if EV_USE_PORT 1585#if EV_USE_PORT
… …
1520{ 1611{
1521 int i; 1612 int i;
1522 1613
1523 if (ev_is_active (&pipe_w)) 1614 if (ev_is_active (&pipe_w))
1524 { 1615 {
1525 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1618
1528#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1620 if (evfd >= 0)
1530 close (evfd); 1621 close (evfd);
1531#endif 1622#endif
… …
1535 close (evpipe [0]); 1626 close (evpipe [0]);
1536 close (evpipe [1]); 1627 close (evpipe [1]);
1537 } 1628 }
1538 } 1629 }
1539 1630
1631#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd);
1638 }
1639#endif
1640
1540#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1542 close (fs_fd); 1643 close (fs_fd);
1543#endif 1644#endif
1544 1645
… …
1567#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1669 array_free (idle, [i]);
1569#endif 1670#endif
1570 } 1671 }
1571 1672
1572 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1674
1574 /* have to use the microsoft-never-gets-it-right macro */ 1675 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1676 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
… …
1612 1713
1613 if (ev_is_active (&pipe_w)) 1714 if (ev_is_active (&pipe_w))
1614 { 1715 {
1615 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1617 gotsig = 1; 1718 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1720 async_pending = 1;
1620#endif 1721#endif
1621 1722
1622 ev_ref (EV_A); 1723 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1724 ev_io_stop (EV_A_ &pipe_w);
1624 1725
… …
1644#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1645 1746
1646struct ev_loop * 1747struct ev_loop *
1647ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1648{ 1749{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1750 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1751
1651 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1654 1754
1655 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1656 return loop; 1756 return EV_A;
1657 1757
1658 return 0; 1758 return 0;
1659} 1759}
1660 1760
1661void 1761void
… …
1765 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1767 1867
1768# if 0 1868# if 0
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1869 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) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1771# endif 1871# endif
1772#endif 1872#endif
1773} 1873}
1774#endif 1874#endif
1775 1875
… …
1782#endif 1882#endif
1783{ 1883{
1784 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1785 { 1885 {
1786#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1888#else
1789 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1790#endif 1890#endif
1791 1891
1792 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
… …
1809 1909
1810void 1910void
1811ev_default_destroy (void) 1911ev_default_destroy (void)
1812{ 1912{
1813#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1815#endif 1915#endif
1816 1916
1817 ev_default_loop_ptr = 0; 1917 ev_default_loop_ptr = 0;
1818 1918
1819#ifndef _WIN32 1919#ifndef _WIN32
… …
1826 1926
1827void 1927void
1828ev_default_fork (void) 1928ev_default_fork (void)
1829{ 1929{
1830#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1832#endif 1932#endif
1833 1933
1834 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1835} 1935}
1836 1936
… …
2302inline_size void 2402inline_size void
2303wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2304{ 2404{
2305 while (*head) 2405 while (*head)
2306 { 2406 {
2307 if (*head == elem) 2407 if (expect_true (*head == elem))
2308 { 2408 {
2309 *head = elem->next; 2409 *head = elem->next;
2310 return; 2410 break;
2311 } 2411 }
2312 2412
2313 head = &(*head)->next; 2413 head = &(*head)->next;
2314 } 2414 }
2315} 2415}
… …
2569#endif 2669#endif
2570 2670
2571void noinline 2671void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2573{ 2673{
2574#if EV_MULTIPLICITY
2575 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2576#endif
2577 if (expect_false (ev_is_active (w))) 2674 if (expect_false (ev_is_active (w)))
2578 return; 2675 return;
2579 2676
2580 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2677 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2581 2678
2582 evpipe_init (EV_A); 2679#if EV_MULTIPLICITY
2680 assert (("libev: a signal must not be attached to two different loops",
2681 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2583 2682
2584 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2585 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2586 { 2690 {
2587#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2694
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2695 if (sigfd >= 0)
2696 {
2697 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2698
2595#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2597#endif 2701 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2702 ev_set_priority (&sigfd_w, EV_MAXPRI);
2703 ev_io_start (EV_A_ &sigfd_w);
2704 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2705 }
2598 } 2706 }
2707
2708 if (sigfd >= 0)
2709 {
2710 /* TODO: check .head */
2711 sigaddset (&sigfd_set, w->signum);
2712 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2713
2714 signalfd (sigfd, &sigfd_set, 0);
2715 }
2716#endif
2599 2717
2600 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2720
2603 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2604 { 2725 {
2605#if _WIN32 2726# if _WIN32
2606 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2607#else 2728# else
2608 struct sigaction sa = { }; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2609 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2611 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2735 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2612 sigaction (w->signum, &sa, 0); 2736 sigaction (w->signum, &sa, 0);
2737
2738 sigemptyset (&sa.sa_mask);
2739 sigaddset (&sa.sa_mask, w->signum);
2740 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2613#endif 2741#endif
2614 } 2742 }
2615 2743
2616 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2617} 2745}
2618 2746
2619void noinline 2747void noinline
… …
2627 2755
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2630 2758
2631 if (!signals [w->signum - 1].head) 2759 if (!signals [w->signum - 1].head)
2760 {
2761#if EV_MULTIPLICITY
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif
2764#if EV_USE_SIGNALFD
2765 if (sigfd >= 0)
2766 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2768 sigdelset (&sigfd_set, w->signum);
2769 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2771 /*TODO: maybe unblock signal? */
2772 }
2773 else
2774#endif
2632 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2633 2777
2634 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2635} 2779}
2636 2780
2637void 2781void
… …
2717 } 2861 }
2718 } 2862 }
2719 2863
2720 if (w->wd >= 0) 2864 if (w->wd >= 0)
2721 { 2865 {
2866 struct statfs sfs;
2867
2722 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2723 2869
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 2870 /* now local changes will be tracked by inotify, but remote changes won't */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 2871 /* unless the filesystem it known to be local, we therefore still poll */
2726 /* also do poll on <2.6.25, but with normal frequency */ 2872 /* also do poll on <2.6.25, but with normal frequency */
2727 struct statfs sfs;
2728 2873
2729 if (fs_2625 && !statfs (w->path, &sfs)) 2874 if (fs_2625 && !statfs (w->path, &sfs))
2730 if (sfs.f_type == 0x1373 /* devfs */ 2875 if (sfs.f_type == 0x1373 /* devfs */
2731 || sfs.f_type == 0xEF53 /* ext2/3 */ 2876 || sfs.f_type == 0xEF53 /* ext2/3 */
2732 || sfs.f_type == 0x3153464a /* jfs */ 2877 || sfs.f_type == 0x3153464a /* jfs */
… …
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3262embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3263{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3264 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3265
3121 { 3266 {
3122 struct ev_loop *loop = w->other; 3267 EV_P = w->other;
3123 3268
3124 while (fdchangecnt) 3269 while (fdchangecnt)
3125 { 3270 {
3126 fd_reify (EV_A); 3271 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3272 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3135 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3280 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3136 3281
3137 ev_embed_stop (EV_A_ w); 3282 ev_embed_stop (EV_A_ w);
3138 3283
3139 { 3284 {
3140 struct ev_loop *loop = w->other; 3285 EV_P = w->other;
3141 3286
3142 ev_loop_fork (EV_A); 3287 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3288 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3144 } 3289 }
3145 3290
… …
3159{ 3304{
3160 if (expect_false (ev_is_active (w))) 3305 if (expect_false (ev_is_active (w)))
3161 return; 3306 return;
3162 3307
3163 { 3308 {
3164 struct ev_loop *loop = w->other; 3309 EV_P = w->other;
3165 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3310 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3166 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3167 } 3312 }
3168 3313
3169 EV_FREQUENT_CHECK; 3314 EV_FREQUENT_CHECK;
… …
3281 3426
3282void 3427void
3283ev_async_send (EV_P_ ev_async *w) 3428ev_async_send (EV_P_ ev_async *w)
3284{ 3429{
3285 w->sent = 1; 3430 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3431 evpipe_write (EV_A_ &async_pending);
3287} 3432}
3288#endif 3433#endif
3289 3434
3290/*****************************************************************************/ 3435/*****************************************************************************/
3291 3436
… …
3440 if (types & EV_CHECK) 3585 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3586 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3587 cb (EV_A_ EV_CHECK, checks [i]);
3443 3588
3444 if (types & EV_SIGNAL) 3589 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3590 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3591 for (wl = signals [i].head; wl; )
3447 { 3592 {
3448 wn = wl->next; 3593 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3594 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3595 wl = wn;

Diff Legend

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