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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC

… …
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
… …
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
… …
210#elif defined (_sys_nsig) 211#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 213#else
213# error "unable to find value for NSIG, please report" 214# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 215/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 64 216# define EV_NSIG 65
216#endif 217#endif
217 218
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
228# else 222# else
229# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
… …
309# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
310# endif 304# endif
311#endif 305#endif
312 306
313#ifndef EV_USE_SIGNALFD 307#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 309# define EV_USE_SIGNALFD 1
316# else 310# else
317# define EV_USE_SIGNALFD 0 311# define EV_USE_SIGNALFD 0
318# endif 312# endif
319#endif 313#endif
… …
350# endif 344# endif
351#endif 345#endif
352 346
353/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
354 348
349#ifdef _AIX
350/* AIX has a completely broken poll.h header */
351# undef EV_USE_POLL
352# define EV_USE_POLL 0
353#endif
354
355#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
358#endif 358#endif
359 359
… …
393# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK 394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 395# define EFD_NONBLOCK O_NONBLOCK
396# endif 396# endif
397# ifndef EFD_CLOEXEC 397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
399# endif 403# endif
400# ifdef __cplusplus 404# ifdef __cplusplus
401extern "C" { 405extern "C" {
402# endif 406# endif
403int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
… …
405} 409}
406# endif 410# endif
407#endif 411#endif
408 412
409#if EV_USE_SIGNALFD 413#if EV_USE_SIGNALFD
410# include <sys/signalfd.h> 414/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
415# include <stdint.h>
416# ifndef SFD_NONBLOCK
417# define SFD_NONBLOCK O_NONBLOCK
411#endif 418# endif
419# ifndef SFD_CLOEXEC
420# ifdef O_CLOEXEC
421# define SFD_CLOEXEC O_CLOEXEC
422# else
423# define SFD_CLOEXEC 02000000
424# endif
425# endif
426# ifdef __cplusplus
427extern "C" {
428# endif
429int signalfd (int fd, const sigset_t *mask, int flags);
430
431struct signalfd_siginfo
432{
433 uint32_t ssi_signo;
434 char pad[128 - sizeof (uint32_t)];
435};
436# ifdef __cplusplus
437}
438# endif
439#endif
440
412 441
413/**/ 442/**/
414 443
415#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
428 */ 457 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 459
431#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 460#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
432#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 461#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
433/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
434 462
435#if __GNUC__ >= 4 463#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
438#else 466#else
… …
477static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
478#endif 506#endif
479 507
480#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
510#endif
511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
482#endif 520#endif
483 521
484#ifdef _WIN32 522#ifdef _WIN32
485# include "ev_win32.c" 523# include "ev_win32.c"
486#endif 524#endif
… …
879 917
880#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
881 if (events) 919 if (events)
882 { 920 {
883 unsigned long arg; 921 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
886 #else
887 anfd->handle = _get_osfhandle (fd);
888 #endif
889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 924 }
891#endif 925#endif
892 926
893 { 927 {
… …
936/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
937inline_size int 971inline_size int
938fd_valid (int fd) 972fd_valid (int fd)
939{ 973{
940#ifdef _WIN32 974#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 976#else
943 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
944#endif 978#endif
945} 979}
946 980
… …
964 998
965 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1000 if (anfds [fd].events)
967 { 1001 {
968 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
969 return; 1003 break;
970 } 1004 }
971} 1005}
972 1006
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1007/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1008static void noinline
… …
1064 1098
1065 for (;;) 1099 for (;;)
1066 { 1100 {
1067 int c = k << 1; 1101 int c = k << 1;
1068 1102
1069 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
1070 break; 1104 break;
1071 1105
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1106 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1107 ? 1 : 0;
1074 1108
… …
1110 1144
1111/* move an element suitably so it is in a correct place */ 1145/* move an element suitably so it is in a correct place */
1112inline_size void 1146inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
1114{ 1148{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1149 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1150 upheap (heap, k);
1117 else 1151 else
1118 downheap (heap, N, k); 1152 downheap (heap, N, k);
1119} 1153}
1120 1154
… …
1133/*****************************************************************************/ 1167/*****************************************************************************/
1134 1168
1135/* associate signal watchers to a signal signal */ 1169/* associate signal watchers to a signal signal */
1136typedef struct 1170typedef struct
1137{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
1138 WL head; 1176 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1177} ANSIG;
1141 1178
1142static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1180
1147/*****************************************************************************/ 1181/*****************************************************************************/
1148 1182
1149/* used to prepare libev internal fd's */ 1183/* used to prepare libev internal fd's */
1150/* this is not fork-safe */ 1184/* this is not fork-safe */
1151inline_speed void 1185inline_speed void
1152fd_intern (int fd) 1186fd_intern (int fd)
1153{ 1187{
1154#ifdef _WIN32 1188#ifdef _WIN32
1155 unsigned long arg = 1; 1189 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1157#else 1191#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif 1194#endif
1161} 1195}
… …
1218/* called whenever the libev signal pipe */ 1252/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1253/* got some events (signal, async) */
1220static void 1254static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1256{
1257 int i;
1258
1223#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1260 if (evfd >= 0)
1225 { 1261 {
1226 uint64_t counter; 1262 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
… …
1231 { 1267 {
1232 char dummy; 1268 char dummy;
1233 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1234 } 1270 }
1235 1271
1236 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1237 { 1273 {
1238 int signum; 1274 sig_pending = 0;
1239 gotsig = 0;
1240 1275
1241 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1279 }
1245 1280
1246#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1247 if (gotasync) 1282 if (async_pending)
1248 { 1283 {
1249 int i; 1284 async_pending = 0;
1250 gotasync = 0;
1251 1285
1252 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1254 { 1288 {
1255 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
… …
1263 1297
1264static void 1298static void
1265ev_sighandler (int signum) 1299ev_sighandler (int signum)
1266{ 1300{
1267#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1269#endif 1303#endif
1270 1304
1271#if _WIN32 1305#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1273#endif 1307#endif
1274 1308
1275 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1277} 1311}
1278 1312
1279void noinline 1313void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1281{ 1315{
1282 WL w; 1316 WL w;
1283 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1284#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1324 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1326
1288 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1328 return;
1329#endif
1292 1330
1293 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1294 1332
1295 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1335}
1298 1336
1299#if EV_USE_SIGNALFD 1337#if EV_USE_SIGNALFD
1300static void 1338static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1339sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1340{
1303 struct signalfd_siginfo si[4], *sip; 1341 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1342
1305 for (;;) 1343 for (;;)
1306 { 1344 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1345 ssize_t res = read (sigfd, si, sizeof (si));
1308 1346
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1581 have_monotonic = 1;
1544 } 1582 }
1545#endif 1583#endif
1546 1584
1585 /* pid check not overridable via env */
1586#ifndef _WIN32
1587 if (flags & EVFLAG_FORKCHECK)
1588 curpid = getpid ();
1589#endif
1590
1591 if (!(flags & EVFLAG_NOENV)
1592 && !enable_secure ()
1593 && getenv ("LIBEV_FLAGS"))
1594 flags = atoi (getenv ("LIBEV_FLAGS"));
1595
1547 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1597 mn_now = get_clock ();
1549 now_floor = mn_now; 1598 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1599 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1600#if EV_MINIMAL < 2
… …
1554 1603
1555 io_blocktime = 0.; 1604 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1557 backend = 0; 1606 backend = 0;
1558 backend_fd = -1; 1607 backend_fd = -1;
1559 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1560#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1561 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1614#endif
1563#if EV_USE_SIGNALFD 1615#if EV_USE_SIGNALFD
1564 sigfd = -2; 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1617#endif
1566
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV)
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577 1618
1578 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1580 1621
1581#if EV_USE_PORT 1622#if EV_USE_PORT
… …
1617 close (evfd); 1658 close (evfd);
1618#endif 1659#endif
1619 1660
1620 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1621 { 1662 {
1622 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1665 }
1625 } 1666 }
1626 1667
1627#if EV_USE_SIGNALFD 1668#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1669 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1670 close (sigfd);
1634 }
1635#endif 1671#endif
1636 1672
1637#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1639 close (fs_fd); 1675 close (fs_fd);
… …
1709 1745
1710 if (ev_is_active (&pipe_w)) 1746 if (ev_is_active (&pipe_w))
1711 { 1747 {
1712 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1714 gotsig = 1; 1750 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1752 async_pending = 1;
1717#endif 1753#endif
1718 1754
1719 ev_ref (EV_A); 1755 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1756 ev_io_stop (EV_A_ &pipe_w);
1721 1757
… …
1724 close (evfd); 1760 close (evfd);
1725#endif 1761#endif
1726 1762
1727 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1728 { 1764 {
1729 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1767 }
1732 1768
1733 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1741#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1742 1778
1743struct ev_loop * 1779struct ev_loop *
1744ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1745{ 1781{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1782 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1783
1748 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1750 1786
1751 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1752 return loop; 1788 return EV_A;
1753 1789
1754 return 0; 1790 return 0;
1755} 1791}
1756 1792
1757void 1793void
… …
1861 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1863 1899
1864# if 0 1900# if 0
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1901 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1867# endif 1903# endif
1868#endif 1904#endif
1869} 1905}
1870#endif 1906#endif
1871 1907
… …
1878#endif 1914#endif
1879{ 1915{
1880 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1881 { 1917 {
1882#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1920#else
1885 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1886#endif 1922#endif
1887 1923
1888 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
… …
1905 1941
1906void 1942void
1907ev_default_destroy (void) 1943ev_default_destroy (void)
1908{ 1944{
1909#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1911#endif 1947#endif
1912 1948
1913 ev_default_loop_ptr = 0; 1949 ev_default_loop_ptr = 0;
1914 1950
1915#ifndef _WIN32 1951#ifndef _WIN32
… …
1922 1958
1923void 1959void
1924ev_default_fork (void) 1960ev_default_fork (void)
1925{ 1961{
1926#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1928#endif 1964#endif
1929 1965
1930 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1931} 1967}
1932 1968
… …
2127 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
2128 } 2164 }
2129} 2165}
2130 2166
2131/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2169inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
2135{ 2171{
2136#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
… …
2398inline_size void 2434inline_size void
2399wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2400{ 2436{
2401 while (*head) 2437 while (*head)
2402 { 2438 {
2403 if (*head == elem) 2439 if (expect_true (*head == elem))
2404 { 2440 {
2405 *head = elem->next; 2441 *head = elem->next;
2406 return; 2442 break;
2407 } 2443 }
2408 2444
2409 head = &(*head)->next; 2445 head = &(*head)->next;
2410 } 2446 }
2411} 2447}
… …
2665#endif 2701#endif
2666 2702
2667void noinline 2703void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2669{ 2705{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2706 if (expect_false (ev_is_active (w)))
2674 return; 2707 return;
2675 2708
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2709 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2710
2711#if EV_MULTIPLICITY
2712 assert (("libev: a signal must not be attached to two different loops",
2713 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2714
2715 signals [w->signum - 1].loop = EV_A;
2716#endif
2677 2717
2678 EV_FREQUENT_CHECK; 2718 EV_FREQUENT_CHECK;
2679 2719
2680#if EV_USE_SIGNALFD 2720#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2721 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2743 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2744 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2745
2706 signalfd (sigfd, &sigfd_set, 0); 2746 signalfd (sigfd, &sigfd_set, 0);
2707 } 2747 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2748#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2749
2730 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2752
2733 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2754# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2755 if (sigfd < 0) /*TODO*/
2740# endif 2756# endif
2741 { 2757 {
2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2761 signal (w->signum, ev_sighandler);
2762# else
2742 struct sigaction sa = { }; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2743 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2769 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2770 sigaction (w->signum, &sa, 0);
2771
2772 sigemptyset (&sa.sa_mask);
2773 sigaddset (&sa.sa_mask, w->signum);
2774 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2775#endif
2747 } 2776 }
2748#endif
2749 }
2750 2777
2751 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2752} 2779}
2753 2780
2754void noinline 2781void noinline
… …
2762 2789
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2765 2792
2766 if (!signals [w->signum - 1].head) 2793 if (!signals [w->signum - 1].head)
2794 {
2795#if EV_MULTIPLICITY
2796 signals [w->signum - 1].loop = 0; /* unattach from signal */
2797#endif
2767#if EV_USE_SIGNALFD 2798#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2799 if (sigfd >= 0)
2769 { 2800 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2805 sigdelset (&sigfd_set, w->signum);
2806
2772 signalfd (sigfd, &sigfd_set, 0); 2807 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2809 }
2776 else 2810 else
2777#endif 2811#endif
2778 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2779 2814
2780 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2781} 2816}
2782 2817
2783void 2818void
… …
2831static void noinline 2866static void noinline
2832infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2833{ 2868{
2834 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); 2869 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);
2835 2870
2836 if (w->wd < 0) 2871 if (w->wd >= 0)
2872 {
2873 struct statfs sfs;
2874
2875 /* now local changes will be tracked by inotify, but remote changes won't */
2876 /* unless the filesystem is known to be local, we therefore still poll */
2877 /* also do poll on <2.6.25, but with normal frequency */
2878
2879 if (!fs_2625)
2880 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2881 else if (!statfs (w->path, &sfs)
2882 && (sfs.f_type == 0x1373 /* devfs */
2883 || sfs.f_type == 0xEF53 /* ext2/3 */
2884 || sfs.f_type == 0x3153464a /* jfs */
2885 || sfs.f_type == 0x52654973 /* reiser3 */
2886 || sfs.f_type == 0x01021994 /* tempfs */
2887 || sfs.f_type == 0x58465342 /* xfs */))
2888 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2889 else
2890 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2839 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2840 2896
2841 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2842 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 2901 {
2846 char path [4096]; 2902 char path [4096];
… …
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 2919 }
2864 } 2920 }
2865 2921
2866 if (w->wd >= 0) 2922 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2923 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869 2924
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2926 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874
2875 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */)
2882 return;
2883
2884 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2885 ev_timer_again (EV_A_ &w->timer); 2927 ev_timer_again (EV_A_ &w->timer);
2886 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 2929}
2888 2930
2889static void noinline 2931static void noinline
2890infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2891{ 2933{
… …
2967 return; 3009 return;
2968 3010
2969 fs_2625 = 1; 3011 fs_2625 = 1;
2970} 3012}
2971 3013
3014inline_size int
3015infy_newfd (void)
3016{
3017#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3018 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3019 if (fd >= 0)
3020 return fd;
3021#endif
3022 return inotify_init ();
3023}
3024
2972inline_size void 3025inline_size void
2973infy_init (EV_P) 3026infy_init (EV_P)
2974{ 3027{
2975 if (fs_fd != -2) 3028 if (fs_fd != -2)
2976 return; 3029 return;
2977 3030
2978 fs_fd = -1; 3031 fs_fd = -1;
2979 3032
2980 check_2625 (EV_A); 3033 check_2625 (EV_A);
2981 3034
2982 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2983 3036
2984 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2985 { 3038 {
3039 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2989 } 3044 }
2990} 3045}
2991 3046
2992inline_size void 3047inline_size void
2993infy_fork (EV_P) 3048infy_fork (EV_P)
… …
2995 int slot; 3050 int slot;
2996 3051
2997 if (fs_fd < 0) 3052 if (fs_fd < 0)
2998 return; 3053 return;
2999 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3057 close (fs_fd);
3001 fs_fd = inotify_init (); 3058 fs_fd = infy_newfd ();
3059
3060 if (fs_fd >= 0)
3061 {
3062 fd_intern (fs_fd);
3063 ev_io_set (&fs_w, fs_fd, EV_READ);
3064 ev_io_start (EV_A_ &fs_w);
3065 ev_unref (EV_A);
3066 }
3002 3067
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3004 { 3069 {
3005 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
… …
3013 w->wd = -1; 3078 w->wd = -1;
3014 3079
3015 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3082 else
3083 {
3084 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3085 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3086 ev_timer_again (EV_A_ &w->timer);
3087 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3088 }
3019 } 3089 }
3020 } 3090 }
3021} 3091}
3022 3092
3023#endif 3093#endif
… …
3040static void noinline 3110static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3112{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3114
3045 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
3046 /* prev has the old value when the callback gets invoked */
3047 w->prev = w->attr;
3048 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
3049 3117
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3118 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3119 if (
3052 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3131 ) {
3132 /* we only update w->prev on actual differences */
3133 /* in case we test more often than invoke the callback, */
3134 /* to ensure that prev is always different to attr */
3135 w->prev = prev;
3136
3064 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
3066 { 3139 {
3067 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
… …
3093 3166
3094 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
3096 else 3169 else
3097#endif 3170#endif
3171 {
3098 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
3099 3175
3100 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
3101 3177
3102 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
3103} 3179}
… …
3112 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
3113 3189
3114#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
3116#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
3118 3199
3119 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
3120 3201
3121 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
3122} 3203}
… …
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3345{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3347
3267 { 3348 {
3268 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
3269 3350
3270 while (fdchangecnt) 3351 while (fdchangecnt)
3271 { 3352 {
3272 fd_reify (EV_A); 3353 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3362 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3363
3283 ev_embed_stop (EV_A_ w); 3364 ev_embed_stop (EV_A_ w);
3284 3365
3285 { 3366 {
3286 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
3287 3368
3288 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3371 }
3291 3372
… …
3305{ 3386{
3306 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3307 return; 3388 return;
3308 3389
3309 { 3390 {
3310 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3392 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3312 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3393 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3394 }
3314 3395
3315 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
… …
3427 3508
3428void 3509void
3429ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3430{ 3511{
3431 w->sent = 1; 3512 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3433} 3514}
3434#endif 3515#endif
3435 3516
3436/*****************************************************************************/ 3517/*****************************************************************************/
3437 3518
… …
3586 if (types & EV_CHECK) 3667 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3668 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3669 cb (EV_A_ EV_CHECK, checks [i]);
3589 3670
3590 if (types & EV_SIGNAL) 3671 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3672 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3673 for (wl = signals [i].head; wl; )
3593 { 3674 {
3594 wn = wl->next; 3675 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3676 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3677 wl = wn;

Diff Legend

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