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.324 by root, Sat Jan 23 20:15:57 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
… …
393# include <stdint.h> 387# include <stdint.h>
394# ifndef EFD_NONBLOCK 388# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 389# define EFD_NONBLOCK O_NONBLOCK
396# endif 390# endif
397# ifndef EFD_CLOEXEC 391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
399# endif 397# endif
400# ifdef __cplusplus 398# ifdef __cplusplus
401extern "C" { 399extern "C" {
402# endif 400# endif
403int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
… …
405} 403}
406# endif 404# endif
407#endif 405#endif
408 406
409#if EV_USE_SIGNALFD 407#if EV_USE_SIGNALFD
410# include <sys/signalfd.h> 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
411#endif 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
412 435
413/**/ 436/**/
414 437
415#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
428 */ 451 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 453
431#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) */
432#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) */
433/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
434 456
435#if __GNUC__ >= 4 457#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
438#else 460#else
… …
477static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
478#endif 500#endif
479 501
480#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
481static 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 (handle, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
482#endif 514#endif
483 515
484#ifdef _WIN32 516#ifdef _WIN32
485# include "ev_win32.c" 517# include "ev_win32.c"
486#endif 518#endif
… …
879 911
880#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
881 if (events) 913 if (events)
882 { 914 {
883 unsigned long arg; 915 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 918 }
891#endif 919#endif
892 920
893 { 921 {
… …
936/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
937inline_size int 965inline_size int
938fd_valid (int fd) 966fd_valid (int fd)
939{ 967{
940#ifdef _WIN32 968#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 970#else
943 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
944#endif 972#endif
945} 973}
946 974
… …
964 992
965 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 994 if (anfds [fd].events)
967 { 995 {
968 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
969 return; 997 break;
970 } 998 }
971} 999}
972 1000
973/* 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 */
974static void noinline 1002static void noinline
… …
1064 1092
1065 for (;;) 1093 for (;;)
1066 { 1094 {
1067 int c = k << 1; 1095 int c = k << 1;
1068 1096
1069 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
1070 break; 1098 break;
1071 1099
1072 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])
1073 ? 1 : 0; 1101 ? 1 : 0;
1074 1102
… …
1110 1138
1111/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1112inline_size void 1140inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1114{ 1142{
1115 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)]))
1116 upheap (heap, k); 1144 upheap (heap, k);
1117 else 1145 else
1118 downheap (heap, N, k); 1146 downheap (heap, N, k);
1119} 1147}
1120 1148
… …
1133/*****************************************************************************/ 1161/*****************************************************************************/
1134 1162
1135/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1136typedef struct 1164typedef struct
1137{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1138 WL head; 1170 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1171} ANSIG;
1141 1172
1142static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1174
1147/*****************************************************************************/ 1175/*****************************************************************************/
1148 1176
1149/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1150/* this is not fork-safe */ 1178/* this is not fork-safe */
1151inline_speed void 1179inline_speed void
1152fd_intern (int fd) 1180fd_intern (int fd)
1153{ 1181{
1154#ifdef _WIN32 1182#ifdef _WIN32
1155 unsigned long arg = 1; 1183 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1157#else 1185#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif 1188#endif
1161} 1189}
… …
1218/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1220static void 1248static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1250{
1251 int i;
1252
1223#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1254 if (evfd >= 0)
1225 { 1255 {
1226 uint64_t counter; 1256 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1231 { 1261 {
1232 char dummy; 1262 char dummy;
1233 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1234 } 1264 }
1235 1265
1236 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1237 { 1267 {
1238 int signum; 1268 sig_pending = 0;
1239 gotsig = 0;
1240 1269
1241 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1273 }
1245 1274
1246#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1247 if (gotasync) 1276 if (async_pending)
1248 { 1277 {
1249 int i; 1278 async_pending = 0;
1250 gotasync = 0;
1251 1279
1252 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1254 { 1282 {
1255 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1263 1291
1264static void 1292static void
1265ev_sighandler (int signum) 1293ev_sighandler (int signum)
1266{ 1294{
1267#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1269#endif 1297#endif
1270 1298
1271#if _WIN32 1299#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1273#endif 1301#endif
1274 1302
1275 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1277} 1305}
1278 1306
1279void noinline 1307void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1281{ 1309{
1282 WL w; 1310 WL w;
1283 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1284#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1285 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 */
1286#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1320
1288 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1322 return;
1323#endif
1292 1324
1293 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1294 1326
1295 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1329}
1298 1330
1299#if EV_USE_SIGNALFD 1331#if EV_USE_SIGNALFD
1300static void 1332static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1333sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1334{
1303 struct signalfd_siginfo si[4], *sip; 1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1336
1305 for (;;) 1337 for (;;)
1306 { 1338 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1339 ssize_t res = read (sigfd, si, sizeof (si));
1308 1340
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1575 have_monotonic = 1;
1544 } 1576 }
1545#endif 1577#endif
1546 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
1547 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1591 mn_now = get_clock ();
1549 now_floor = mn_now; 1592 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1594#if EV_MINIMAL < 2
… …
1554 1597
1555 io_blocktime = 0.; 1598 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1557 backend = 0; 1600 backend = 0;
1558 backend_fd = -1; 1601 backend_fd = -1;
1559 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1560#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1561 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1608#endif
1563#if EV_USE_SIGNALFD 1609#if EV_USE_SIGNALFD
1564 sigfd = -2; 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1611#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 1612
1578 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1580 1615
1581#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1617 close (evfd); 1652 close (evfd);
1618#endif 1653#endif
1619 1654
1620 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1621 { 1656 {
1622 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1659 }
1625 } 1660 }
1626 1661
1627#if EV_USE_SIGNALFD 1662#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1663 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1664 close (sigfd);
1634 }
1635#endif 1665#endif
1636 1666
1637#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1639 close (fs_fd); 1669 close (fs_fd);
… …
1709 1739
1710 if (ev_is_active (&pipe_w)) 1740 if (ev_is_active (&pipe_w))
1711 { 1741 {
1712 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1714 gotsig = 1; 1744 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1746 async_pending = 1;
1717#endif 1747#endif
1718 1748
1719 ev_ref (EV_A); 1749 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1750 ev_io_stop (EV_A_ &pipe_w);
1721 1751
… …
1724 close (evfd); 1754 close (evfd);
1725#endif 1755#endif
1726 1756
1727 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1728 { 1758 {
1729 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1761 }
1732 1762
1733 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1741#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1742 1772
1743struct ev_loop * 1773struct ev_loop *
1744ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1745{ 1775{
1746 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));
1747 1777
1748 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1750 1780
1751 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1752 return loop; 1782 return EV_A;
1753 1783
1754 return 0; 1784 return 0;
1755} 1785}
1756 1786
1757void 1787void
… …
1861 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1863 1893
1864# if 0 1894# if 0
1865 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)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1867# endif 1897# endif
1868#endif 1898#endif
1869} 1899}
1870#endif 1900#endif
1871 1901
… …
1878#endif 1908#endif
1879{ 1909{
1880 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1881 { 1911 {
1882#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1914#else
1885 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1886#endif 1916#endif
1887 1917
1888 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
… …
1905 1935
1906void 1936void
1907ev_default_destroy (void) 1937ev_default_destroy (void)
1908{ 1938{
1909#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1911#endif 1941#endif
1912 1942
1913 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1914 1944
1915#ifndef _WIN32 1945#ifndef _WIN32
… …
1922 1952
1923void 1953void
1924ev_default_fork (void) 1954ev_default_fork (void)
1925{ 1955{
1926#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1928#endif 1958#endif
1929 1959
1930 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1931} 1961}
1932 1962
… …
2127 ANHE_at_cache (*he); 2157 ANHE_at_cache (*he);
2128 } 2158 }
2129} 2159}
2130 2160
2131/* fetch new monotonic and realtime times from the kernel */ 2161/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2162/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2163inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2164time_update (EV_P_ ev_tstamp max_block)
2135{ 2165{
2136#if EV_USE_MONOTONIC 2166#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2167 if (expect_true (have_monotonic))
… …
2398inline_size void 2428inline_size void
2399wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2400{ 2430{
2401 while (*head) 2431 while (*head)
2402 { 2432 {
2403 if (*head == elem) 2433 if (expect_true (*head == elem))
2404 { 2434 {
2405 *head = elem->next; 2435 *head = elem->next;
2406 return; 2436 break;
2407 } 2437 }
2408 2438
2409 head = &(*head)->next; 2439 head = &(*head)->next;
2410 } 2440 }
2411} 2441}
… …
2665#endif 2695#endif
2666 2696
2667void noinline 2697void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2669{ 2699{
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))) 2700 if (expect_false (ev_is_active (w)))
2674 return; 2701 return;
2675 2702
2676 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));
2704
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));
2708
2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2677 2711
2678 EV_FREQUENT_CHECK; 2712 EV_FREQUENT_CHECK;
2679 2713
2680#if EV_USE_SIGNALFD 2714#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2715 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2737 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2738 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2739
2706 signalfd (sigfd, &sigfd_set, 0); 2740 signalfd (sigfd, &sigfd_set, 0);
2707 } 2741 }
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 2742#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2743
2730 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2746
2733 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2748# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2749 if (sigfd < 0) /*TODO*/
2740# endif 2750# endif
2741 { 2751 {
2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2755 signal (w->signum, ev_sighandler);
2756# else
2742 struct sigaction sa = { }; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2743 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2745 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 */
2746 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);
2769#endif
2747 } 2770 }
2748#endif
2749 }
2750 2771
2751 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2752} 2773}
2753 2774
2754void noinline 2775void noinline
… …
2762 2783
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2765 2786
2766 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
2767#if EV_USE_SIGNALFD 2792#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2793 if (sigfd >= 0)
2769 { 2794 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2799 sigdelset (&sigfd_set, w->signum);
2800
2772 signalfd (sigfd, &sigfd_set, 0); 2801 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2803 }
2776 else 2804 else
2777#endif 2805#endif
2778 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2779 2808
2780 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2781} 2810}
2782 2811
2783void 2812void
… …
2831static void noinline 2860static void noinline
2832infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2833{ 2862{
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); 2863 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 2864
2836 if (w->wd < 0) 2865 if (w->wd >= 0)
2866 {
2867 struct statfs sfs;
2868
2869 /* now local changes will be tracked by inotify, but remote changes won't */
2870 /* unless the filesystem is known to be local, we therefore still poll */
2871 /* also do poll on <2.6.25, but with normal frequency */
2872
2873 if (!fs_2625)
2874 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2875 else if (!statfs (w->path, &sfs)
2876 && (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 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2883 else
2884 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 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 2890
2841 /* monitor some parent directory for speedup hints */ 2891 /* 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, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 2895 {
2846 char path [4096]; 2896 char path [4096];
… …
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 2913 }
2864 } 2914 }
2865 2915
2866 if (w->wd >= 0) 2916 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869 2918
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2920 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); 2921 ev_timer_again (EV_A_ &w->timer);
2886 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 2923}
2888 2924
2889static void noinline 2925static void noinline
2890infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2891{ 2927{
… …
2967 return; 3003 return;
2968 3004
2969 fs_2625 = 1; 3005 fs_2625 = 1;
2970} 3006}
2971 3007
3008inline_size int
3009infy_newfd (void)
3010{
3011#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3012 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3013 if (fd >= 0)
3014 return fd;
3015#endif
3016 return inotify_init ();
3017}
3018
2972inline_size void 3019inline_size void
2973infy_init (EV_P) 3020infy_init (EV_P)
2974{ 3021{
2975 if (fs_fd != -2) 3022 if (fs_fd != -2)
2976 return; 3023 return;
2977 3024
2978 fs_fd = -1; 3025 fs_fd = -1;
2979 3026
2980 check_2625 (EV_A); 3027 check_2625 (EV_A);
2981 3028
2982 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2983 3030
2984 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2985 { 3032 {
3033 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2989 } 3038 }
2990} 3039}
2991 3040
2992inline_size void 3041inline_size void
2993infy_fork (EV_P) 3042infy_fork (EV_P)
… …
2995 int slot; 3044 int slot;
2996 3045
2997 if (fs_fd < 0) 3046 if (fs_fd < 0)
2998 return; 3047 return;
2999 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3051 close (fs_fd);
3001 fs_fd = inotify_init (); 3052 fs_fd = infy_newfd ();
3053
3054 if (fs_fd >= 0)
3055 {
3056 fd_intern (fs_fd);
3057 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A);
3060 }
3002 3061
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3004 { 3063 {
3005 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
… …
3013 w->wd = -1; 3072 w->wd = -1;
3014 3073
3015 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3076 else
3077 {
3078 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3079 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3080 ev_timer_again (EV_A_ &w->timer);
3081 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3082 }
3019 } 3083 }
3020 } 3084 }
3021} 3085}
3022 3086
3023#endif 3087#endif
… …
3040static void noinline 3104static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3106{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3108
3045 /* we copy this here each the time so that */ 3109 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); 3110 ev_stat_stat (EV_A_ w);
3049 3111
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3112 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3113 if (
3052 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3125 ) {
3126 /* we only update w->prev on actual differences */
3127 /* in case we test more often than invoke the callback, */
3128 /* to ensure that prev is always different to attr */
3129 w->prev = prev;
3130
3064 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
3066 { 3133 {
3067 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
… …
3093 3160
3094 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
3096 else 3163 else
3097#endif 3164#endif
3165 {
3098 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
3099 3169
3100 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
3101 3171
3102 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
3103} 3173}
… …
3112 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
3113 3183
3114#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
3116#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
3118 3193
3119 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
3120 3195
3121 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
3122} 3197}
… …
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3339{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3341
3267 { 3342 {
3268 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
3269 3344
3270 while (fdchangecnt) 3345 while (fdchangecnt)
3271 { 3346 {
3272 fd_reify (EV_A); 3347 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3356 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3357
3283 ev_embed_stop (EV_A_ w); 3358 ev_embed_stop (EV_A_ w);
3284 3359
3285 { 3360 {
3286 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
3287 3362
3288 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3365 }
3291 3366
… …
3305{ 3380{
3306 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
3307 return; 3382 return;
3308 3383
3309 { 3384 {
3310 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3386 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); 3387 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3388 }
3314 3389
3315 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
… …
3427 3502
3428void 3503void
3429ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
3430{ 3505{
3431 w->sent = 1; 3506 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
3433} 3508}
3434#endif 3509#endif
3435 3510
3436/*****************************************************************************/ 3511/*****************************************************************************/
3437 3512
… …
3586 if (types & EV_CHECK) 3661 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3662 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3663 cb (EV_A_ EV_CHECK, checks [i]);
3589 3664
3590 if (types & EV_SIGNAL) 3665 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3666 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3667 for (wl = signals [i].head; wl; )
3593 { 3668 {
3594 wn = wl->next; 3669 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3670 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3671 wl = wn;

Diff Legend

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