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.320 by root, Fri Dec 4 20:25:06 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
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
178# endif 187# endif
179#endif 188#endif
180 189
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
182 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
183#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
186# else 222# else
187# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
263#ifndef EV_USE_EVENTFD 299#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 301# define EV_USE_EVENTFD 1
266# else 302# else
267# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
304# endif
305#endif
306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
268# endif 312# endif
269#endif 313#endif
270 314
271#if 0 /* debugging */ 315#if 0 /* debugging */
272# define EV_VERIFY 3 316# define EV_VERIFY 3
339#endif 383#endif
340 384
341#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
397# endif
344# ifdef __cplusplus 398# ifdef __cplusplus
345extern "C" { 399extern "C" {
346# endif 400# endif
347int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 402# ifdef __cplusplus
349} 403}
350# endif 404# endif
351#endif 405#endif
406
407#if EV_USE_SIGNALFD
408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
352 435
353/**/ 436/**/
354 437
355#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 451 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 453
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 455#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 456
375#if __GNUC__ >= 4 457#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
378#else 460#else
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 500#endif
419 501
420#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504#endif
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)
422#endif 514#endif
423 515
424#ifdef _WIN32 516#ifdef _WIN32
425# include "ev_win32.c" 517# include "ev_win32.c"
426#endif 518#endif
819 911
820#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
821 if (events) 913 if (events)
822 { 914 {
823 unsigned long arg; 915 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
826 #else
827 anfd->handle = _get_osfhandle (fd);
828 #endif
829 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));
830 } 918 }
831#endif 919#endif
832 920
833 { 921 {
904 992
905 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 994 if (anfds [fd].events)
907 { 995 {
908 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
909 return; 997 break;
910 } 998 }
911} 999}
912 1000
913/* 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 */
914static void noinline 1002static void noinline
1004 1092
1005 for (;;) 1093 for (;;)
1006 { 1094 {
1007 int c = k << 1; 1095 int c = k << 1;
1008 1096
1009 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
1010 break; 1098 break;
1011 1099
1012 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])
1013 ? 1 : 0; 1101 ? 1 : 0;
1014 1102
1050 1138
1051/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1052inline_size void 1140inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1054{ 1142{
1055 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)]))
1056 upheap (heap, k); 1144 upheap (heap, k);
1057 else 1145 else
1058 downheap (heap, N, k); 1146 downheap (heap, N, k);
1059} 1147}
1060 1148
1073/*****************************************************************************/ 1161/*****************************************************************************/
1074 1162
1075/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1076typedef struct 1164typedef struct
1077{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1078 WL head; 1170 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1171} ANSIG;
1081 1172
1082static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1174
1087/*****************************************************************************/ 1175/*****************************************************************************/
1088 1176
1089/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1090/* this is not fork-safe */ 1178/* this is not fork-safe */
1104evpipe_init (EV_P) 1192evpipe_init (EV_P)
1105{ 1193{
1106 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1107 { 1195 {
1108#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1110 { 1202 {
1111 evpipe [0] = -1; 1203 evpipe [0] = -1;
1112 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1206 }
1115 else 1207 else
1116#endif 1208#endif
1117 { 1209 {
1154/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1156static void 1248static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1250{
1251 int i;
1252
1159#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1254 if (evfd >= 0)
1161 { 1255 {
1162 uint64_t counter; 1256 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1167 { 1261 {
1168 char dummy; 1262 char dummy;
1169 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1170 } 1264 }
1171 1265
1172 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1173 { 1267 {
1174 int signum; 1268 sig_pending = 0;
1175 gotsig = 0;
1176 1269
1177 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1273 }
1181 1274
1182#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1183 if (gotasync) 1276 if (async_pending)
1184 { 1277 {
1185 int i; 1278 async_pending = 0;
1186 gotasync = 0;
1187 1279
1188 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1190 { 1282 {
1191 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1199 1291
1200static void 1292static void
1201ev_sighandler (int signum) 1293ev_sighandler (int signum)
1202{ 1294{
1203#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1205#endif 1297#endif
1206 1298
1207#if _WIN32 1299#if _WIN32
1208 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1209#endif 1301#endif
1210 1302
1211 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1213} 1305}
1214 1306
1215void noinline 1307void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1217{ 1309{
1218 WL w; 1310 WL w;
1219 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1220#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1221 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 */
1222#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1320
1224 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1322 return;
1323#endif
1228 1324
1229 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1230 1326
1231 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1329}
1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1234 1350
1235/*****************************************************************************/ 1351/*****************************************************************************/
1236 1352
1237static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1238 1354
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1575 have_monotonic = 1;
1460 } 1576 }
1461#endif 1577#endif
1462 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
1463 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1591 mn_now = get_clock ();
1465 now_floor = mn_now; 1592 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1594#if EV_MINIMAL < 2
1470 1597
1471 io_blocktime = 0.; 1598 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1473 backend = 0; 1600 backend = 0;
1474 backend_fd = -1; 1601 backend_fd = -1;
1475 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1476#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1477 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1608#endif
1479 1609#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1611#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1612
1491 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1493 1615
1494#if EV_USE_PORT 1616#if EV_USE_PORT
1520{ 1642{
1521 int i; 1643 int i;
1522 1644
1523 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1524 { 1646 {
1525 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1649
1528#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1651 if (evfd >= 0)
1530 close (evfd); 1652 close (evfd);
1531#endif 1653#endif
1532 1654
1533 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1534 { 1656 {
1535 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1659 }
1538 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1539 1666
1540#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1542 close (fs_fd); 1669 close (fs_fd);
1543#endif 1670#endif
1567#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1695 array_free (idle, [i]);
1569#endif 1696#endif
1570 } 1697 }
1571 1698
1572 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1700
1574 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1702 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1612 1739
1613 if (ev_is_active (&pipe_w)) 1740 if (ev_is_active (&pipe_w))
1614 { 1741 {
1615 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1617 gotsig = 1; 1744 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1746 async_pending = 1;
1620#endif 1747#endif
1621 1748
1622 ev_ref (EV_A); 1749 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1750 ev_io_stop (EV_A_ &pipe_w);
1624 1751
1627 close (evfd); 1754 close (evfd);
1628#endif 1755#endif
1629 1756
1630 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1631 { 1758 {
1632 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1761 }
1635 1762
1636 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1644#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1645 1772
1646struct ev_loop * 1773struct ev_loop *
1647ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1648{ 1775{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1776 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1777
1651 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1654 1780
1655 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1656 return loop; 1782 return EV_A;
1657 1783
1658 return 0; 1784 return 0;
1659} 1785}
1660 1786
1661void 1787void
1765 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1767 1893
1768# if 0 1894# if 0
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1895 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) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1771# endif 1897# endif
1772#endif 1898#endif
1773} 1899}
1774#endif 1900#endif
1775 1901
1782#endif 1908#endif
1783{ 1909{
1784 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1785 { 1911 {
1786#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1914#else
1789 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1790#endif 1916#endif
1791 1917
1792 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
1809 1935
1810void 1936void
1811ev_default_destroy (void) 1937ev_default_destroy (void)
1812{ 1938{
1813#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1815#endif 1941#endif
1816 1942
1817 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1818 1944
1819#ifndef _WIN32 1945#ifndef _WIN32
1826 1952
1827void 1953void
1828ev_default_fork (void) 1954ev_default_fork (void)
1829{ 1955{
1830#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1832#endif 1958#endif
1833 1959
1834 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1835} 1961}
1836 1962
2302inline_size void 2428inline_size void
2303wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2304{ 2430{
2305 while (*head) 2431 while (*head)
2306 { 2432 {
2307 if (*head == elem) 2433 if (expect_true (*head == elem))
2308 { 2434 {
2309 *head = elem->next; 2435 *head = elem->next;
2310 return; 2436 break;
2311 } 2437 }
2312 2438
2313 head = &(*head)->next; 2439 head = &(*head)->next;
2314 } 2440 }
2315} 2441}
2569#endif 2695#endif
2570 2696
2571void noinline 2697void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2573{ 2699{
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))) 2700 if (expect_false (ev_is_active (w)))
2578 return; 2701 return;
2579 2702
2580 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2703 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2581 2704
2582 evpipe_init (EV_A); 2705#if EV_MULTIPLICITY
2706 assert (("libev: a signal must not be attached to two different loops",
2707 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2583 2708
2584 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2585 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2586 { 2716 {
2587#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2720
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2721 if (sigfd >= 0)
2722 {
2723 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2724
2595#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2597#endif 2727 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2728 ev_set_priority (&sigfd_w, EV_MAXPRI);
2729 ev_io_start (EV_A_ &sigfd_w);
2730 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2731 }
2598 } 2732 }
2733
2734 if (sigfd >= 0)
2735 {
2736 /* TODO: check .head */
2737 sigaddset (&sigfd_set, w->signum);
2738 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2739
2740 signalfd (sigfd, &sigfd_set, 0);
2741 }
2742#endif
2599 2743
2600 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2746
2603 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2604 { 2751 {
2605#if _WIN32 2752# if _WIN32
2753 evpipe_init (EV_A);
2754
2606 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2607#else 2756# else
2608 struct sigaction sa = { }; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2609 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2611 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2763 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2612 sigaction (w->signum, &sa, 0); 2764 sigaction (w->signum, &sa, 0);
2765
2766 sigemptyset (&sa.sa_mask);
2767 sigaddset (&sa.sa_mask, w->signum);
2768 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2613#endif 2769#endif
2614 } 2770 }
2615 2771
2616 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2617} 2773}
2618 2774
2619void noinline 2775void noinline
2627 2783
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2630 2786
2631 if (!signals [w->signum - 1].head) 2787 if (!signals [w->signum - 1].head)
2788 {
2789#if EV_MULTIPLICITY
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif
2792#if EV_USE_SIGNALFD
2793 if (sigfd >= 0)
2794 {
2795 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2796 sigdelset (&sigfd_set, w->signum);
2797 signalfd (sigfd, &sigfd_set, 0);
2798 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2799 /*TODO: maybe unblock signal? */
2800 }
2801 else
2802#endif
2632 signal (w->signum, SIG_DFL); 2803 signal (w->signum, SIG_DFL);
2804 }
2633 2805
2634 EV_FREQUENT_CHECK; 2806 EV_FREQUENT_CHECK;
2635} 2807}
2636 2808
2637void 2809void
2685static void noinline 2857static void noinline
2686infy_add (EV_P_ ev_stat *w) 2858infy_add (EV_P_ ev_stat *w)
2687{ 2859{
2688 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); 2860 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);
2689 2861
2690 if (w->wd < 0) 2862 if (w->wd >= 0)
2863 {
2864 struct statfs sfs;
2865
2866 /* now local changes will be tracked by inotify, but remote changes won't */
2867 /* unless the filesystem is known to be local, we therefore still poll */
2868 /* also do poll on <2.6.25, but with normal frequency */
2869
2870 if (!fs_2625)
2871 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2872 else if (!statfs (w->path, &sfs)
2873 && (sfs.f_type == 0x1373 /* devfs */
2874 || sfs.f_type == 0xEF53 /* ext2/3 */
2875 || sfs.f_type == 0x3153464a /* jfs */
2876 || sfs.f_type == 0x52654973 /* reiser3 */
2877 || sfs.f_type == 0x01021994 /* tempfs */
2878 || sfs.f_type == 0x58465342 /* xfs */))
2879 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2880 else
2881 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2691 { 2882 }
2883 else
2884 {
2885 /* can't use inotify, continue to stat */
2692 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2886 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2693 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2694 2887
2695 /* monitor some parent directory for speedup hints */ 2888 /* if path is not there, monitor some parent directory for speedup hints */
2696 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2889 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2697 /* but an efficiency issue only */ 2890 /* but an efficiency issue only */
2698 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2891 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2699 { 2892 {
2700 char path [4096]; 2893 char path [4096];
2716 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2909 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2717 } 2910 }
2718 } 2911 }
2719 2912
2720 if (w->wd >= 0) 2913 if (w->wd >= 0)
2721 {
2722 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2914 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2723 2915
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 2916 /* now re-arm timer, if required */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 2917 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2726 /* also do poll on <2.6.25, but with normal frequency */
2727 struct statfs sfs;
2728
2729 if (fs_2625 && !statfs (w->path, &sfs))
2730 if (sfs.f_type == 0x1373 /* devfs */
2731 || sfs.f_type == 0xEF53 /* ext2/3 */
2732 || sfs.f_type == 0x3153464a /* jfs */
2733 || sfs.f_type == 0x52654973 /* reiser3 */
2734 || sfs.f_type == 0x01021994 /* tempfs */
2735 || sfs.f_type == 0x58465342 /* xfs */)
2736 return;
2737
2738 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2739 ev_timer_again (EV_A_ &w->timer); 2918 ev_timer_again (EV_A_ &w->timer);
2740 } 2919 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2741} 2920}
2742 2921
2743static void noinline 2922static void noinline
2744infy_del (EV_P_ ev_stat *w) 2923infy_del (EV_P_ ev_stat *w)
2745{ 2924{
2821 return; 3000 return;
2822 3001
2823 fs_2625 = 1; 3002 fs_2625 = 1;
2824} 3003}
2825 3004
3005inline_size int
3006infy_newfd (void)
3007{
3008#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3009 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3010 if (fd >= 0)
3011 return fd;
3012#endif
3013 return inotify_init ();
3014}
3015
2826inline_size void 3016inline_size void
2827infy_init (EV_P) 3017infy_init (EV_P)
2828{ 3018{
2829 if (fs_fd != -2) 3019 if (fs_fd != -2)
2830 return; 3020 return;
2831 3021
2832 fs_fd = -1; 3022 fs_fd = -1;
2833 3023
2834 check_2625 (EV_A); 3024 check_2625 (EV_A);
2835 3025
2836 fs_fd = inotify_init (); 3026 fs_fd = infy_newfd ();
2837 3027
2838 if (fs_fd >= 0) 3028 if (fs_fd >= 0)
2839 { 3029 {
3030 fd_intern (fs_fd);
2840 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3031 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2841 ev_set_priority (&fs_w, EV_MAXPRI); 3032 ev_set_priority (&fs_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &fs_w); 3033 ev_io_start (EV_A_ &fs_w);
3034 ev_unref (EV_A);
2843 } 3035 }
2844} 3036}
2845 3037
2846inline_size void 3038inline_size void
2847infy_fork (EV_P) 3039infy_fork (EV_P)
2849 int slot; 3041 int slot;
2850 3042
2851 if (fs_fd < 0) 3043 if (fs_fd < 0)
2852 return; 3044 return;
2853 3045
3046 ev_ref (EV_A);
3047 ev_io_stop (EV_A_ &fs_w);
2854 close (fs_fd); 3048 close (fs_fd);
2855 fs_fd = inotify_init (); 3049 fs_fd = infy_newfd ();
3050
3051 if (fs_fd >= 0)
3052 {
3053 fd_intern (fs_fd);
3054 ev_io_set (&fs_w, fs_fd, EV_READ);
3055 ev_io_start (EV_A_ &fs_w);
3056 ev_unref (EV_A);
3057 }
2856 3058
2857 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3059 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2858 { 3060 {
2859 WL w_ = fs_hash [slot].head; 3061 WL w_ = fs_hash [slot].head;
2860 fs_hash [slot].head = 0; 3062 fs_hash [slot].head = 0;
2867 w->wd = -1; 3069 w->wd = -1;
2868 3070
2869 if (fs_fd >= 0) 3071 if (fs_fd >= 0)
2870 infy_add (EV_A_ w); /* re-add, no matter what */ 3072 infy_add (EV_A_ w); /* re-add, no matter what */
2871 else 3073 else
3074 {
3075 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3076 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 ev_timer_again (EV_A_ &w->timer); 3077 ev_timer_again (EV_A_ &w->timer);
3078 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3079 }
2873 } 3080 }
2874 } 3081 }
2875} 3082}
2876 3083
2877#endif 3084#endif
2894static void noinline 3101static void noinline
2895stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3102stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2896{ 3103{
2897 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3104 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2898 3105
2899 /* we copy this here each the time so that */ 3106 ev_statdata prev = w->attr;
2900 /* prev has the old value when the callback gets invoked */
2901 w->prev = w->attr;
2902 ev_stat_stat (EV_A_ w); 3107 ev_stat_stat (EV_A_ w);
2903 3108
2904 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3109 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2905 if ( 3110 if (
2906 w->prev.st_dev != w->attr.st_dev 3111 prev.st_dev != w->attr.st_dev
2907 || w->prev.st_ino != w->attr.st_ino 3112 || prev.st_ino != w->attr.st_ino
2908 || w->prev.st_mode != w->attr.st_mode 3113 || prev.st_mode != w->attr.st_mode
2909 || w->prev.st_nlink != w->attr.st_nlink 3114 || prev.st_nlink != w->attr.st_nlink
2910 || w->prev.st_uid != w->attr.st_uid 3115 || prev.st_uid != w->attr.st_uid
2911 || w->prev.st_gid != w->attr.st_gid 3116 || prev.st_gid != w->attr.st_gid
2912 || w->prev.st_rdev != w->attr.st_rdev 3117 || prev.st_rdev != w->attr.st_rdev
2913 || w->prev.st_size != w->attr.st_size 3118 || prev.st_size != w->attr.st_size
2914 || w->prev.st_atime != w->attr.st_atime 3119 || prev.st_atime != w->attr.st_atime
2915 || w->prev.st_mtime != w->attr.st_mtime 3120 || prev.st_mtime != w->attr.st_mtime
2916 || w->prev.st_ctime != w->attr.st_ctime 3121 || prev.st_ctime != w->attr.st_ctime
2917 ) { 3122 ) {
3123 /* we only update w->prev on actual differences */
3124 /* in case we test more often than invoke the callback, */
3125 /* to ensure that prev is always different to attr */
3126 w->prev = prev;
3127
2918 #if EV_USE_INOTIFY 3128 #if EV_USE_INOTIFY
2919 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
2920 { 3130 {
2921 infy_del (EV_A_ w); 3131 infy_del (EV_A_ w);
2922 infy_add (EV_A_ w); 3132 infy_add (EV_A_ w);
2947 3157
2948 if (fs_fd >= 0) 3158 if (fs_fd >= 0)
2949 infy_add (EV_A_ w); 3159 infy_add (EV_A_ w);
2950 else 3160 else
2951#endif 3161#endif
3162 {
2952 ev_timer_again (EV_A_ &w->timer); 3163 ev_timer_again (EV_A_ &w->timer);
3164 ev_unref (EV_A);
3165 }
2953 3166
2954 ev_start (EV_A_ (W)w, 1); 3167 ev_start (EV_A_ (W)w, 1);
2955 3168
2956 EV_FREQUENT_CHECK; 3169 EV_FREQUENT_CHECK;
2957} 3170}
2966 EV_FREQUENT_CHECK; 3179 EV_FREQUENT_CHECK;
2967 3180
2968#if EV_USE_INOTIFY 3181#if EV_USE_INOTIFY
2969 infy_del (EV_A_ w); 3182 infy_del (EV_A_ w);
2970#endif 3183#endif
3184
3185 if (ev_is_active (&w->timer))
3186 {
3187 ev_ref (EV_A);
2971 ev_timer_stop (EV_A_ &w->timer); 3188 ev_timer_stop (EV_A_ &w->timer);
3189 }
2972 3190
2973 ev_stop (EV_A_ (W)w); 3191 ev_stop (EV_A_ (W)w);
2974 3192
2975 EV_FREQUENT_CHECK; 3193 EV_FREQUENT_CHECK;
2976} 3194}
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3335embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3336{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3337 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3338
3121 { 3339 {
3122 struct ev_loop *loop = w->other; 3340 EV_P = w->other;
3123 3341
3124 while (fdchangecnt) 3342 while (fdchangecnt)
3125 { 3343 {
3126 fd_reify (EV_A); 3344 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3345 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3135 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3353 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3136 3354
3137 ev_embed_stop (EV_A_ w); 3355 ev_embed_stop (EV_A_ w);
3138 3356
3139 { 3357 {
3140 struct ev_loop *loop = w->other; 3358 EV_P = w->other;
3141 3359
3142 ev_loop_fork (EV_A); 3360 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3361 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3144 } 3362 }
3145 3363
3159{ 3377{
3160 if (expect_false (ev_is_active (w))) 3378 if (expect_false (ev_is_active (w)))
3161 return; 3379 return;
3162 3380
3163 { 3381 {
3164 struct ev_loop *loop = w->other; 3382 EV_P = w->other;
3165 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3383 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); 3384 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3167 } 3385 }
3168 3386
3169 EV_FREQUENT_CHECK; 3387 EV_FREQUENT_CHECK;
3281 3499
3282void 3500void
3283ev_async_send (EV_P_ ev_async *w) 3501ev_async_send (EV_P_ ev_async *w)
3284{ 3502{
3285 w->sent = 1; 3503 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3504 evpipe_write (EV_A_ &async_pending);
3287} 3505}
3288#endif 3506#endif
3289 3507
3290/*****************************************************************************/ 3508/*****************************************************************************/
3291 3509
3440 if (types & EV_CHECK) 3658 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3659 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3660 cb (EV_A_ EV_CHECK, checks [i]);
3443 3661
3444 if (types & EV_SIGNAL) 3662 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3663 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3664 for (wl = signals [i].head; wl; )
3447 { 3665 {
3448 wn = wl->next; 3666 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3667 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3668 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines