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

Comparing libev/ev.c (file contents):
Revision 1.303 by root, Sun Jul 19 01:36:34 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
… …
186# endif 187# endif
187#endif 188#endif
188 189
189/* 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 */
190 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
191#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
194# else 222# else
195# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
… …
275# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
276# endif 304# endif
277#endif 305#endif
278 306
279#ifndef EV_USE_SIGNALFD 307#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 309# define EV_USE_SIGNALFD 1
282# else 310# else
283# define EV_USE_SIGNALFD 0 311# define EV_USE_SIGNALFD 0
284# endif 312# endif
285#endif 313#endif
… …
359# include <stdint.h> 387# include <stdint.h>
360# ifndef EFD_NONBLOCK 388# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 389# define EFD_NONBLOCK O_NONBLOCK
362# endif 390# endif
363# ifndef EFD_CLOEXEC 391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
365# endif 397# endif
366# ifdef __cplusplus 398# ifdef __cplusplus
367extern "C" { 399extern "C" {
368# endif 400# endif
369int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
… …
371} 403}
372# endif 404# endif
373#endif 405#endif
374 406
375#if EV_USE_SIGNALFD 407#if EV_USE_SIGNALFD
376# 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
377#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
378 435
379/**/ 436/**/
380 437
381#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
394 */ 451 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 453
397#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) */
398#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) */
399/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
400 456
401#if __GNUC__ >= 4 457#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
404#else 460#else
… …
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif 500#endif
445 501
446#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
447static 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)
448#endif 514#endif
449 515
450#ifdef _WIN32 516#ifdef _WIN32
451# include "ev_win32.c" 517# include "ev_win32.c"
452#endif 518#endif
… …
845 911
846#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
847 if (events) 913 if (events)
848 { 914 {
849 unsigned long arg; 915 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
852 #else
853 anfd->handle = _get_osfhandle (fd);
854 #endif
855 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));
856 } 918 }
857#endif 919#endif
858 920
859 { 921 {
… …
902/* check whether the given fd is atcually valid, for error recovery */ 964/* check whether the given fd is atcually valid, for error recovery */
903inline_size int 965inline_size int
904fd_valid (int fd) 966fd_valid (int fd)
905{ 967{
906#ifdef _WIN32 968#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 970#else
909 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
910#endif 972#endif
911} 973}
912 974
… …
930 992
931 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 994 if (anfds [fd].events)
933 { 995 {
934 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
935 return; 997 break;
936 } 998 }
937} 999}
938 1000
939/* 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 */
940static void noinline 1002static void noinline
… …
1030 1092
1031 for (;;) 1093 for (;;)
1032 { 1094 {
1033 int c = k << 1; 1095 int c = k << 1;
1034 1096
1035 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
1036 break; 1098 break;
1037 1099
1038 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])
1039 ? 1 : 0; 1101 ? 1 : 0;
1040 1102
… …
1076 1138
1077/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1078inline_size void 1140inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1080{ 1142{
1081 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)]))
1082 upheap (heap, k); 1144 upheap (heap, k);
1083 else 1145 else
1084 downheap (heap, N, k); 1146 downheap (heap, N, k);
1085} 1147}
1086 1148
… …
1099/*****************************************************************************/ 1161/*****************************************************************************/
1100 1162
1101/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1102typedef struct 1164typedef struct
1103{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1104 WL head; 1170 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1171} ANSIG;
1107 1172
1108static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1174
1113/*****************************************************************************/ 1175/*****************************************************************************/
1114 1176
1115/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1116/* this is not fork-safe */ 1178/* this is not fork-safe */
1117inline_speed void 1179inline_speed void
1118fd_intern (int fd) 1180fd_intern (int fd)
1119{ 1181{
1120#ifdef _WIN32 1182#ifdef _WIN32
1121 unsigned long arg = 1; 1183 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1123#else 1185#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif 1188#endif
1127} 1189}
… …
1184/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1186static void 1248static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1250{
1251 int i;
1252
1189#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1254 if (evfd >= 0)
1191 { 1255 {
1192 uint64_t counter; 1256 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1197 { 1261 {
1198 char dummy; 1262 char dummy;
1199 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1200 } 1264 }
1201 1265
1202 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1203 { 1267 {
1204 int signum; 1268 sig_pending = 0;
1205 gotsig = 0;
1206 1269
1207 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1273 }
1211 1274
1212#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1213 if (gotasync) 1276 if (async_pending)
1214 { 1277 {
1215 int i; 1278 async_pending = 0;
1216 gotasync = 0;
1217 1279
1218 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1220 { 1282 {
1221 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1229 1291
1230static void 1292static void
1231ev_sighandler (int signum) 1293ev_sighandler (int signum)
1232{ 1294{
1233#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1235#endif 1297#endif
1236 1298
1237#if _WIN32 1299#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1239#endif 1301#endif
1240 1302
1241 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1243} 1305}
1244 1306
1245void noinline 1307void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1247{ 1309{
1248 WL w; 1310 WL w;
1249 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1250#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1251 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 */
1252#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1320
1254 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1322 return;
1323#endif
1258 1324
1259 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1260 1326
1261 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1329}
1264 1330
1265#if EV_USE_SIGNALFD 1331#if EV_USE_SIGNALFD
1266static void 1332static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1333sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1334{
1269 struct signalfd_siginfo si[4], *sip; 1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1336
1271 for (;;) 1337 for (;;)
1272 { 1338 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1339 ssize_t res = read (sigfd, si, sizeof (si));
1274 1340
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1575 have_monotonic = 1;
1510 } 1576 }
1511#endif 1577#endif
1512 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
1513 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1591 mn_now = get_clock ();
1515 now_floor = mn_now; 1592 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1594#if EV_MINIMAL < 2
… …
1520 1597
1521 io_blocktime = 0.; 1598 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1523 backend = 0; 1600 backend = 0;
1524 backend_fd = -1; 1601 backend_fd = -1;
1525 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1526#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1527 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1608#endif
1529#if EV_USE_SIGNALFD 1609#if EV_USE_SIGNALFD
1530 sigfd = -2; 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1611#endif
1532
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV)
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543 1612
1544 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1546 1615
1547#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1583 close (evfd); 1652 close (evfd);
1584#endif 1653#endif
1585 1654
1586 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1587 { 1656 {
1588 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1659 }
1591 } 1660 }
1592 1661
1593#if EV_USE_SIGNALFD 1662#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1663 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1664 close (sigfd);
1600 }
1601#endif 1665#endif
1602 1666
1603#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1605 close (fs_fd); 1669 close (fs_fd);
… …
1630#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1695 array_free (idle, [i]);
1632#endif 1696#endif
1633 } 1697 }
1634 1698
1635 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1700
1637 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1702 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
… …
1675 1739
1676 if (ev_is_active (&pipe_w)) 1740 if (ev_is_active (&pipe_w))
1677 { 1741 {
1678 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1680 gotsig = 1; 1744 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1746 async_pending = 1;
1683#endif 1747#endif
1684 1748
1685 ev_ref (EV_A); 1749 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1750 ev_io_stop (EV_A_ &pipe_w);
1687 1751
… …
1690 close (evfd); 1754 close (evfd);
1691#endif 1755#endif
1692 1756
1693 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1694 { 1758 {
1695 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1761 }
1698 1762
1699 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1707#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1708 1772
1709struct ev_loop * 1773struct ev_loop *
1710ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1711{ 1775{
1712 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));
1713 1777
1714 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1716 1780
1717 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1718 return loop; 1782 return EV_A;
1719 1783
1720 return 0; 1784 return 0;
1721} 1785}
1722 1786
1723void 1787void
… …
1827 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1829 1893
1830# if 0 1894# if 0
1831 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)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1833# endif 1897# endif
1834#endif 1898#endif
1835} 1899}
1836#endif 1900#endif
1837 1901
… …
1844#endif 1908#endif
1845{ 1909{
1846 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1847 { 1911 {
1848#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1914#else
1851 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1852#endif 1916#endif
1853 1917
1854 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
… …
1871 1935
1872void 1936void
1873ev_default_destroy (void) 1937ev_default_destroy (void)
1874{ 1938{
1875#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1877#endif 1941#endif
1878 1942
1879 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1880 1944
1881#ifndef _WIN32 1945#ifndef _WIN32
… …
1888 1952
1889void 1953void
1890ev_default_fork (void) 1954ev_default_fork (void)
1891{ 1955{
1892#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1894#endif 1958#endif
1895 1959
1896 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1897} 1961}
1898 1962
… …
2093 ANHE_at_cache (*he); 2157 ANHE_at_cache (*he);
2094 } 2158 }
2095} 2159}
2096 2160
2097/* fetch new monotonic and realtime times from the kernel */ 2161/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2162/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2163inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2164time_update (EV_P_ ev_tstamp max_block)
2101{ 2165{
2102#if EV_USE_MONOTONIC 2166#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2167 if (expect_true (have_monotonic))
… …
2364inline_size void 2428inline_size void
2365wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2366{ 2430{
2367 while (*head) 2431 while (*head)
2368 { 2432 {
2369 if (*head == elem) 2433 if (expect_true (*head == elem))
2370 { 2434 {
2371 *head = elem->next; 2435 *head = elem->next;
2372 return; 2436 break;
2373 } 2437 }
2374 2438
2375 head = &(*head)->next; 2439 head = &(*head)->next;
2376 } 2440 }
2377} 2441}
… …
2631#endif 2695#endif
2632 2696
2633void noinline 2697void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2635{ 2699{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2700 if (expect_false (ev_is_active (w)))
2640 return; 2701 return;
2641 2702
2642 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
2643 2711
2644 EV_FREQUENT_CHECK; 2712 EV_FREQUENT_CHECK;
2645 2713
2646#if EV_USE_SIGNALFD 2714#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2715 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2737 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2738 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2739
2672 signalfd (sigfd, &sigfd_set, 0); 2740 signalfd (sigfd, &sigfd_set, 0);
2673 } 2741 }
2674 else
2675#endif 2742#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688 if (sigfd < 0)/*TODO*/
2689 sigdelset (&prev, w->signum);
2690 sigprocmask (SIG_SETMASK, &prev, 0);
2691#endif
2692 }
2693 2743
2694 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2695 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2696 2746
2697 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2698 { 2751 {
2699#if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2700 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2701#else 2756# else
2702 if (sigfd < 0) /*TODO*/
2703 {
2704 struct sigaction sa = { }; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2705 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2706 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2707 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 */
2708 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
2709 } 2770 }
2710#endif
2711 }
2712 2771
2713 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2714} 2773}
2715 2774
2716void noinline 2775void noinline
… …
2724 2783
2725 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2726 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2727 2786
2728 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
2729#if EV_USE_SIGNALFD 2792#if EV_USE_SIGNALFD
2730 if (sigfd >= 0) 2793 if (sigfd >= 0)
2731 { 2794 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2733 sigdelset (&sigfd_set, w->signum); 2799 sigdelset (&sigfd_set, w->signum);
2800
2734 signalfd (sigfd, &sigfd_set, 0); 2801 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2736 /*TODO: maybe unblock signal? */
2737 } 2803 }
2738 else 2804 else
2739#endif 2805#endif
2740 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2741 2808
2742 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2743} 2810}
2744 2811
2745void 2812void
… …
2793static void noinline 2860static void noinline
2794infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2795{ 2862{
2796 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);
2797 2864
2798 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 */
2799 { 2885 }
2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2800 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2889 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2801 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2802 2890
2803 /* monitor some parent directory for speedup hints */ 2891 /* if path is not there, monitor some parent directory for speedup hints */
2804 /* 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, */
2805 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2806 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2807 { 2895 {
2808 char path [4096]; 2896 char path [4096];
… …
2824 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2825 } 2913 }
2826 } 2914 }
2827 2915
2828 if (w->wd >= 0) 2916 if (w->wd >= 0)
2829 {
2830 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);
2831 2918
2832 /* now local changes will be tracked by inotify, but remote changes won't */ 2919 /* now re-arm timer, if required */
2833 /* unless the filesystem it known to be local, we therefore still poll */ 2920 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2834 /* also do poll on <2.6.25, but with normal frequency */
2835 struct statfs sfs;
2836
2837 if (fs_2625 && !statfs (w->path, &sfs))
2838 if (sfs.f_type == 0x1373 /* devfs */
2839 || sfs.f_type == 0xEF53 /* ext2/3 */
2840 || sfs.f_type == 0x3153464a /* jfs */
2841 || sfs.f_type == 0x52654973 /* reiser3 */
2842 || sfs.f_type == 0x01021994 /* tempfs */
2843 || sfs.f_type == 0x58465342 /* xfs */)
2844 return;
2845
2846 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2847 ev_timer_again (EV_A_ &w->timer); 2921 ev_timer_again (EV_A_ &w->timer);
2848 } 2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2849} 2923}
2850 2924
2851static void noinline 2925static void noinline
2852infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2853{ 2927{
… …
2929 return; 3003 return;
2930 3004
2931 fs_2625 = 1; 3005 fs_2625 = 1;
2932} 3006}
2933 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
2934inline_size void 3019inline_size void
2935infy_init (EV_P) 3020infy_init (EV_P)
2936{ 3021{
2937 if (fs_fd != -2) 3022 if (fs_fd != -2)
2938 return; 3023 return;
2939 3024
2940 fs_fd = -1; 3025 fs_fd = -1;
2941 3026
2942 check_2625 (EV_A); 3027 check_2625 (EV_A);
2943 3028
2944 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2945 3030
2946 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2947 { 3032 {
3033 fd_intern (fs_fd);
2948 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2949 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2950 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2951 } 3038 }
2952} 3039}
2953 3040
2954inline_size void 3041inline_size void
2955infy_fork (EV_P) 3042infy_fork (EV_P)
… …
2957 int slot; 3044 int slot;
2958 3045
2959 if (fs_fd < 0) 3046 if (fs_fd < 0)
2960 return; 3047 return;
2961 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2962 close (fs_fd); 3051 close (fs_fd);
2963 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 }
2964 3061
2965 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2966 { 3063 {
2967 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
2968 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
… …
2975 w->wd = -1; 3072 w->wd = -1;
2976 3073
2977 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
2978 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
2979 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);
2980 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 }
2981 } 3083 }
2982 } 3084 }
2983} 3085}
2984 3086
2985#endif 3087#endif
… …
3002static void noinline 3104static void noinline
3003stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3004{ 3106{
3005 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3006 3108
3007 /* we copy this here each the time so that */ 3109 ev_statdata prev = w->attr;
3008 /* prev has the old value when the callback gets invoked */
3009 w->prev = w->attr;
3010 ev_stat_stat (EV_A_ w); 3110 ev_stat_stat (EV_A_ w);
3011 3111
3012 /* 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 */
3013 if ( 3113 if (
3014 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
3015 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
3016 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
3017 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
3018 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
3019 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
3020 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
3021 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
3022 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
3023 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
3024 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
3025 ) { 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
3026 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
3027 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
3028 { 3133 {
3029 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
3030 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
… …
3055 3160
3056 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
3057 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
3058 else 3163 else
3059#endif 3164#endif
3165 {
3060 ev_timer_again (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
3061 3169
3062 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
3063 3171
3064 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
3065} 3173}
… …
3074 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
3075 3183
3076#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
3077 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
3078#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
3079 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
3080 3193
3081 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
3082 3195
3083 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
3084} 3197}
… …
3225embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3226{ 3339{
3227 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3228 3341
3229 { 3342 {
3230 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
3231 3344
3232 while (fdchangecnt) 3345 while (fdchangecnt)
3233 { 3346 {
3234 fd_reify (EV_A); 3347 fd_reify (EV_A);
3235 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3243 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));
3244 3357
3245 ev_embed_stop (EV_A_ w); 3358 ev_embed_stop (EV_A_ w);
3246 3359
3247 { 3360 {
3248 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
3249 3362
3250 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 } 3365 }
3253 3366
… …
3267{ 3380{
3268 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
3269 return; 3382 return;
3270 3383
3271 { 3384 {
3272 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
3273 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 ()));
3274 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);
3275 } 3388 }
3276 3389
3277 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
… …
3389 3502
3390void 3503void
3391ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
3392{ 3505{
3393 w->sent = 1; 3506 w->sent = 1;
3394 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
3395} 3508}
3396#endif 3509#endif
3397 3510
3398/*****************************************************************************/ 3511/*****************************************************************************/
3399 3512
… …
3548 if (types & EV_CHECK) 3661 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; ) 3662 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]); 3663 cb (EV_A_ EV_CHECK, checks [i]);
3551 3664
3552 if (types & EV_SIGNAL) 3665 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i) 3666 for (i = 0; i < EV_NSIG - 1; ++i)
3554 for (wl = signals [i].head; wl; ) 3667 for (wl = signals [i].head; wl; )
3555 { 3668 {
3556 wn = wl->next; 3669 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl); 3670 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn; 3671 wl = wn;

Diff Legend

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