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.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
… …
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
… …
316# endif 344# endif
317#endif 345#endif
318 346
319/* 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 */
320 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
321#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
324#endif 358#endif
325 359
… …
359# include <stdint.h> 393# include <stdint.h>
360# ifndef EFD_NONBLOCK 394# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 395# define EFD_NONBLOCK O_NONBLOCK
362# endif 396# endif
363# ifndef EFD_CLOEXEC 397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
365# endif 403# endif
366# ifdef __cplusplus 404# ifdef __cplusplus
367extern "C" { 405extern "C" {
368# endif 406# endif
369int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
… …
371} 409}
372# endif 410# endif
373#endif 411#endif
374 412
375#if EV_USE_SIGNALFD 413#if EV_USE_SIGNALFD
376# 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
377#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
378 441
379/**/ 442/**/
380 443
381#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
394 */ 457 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 459
397#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) */
398#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) */
399/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
400 462
401#if __GNUC__ >= 4 463#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
404#else 466#else
… …
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif 506#endif
445 507
446#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
447static 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)
448#endif 520#endif
449 521
450#ifdef _WIN32 522#ifdef _WIN32
451# include "ev_win32.c" 523# include "ev_win32.c"
452#endif 524#endif
… …
845 917
846#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
847 if (events) 919 if (events)
848 { 920 {
849 unsigned long arg; 921 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 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)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
856 } 924 }
857#endif 925#endif
858 926
859 { 927 {
… …
902/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
903inline_size int 971inline_size int
904fd_valid (int fd) 972fd_valid (int fd)
905{ 973{
906#ifdef _WIN32 974#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 976#else
909 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
910#endif 978#endif
911} 979}
912 980
… …
930 998
931 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1000 if (anfds [fd].events)
933 { 1001 {
934 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
935 return; 1003 break;
936 } 1004 }
937} 1005}
938 1006
939/* 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 */
940static void noinline 1008static void noinline
… …
1030 1098
1031 for (;;) 1099 for (;;)
1032 { 1100 {
1033 int c = k << 1; 1101 int c = k << 1;
1034 1102
1035 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
1036 break; 1104 break;
1037 1105
1038 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])
1039 ? 1 : 0; 1107 ? 1 : 0;
1040 1108
… …
1076 1144
1077/* move an element suitably so it is in a correct place */ 1145/* move an element suitably so it is in a correct place */
1078inline_size void 1146inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
1080{ 1148{
1081 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)]))
1082 upheap (heap, k); 1150 upheap (heap, k);
1083 else 1151 else
1084 downheap (heap, N, k); 1152 downheap (heap, N, k);
1085} 1153}
1086 1154
… …
1099/*****************************************************************************/ 1167/*****************************************************************************/
1100 1168
1101/* associate signal watchers to a signal signal */ 1169/* associate signal watchers to a signal signal */
1102typedef struct 1170typedef struct
1103{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
1104 WL head; 1176 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1177} ANSIG;
1107 1178
1108static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1180
1113/*****************************************************************************/ 1181/*****************************************************************************/
1114 1182
1115/* used to prepare libev internal fd's */ 1183/* used to prepare libev internal fd's */
1116/* this is not fork-safe */ 1184/* this is not fork-safe */
1117inline_speed void 1185inline_speed void
1118fd_intern (int fd) 1186fd_intern (int fd)
1119{ 1187{
1120#ifdef _WIN32 1188#ifdef _WIN32
1121 unsigned long arg = 1; 1189 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1123#else 1191#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif 1194#endif
1127} 1195}
… …
1184/* called whenever the libev signal pipe */ 1252/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1253/* got some events (signal, async) */
1186static void 1254static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1256{
1257 int i;
1258
1189#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1260 if (evfd >= 0)
1191 { 1261 {
1192 uint64_t counter; 1262 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
… …
1197 { 1267 {
1198 char dummy; 1268 char dummy;
1199 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1200 } 1270 }
1201 1271
1202 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1203 { 1273 {
1204 int signum; 1274 sig_pending = 0;
1205 gotsig = 0;
1206 1275
1207 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1279 }
1211 1280
1212#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1213 if (gotasync) 1282 if (async_pending)
1214 { 1283 {
1215 int i; 1284 async_pending = 0;
1216 gotasync = 0;
1217 1285
1218 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1220 { 1288 {
1221 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
… …
1229 1297
1230static void 1298static void
1231ev_sighandler (int signum) 1299ev_sighandler (int signum)
1232{ 1300{
1233#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1235#endif 1303#endif
1236 1304
1237#if _WIN32 1305#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1239#endif 1307#endif
1240 1308
1241 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1243} 1311}
1244 1312
1245void noinline 1313void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1247{ 1315{
1248 WL w; 1316 WL w;
1249 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1250#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1251 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 */
1252#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1326
1254 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1328 return;
1329#endif
1258 1330
1259 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1260 1332
1261 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1335}
1264 1336
1265#if EV_USE_SIGNALFD 1337#if EV_USE_SIGNALFD
1266static void 1338static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1339sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1340{
1269 struct signalfd_siginfo si[4], *sip; 1341 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1342
1271 for (;;) 1343 for (;;)
1272 { 1344 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1345 ssize_t res = read (sigfd, si, sizeof (si));
1274 1346
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1581 have_monotonic = 1;
1510 } 1582 }
1511#endif 1583#endif
1512 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
1513 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1597 mn_now = get_clock ();
1515 now_floor = mn_now; 1598 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1599 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1600#if EV_MINIMAL < 2
… …
1520 1603
1521 io_blocktime = 0.; 1604 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1523 backend = 0; 1606 backend = 0;
1524 backend_fd = -1; 1607 backend_fd = -1;
1525 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1526#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1527 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1614#endif
1529#if EV_USE_SIGNALFD 1615#if EV_USE_SIGNALFD
1530 sigfd = -2; 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1617#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 1618
1544 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1546 1621
1547#if EV_USE_PORT 1622#if EV_USE_PORT
… …
1583 close (evfd); 1658 close (evfd);
1584#endif 1659#endif
1585 1660
1586 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1587 { 1662 {
1588 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1665 }
1591 } 1666 }
1592 1667
1593#if EV_USE_SIGNALFD 1668#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1669 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1670 close (sigfd);
1600 }
1601#endif 1671#endif
1602 1672
1603#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1605 close (fs_fd); 1675 close (fs_fd);
… …
1630#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1701 array_free (idle, [i]);
1632#endif 1702#endif
1633 } 1703 }
1634 1704
1635 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1706
1637 /* have to use the microsoft-never-gets-it-right macro */ 1707 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1708 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
… …
1675 1745
1676 if (ev_is_active (&pipe_w)) 1746 if (ev_is_active (&pipe_w))
1677 { 1747 {
1678 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1680 gotsig = 1; 1750 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1752 async_pending = 1;
1683#endif 1753#endif
1684 1754
1685 ev_ref (EV_A); 1755 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1756 ev_io_stop (EV_A_ &pipe_w);
1687 1757
… …
1690 close (evfd); 1760 close (evfd);
1691#endif 1761#endif
1692 1762
1693 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1694 { 1764 {
1695 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1767 }
1698 1768
1699 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1707#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1708 1778
1709struct ev_loop * 1779struct ev_loop *
1710ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1711{ 1781{
1712 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));
1713 1783
1714 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1716 1786
1717 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1718 return loop; 1788 return EV_A;
1719 1789
1720 return 0; 1790 return 0;
1721} 1791}
1722 1792
1723void 1793void
… …
1827 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1829 1899
1830# if 0 1900# if 0
1831 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)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1833# endif 1903# endif
1834#endif 1904#endif
1835} 1905}
1836#endif 1906#endif
1837 1907
… …
1844#endif 1914#endif
1845{ 1915{
1846 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1847 { 1917 {
1848#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1920#else
1851 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1852#endif 1922#endif
1853 1923
1854 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
… …
1871 1941
1872void 1942void
1873ev_default_destroy (void) 1943ev_default_destroy (void)
1874{ 1944{
1875#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1877#endif 1947#endif
1878 1948
1879 ev_default_loop_ptr = 0; 1949 ev_default_loop_ptr = 0;
1880 1950
1881#ifndef _WIN32 1951#ifndef _WIN32
… …
1888 1958
1889void 1959void
1890ev_default_fork (void) 1960ev_default_fork (void)
1891{ 1961{
1892#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1894#endif 1964#endif
1895 1965
1896 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1897} 1967}
1898 1968
… …
2093 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
2094 } 2164 }
2095} 2165}
2096 2166
2097/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2169inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
2101{ 2171{
2102#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
… …
2364inline_size void 2434inline_size void
2365wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2366{ 2436{
2367 while (*head) 2437 while (*head)
2368 { 2438 {
2369 if (*head == elem) 2439 if (expect_true (*head == elem))
2370 { 2440 {
2371 *head = elem->next; 2441 *head = elem->next;
2372 return; 2442 break;
2373 } 2443 }
2374 2444
2375 head = &(*head)->next; 2445 head = &(*head)->next;
2376 } 2446 }
2377} 2447}
… …
2631#endif 2701#endif
2632 2702
2633void noinline 2703void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2635{ 2705{
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))) 2706 if (expect_false (ev_is_active (w)))
2640 return; 2707 return;
2641 2708
2642 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
2643 2717
2644 EV_FREQUENT_CHECK; 2718 EV_FREQUENT_CHECK;
2645 2719
2646#if EV_USE_SIGNALFD 2720#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2721 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2743 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2744 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2745
2672 signalfd (sigfd, &sigfd_set, 0); 2746 signalfd (sigfd, &sigfd_set, 0);
2673 } 2747 }
2674 else
2675#endif 2748#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 2749
2694 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2695 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2696 2752
2697 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2698 { 2757 {
2699#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2700 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2701#else 2762# else
2702 if (sigfd < 0) /*TODO*/
2703 {
2704 struct sigaction sa = { }; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2705 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2706 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2707 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 */
2708 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
2709 } 2776 }
2710#endif
2711 }
2712 2777
2713 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2714} 2779}
2715 2780
2716void noinline 2781void noinline
… …
2724 2789
2725 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2726 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2727 2792
2728 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
2729#if EV_USE_SIGNALFD 2798#if EV_USE_SIGNALFD
2730 if (sigfd >= 0) 2799 if (sigfd >= 0)
2731 { 2800 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2733 sigdelset (&sigfd_set, w->signum); 2805 sigdelset (&sigfd_set, w->signum);
2806
2734 signalfd (sigfd, &sigfd_set, 0); 2807 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2736 /*TODO: maybe unblock signal? */
2737 } 2809 }
2738 else 2810 else
2739#endif 2811#endif
2740 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2741 2814
2742 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2743} 2816}
2744 2817
2745void 2818void
… …
2793static void noinline 2866static void noinline
2794infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2795{ 2868{
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); 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);
2797 2870
2798 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 */
2799 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2800 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 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 2896
2803 /* monitor some parent directory for speedup hints */ 2897 /* 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, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2805 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2806 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2807 { 2901 {
2808 char path [4096]; 2902 char path [4096];
… …
2824 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2825 } 2919 }
2826 } 2920 }
2827 2921
2828 if (w->wd >= 0) 2922 if (w->wd >= 0)
2829 {
2830 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);
2831 2924
2832 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2833 /* unless the filesystem it known to be local, we therefore still poll */ 2926 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); 2927 ev_timer_again (EV_A_ &w->timer);
2848 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2849} 2929}
2850 2930
2851static void noinline 2931static void noinline
2852infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2853{ 2933{
… …
2929 return; 3009 return;
2930 3010
2931 fs_2625 = 1; 3011 fs_2625 = 1;
2932} 3012}
2933 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
2934inline_size void 3025inline_size void
2935infy_init (EV_P) 3026infy_init (EV_P)
2936{ 3027{
2937 if (fs_fd != -2) 3028 if (fs_fd != -2)
2938 return; 3029 return;
2939 3030
2940 fs_fd = -1; 3031 fs_fd = -1;
2941 3032
2942 check_2625 (EV_A); 3033 check_2625 (EV_A);
2943 3034
2944 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2945 3036
2946 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2947 { 3038 {
3039 fd_intern (fs_fd);
2948 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2949 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2950 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2951 } 3044 }
2952} 3045}
2953 3046
2954inline_size void 3047inline_size void
2955infy_fork (EV_P) 3048infy_fork (EV_P)
… …
2957 int slot; 3050 int slot;
2958 3051
2959 if (fs_fd < 0) 3052 if (fs_fd < 0)
2960 return; 3053 return;
2961 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2962 close (fs_fd); 3057 close (fs_fd);
2963 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 }
2964 3067
2965 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2966 { 3069 {
2967 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2968 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
… …
2975 w->wd = -1; 3078 w->wd = -1;
2976 3079
2977 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2978 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2979 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);
2980 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 }
2981 } 3089 }
2982 } 3090 }
2983} 3091}
2984 3092
2985#endif 3093#endif
… …
3002static void noinline 3110static void noinline
3003stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3004{ 3112{
3005 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3006 3114
3007 /* we copy this here each the time so that */ 3115 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); 3116 ev_stat_stat (EV_A_ w);
3011 3117
3012 /* 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 */
3013 if ( 3119 if (
3014 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
3015 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
3016 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
3017 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
3018 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
3019 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
3020 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
3021 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
3022 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
3023 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
3024 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
3025 ) { 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
3026 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
3027 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
3028 { 3139 {
3029 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
3030 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
… …
3055 3166
3056 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
3057 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
3058 else 3169 else
3059#endif 3170#endif
3171 {
3060 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
3061 3175
3062 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
3063 3177
3064 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
3065} 3179}
… …
3074 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
3075 3189
3076#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
3077 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
3078#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
3079 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
3080 3199
3081 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
3082 3201
3083 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
3084} 3203}
… …
3225embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3226{ 3345{
3227 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3228 3347
3229 { 3348 {
3230 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
3231 3350
3232 while (fdchangecnt) 3351 while (fdchangecnt)
3233 { 3352 {
3234 fd_reify (EV_A); 3353 fd_reify (EV_A);
3235 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3243 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));
3244 3363
3245 ev_embed_stop (EV_A_ w); 3364 ev_embed_stop (EV_A_ w);
3246 3365
3247 { 3366 {
3248 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
3249 3368
3250 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 } 3371 }
3253 3372
… …
3267{ 3386{
3268 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3269 return; 3388 return;
3270 3389
3271 { 3390 {
3272 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
3273 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 ()));
3274 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);
3275 } 3394 }
3276 3395
3277 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
… …
3389 3508
3390void 3509void
3391ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3392{ 3511{
3393 w->sent = 1; 3512 w->sent = 1;
3394 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3395} 3514}
3396#endif 3515#endif
3397 3516
3398/*****************************************************************************/ 3517/*****************************************************************************/
3399 3518
… …
3548 if (types & EV_CHECK) 3667 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; ) 3668 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]); 3669 cb (EV_A_ EV_CHECK, checks [i]);
3551 3670
3552 if (types & EV_SIGNAL) 3671 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i) 3672 for (i = 0; i < EV_NSIG - 1; ++i)
3554 for (wl = signals [i].head; wl; ) 3673 for (wl = signals [i].head; wl; )
3555 { 3674 {
3556 wn = wl->next; 3675 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl); 3676 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn; 3677 wl = wn;

Diff Legend

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