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

Comparing libev/ev.c (file contents):
Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC vs.
Revision 1.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
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
178# endif 187# endif
179#endif 188#endif
180 189
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
182 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
183#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
186# else 222# else
187# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
263#ifndef EV_USE_EVENTFD 299#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 301# define EV_USE_EVENTFD 1
266# else 302# else
267# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
304# endif
305#endif
306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
268# endif 312# endif
269#endif 313#endif
270 314
271#if 0 /* debugging */ 315#if 0 /* debugging */
272# define EV_VERIFY 3 316# define EV_VERIFY 3
300# endif 344# endif
301#endif 345#endif
302 346
303/* 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 */
304 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
305#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
308#endif 358#endif
309 359
339#endif 389#endif
340 390
341#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# ifdef O_CLOEXEC
399# define EFD_CLOEXEC O_CLOEXEC
400# else
401# define EFD_CLOEXEC 02000000
402# endif
403# endif
344# ifdef __cplusplus 404# ifdef __cplusplus
345extern "C" { 405extern "C" {
346# endif 406# endif
347int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 408# ifdef __cplusplus
349} 409}
350# endif 410# endif
351#endif 411#endif
412
413#if EV_USE_SIGNALFD
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
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
352 441
353/**/ 442/**/
354 443
355#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 457 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 459
371#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) */
372#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) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 462
375#if __GNUC__ >= 4 463#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
378#else 466#else
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 506#endif
419 507
420#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
421static 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)
422#endif 520#endif
423 521
424#ifdef _WIN32 522#ifdef _WIN32
425# include "ev_win32.c" 523# include "ev_win32.c"
426#endif 524#endif
819 917
820#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
821 if (events) 919 if (events)
822 { 920 {
823 unsigned long arg; 921 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
826 #else
827 anfd->handle = _get_osfhandle (fd);
828 #endif
829 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
830 } 924 }
831#endif 925#endif
832 926
833 { 927 {
876/* check whether the given fd is atcually valid, for error recovery */ 970/* check whether the given fd is atcually valid, for error recovery */
877inline_size int 971inline_size int
878fd_valid (int fd) 972fd_valid (int fd)
879{ 973{
880#ifdef _WIN32 974#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 976#else
883 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
884#endif 978#endif
885} 979}
886 980
904 998
905 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1000 if (anfds [fd].events)
907 { 1001 {
908 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
909 return; 1003 break;
910 } 1004 }
911} 1005}
912 1006
913/* 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 */
914static void noinline 1008static void noinline
1004 1098
1005 for (;;) 1099 for (;;)
1006 { 1100 {
1007 int c = k << 1; 1101 int c = k << 1;
1008 1102
1009 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
1010 break; 1104 break;
1011 1105
1012 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])
1013 ? 1 : 0; 1107 ? 1 : 0;
1014 1108
1050 1144
1051/* move an element suitably so it is in a correct place */ 1145/* move an element suitably so it is in a correct place */
1052inline_size void 1146inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
1054{ 1148{
1055 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)]))
1056 upheap (heap, k); 1150 upheap (heap, k);
1057 else 1151 else
1058 downheap (heap, N, k); 1152 downheap (heap, N, k);
1059} 1153}
1060 1154
1073/*****************************************************************************/ 1167/*****************************************************************************/
1074 1168
1075/* associate signal watchers to a signal signal */ 1169/* associate signal watchers to a signal signal */
1076typedef struct 1170typedef struct
1077{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
1078 WL head; 1176 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1177} ANSIG;
1081 1178
1082static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1180
1087/*****************************************************************************/ 1181/*****************************************************************************/
1088 1182
1089/* used to prepare libev internal fd's */ 1183/* used to prepare libev internal fd's */
1090/* this is not fork-safe */ 1184/* this is not fork-safe */
1091inline_speed void 1185inline_speed void
1092fd_intern (int fd) 1186fd_intern (int fd)
1093{ 1187{
1094#ifdef _WIN32 1188#ifdef _WIN32
1095 unsigned long arg = 1; 1189 unsigned long arg = 1;
1096 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1097#else 1191#else
1098 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1099 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1100#endif 1194#endif
1101} 1195}
1104evpipe_init (EV_P) 1198evpipe_init (EV_P)
1105{ 1199{
1106 if (!ev_is_active (&pipe_w)) 1200 if (!ev_is_active (&pipe_w))
1107 { 1201 {
1108#if EV_USE_EVENTFD 1202#if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1205 evfd = eventfd (0, 0);
1206
1207 if (evfd >= 0)
1110 { 1208 {
1111 evpipe [0] = -1; 1209 evpipe [0] = -1;
1112 fd_intern (evfd); 1210 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1211 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1212 }
1115 else 1213 else
1116#endif 1214#endif
1117 { 1215 {
1154/* called whenever the libev signal pipe */ 1252/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1253/* got some events (signal, async) */
1156static void 1254static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1256{
1257 int i;
1258
1159#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1260 if (evfd >= 0)
1161 { 1261 {
1162 uint64_t counter; 1262 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
1167 { 1267 {
1168 char dummy; 1268 char dummy;
1169 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1170 } 1270 }
1171 1271
1172 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1173 { 1273 {
1174 int signum; 1274 sig_pending = 0;
1175 gotsig = 0;
1176 1275
1177 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1279 }
1181 1280
1182#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1183 if (gotasync) 1282 if (async_pending)
1184 { 1283 {
1185 int i; 1284 async_pending = 0;
1186 gotasync = 0;
1187 1285
1188 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1190 { 1288 {
1191 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
1199 1297
1200static void 1298static void
1201ev_sighandler (int signum) 1299ev_sighandler (int signum)
1202{ 1300{
1203#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1205#endif 1303#endif
1206 1304
1207#if _WIN32 1305#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1209#endif 1307#endif
1210 1308
1211 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1213} 1311}
1214 1312
1215void noinline 1313void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1217{ 1315{
1218 WL w; 1316 WL w;
1219 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1220#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1221 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 */
1222#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1326
1224 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1328 return;
1329#endif
1228 1330
1229 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1230 1332
1231 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1335}
1336
1337#if EV_USE_SIGNALFD
1338static void
1339sigfdcb (EV_P_ ev_io *iow, int revents)
1340{
1341 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1342
1343 for (;;)
1344 {
1345 ssize_t res = read (sigfd, si, sizeof (si));
1346
1347 /* not ISO-C, as res might be -1, but works with SuS */
1348 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1349 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1350
1351 if (res < (ssize_t)sizeof (si))
1352 break;
1353 }
1354}
1355#endif
1234 1356
1235/*****************************************************************************/ 1357/*****************************************************************************/
1236 1358
1237static WL childs [EV_PID_HASHSIZE]; 1359static WL childs [EV_PID_HASHSIZE];
1238 1360
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1581 have_monotonic = 1;
1460 } 1582 }
1461#endif 1583#endif
1462 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
1463 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1597 mn_now = get_clock ();
1465 now_floor = mn_now; 1598 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1599 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1600#if EV_MINIMAL < 2
1470 1603
1471 io_blocktime = 0.; 1604 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1473 backend = 0; 1606 backend = 0;
1474 backend_fd = -1; 1607 backend_fd = -1;
1475 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1476#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1477 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1614#endif
1479 1615#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1617#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1618
1491 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1493 1621
1494#if EV_USE_PORT 1622#if EV_USE_PORT
1520{ 1648{
1521 int i; 1649 int i;
1522 1650
1523 if (ev_is_active (&pipe_w)) 1651 if (ev_is_active (&pipe_w))
1524 { 1652 {
1525 ev_ref (EV_A); /* signal watcher */ 1653 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1654 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1655
1528#if EV_USE_EVENTFD 1656#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1657 if (evfd >= 0)
1530 close (evfd); 1658 close (evfd);
1531#endif 1659#endif
1532 1660
1533 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1534 { 1662 {
1535 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1665 }
1538 } 1666 }
1667
1668#if EV_USE_SIGNALFD
1669 if (ev_is_active (&sigfd_w))
1670 close (sigfd);
1671#endif
1539 1672
1540#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1542 close (fs_fd); 1675 close (fs_fd);
1543#endif 1676#endif
1567#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1701 array_free (idle, [i]);
1569#endif 1702#endif
1570 } 1703 }
1571 1704
1572 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1706
1574 /* have to use the microsoft-never-gets-it-right macro */ 1707 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1708 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
1612 1745
1613 if (ev_is_active (&pipe_w)) 1746 if (ev_is_active (&pipe_w))
1614 { 1747 {
1615 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1617 gotsig = 1; 1750 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1752 async_pending = 1;
1620#endif 1753#endif
1621 1754
1622 ev_ref (EV_A); 1755 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1756 ev_io_stop (EV_A_ &pipe_w);
1624 1757
1627 close (evfd); 1760 close (evfd);
1628#endif 1761#endif
1629 1762
1630 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1631 { 1764 {
1632 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1767 }
1635 1768
1636 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
1644#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1645 1778
1646struct ev_loop * 1779struct ev_loop *
1647ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1648{ 1781{
1649 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));
1650 1783
1651 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1654 1786
1655 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1656 return loop; 1788 return EV_A;
1657 1789
1658 return 0; 1790 return 0;
1659} 1791}
1660 1792
1661void 1793void
1765 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1767 1899
1768# if 0 1900# if 0
1769 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)
1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1771# endif 1903# endif
1772#endif 1904#endif
1773} 1905}
1774#endif 1906#endif
1775 1907
1782#endif 1914#endif
1783{ 1915{
1784 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1785 { 1917 {
1786#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1920#else
1789 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1790#endif 1922#endif
1791 1923
1792 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1809 1941
1810void 1942void
1811ev_default_destroy (void) 1943ev_default_destroy (void)
1812{ 1944{
1813#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1815#endif 1947#endif
1816 1948
1817 ev_default_loop_ptr = 0; 1949 ev_default_loop_ptr = 0;
1818 1950
1819#ifndef _WIN32 1951#ifndef _WIN32
1826 1958
1827void 1959void
1828ev_default_fork (void) 1960ev_default_fork (void)
1829{ 1961{
1830#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1832#endif 1964#endif
1833 1965
1834 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1835} 1967}
1836 1968
2031 ANHE_at_cache (*he); 2163 ANHE_at_cache (*he);
2032 } 2164 }
2033} 2165}
2034 2166
2035/* fetch new monotonic and realtime times from the kernel */ 2167/* fetch new monotonic and realtime times from the kernel */
2036/* also detetc if there was a timejump, and act accordingly */ 2168/* also detect if there was a timejump, and act accordingly */
2037inline_speed void 2169inline_speed void
2038time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
2039{ 2171{
2040#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
2041 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
2302inline_size void 2434inline_size void
2303wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2304{ 2436{
2305 while (*head) 2437 while (*head)
2306 { 2438 {
2307 if (*head == elem) 2439 if (expect_true (*head == elem))
2308 { 2440 {
2309 *head = elem->next; 2441 *head = elem->next;
2310 return; 2442 break;
2311 } 2443 }
2312 2444
2313 head = &(*head)->next; 2445 head = &(*head)->next;
2314 } 2446 }
2315} 2447}
2569#endif 2701#endif
2570 2702
2571void noinline 2703void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2573{ 2705{
2574#if EV_MULTIPLICITY
2575 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2576#endif
2577 if (expect_false (ev_is_active (w))) 2706 if (expect_false (ev_is_active (w)))
2578 return; 2707 return;
2579 2708
2580 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));
2581 2710
2582 evpipe_init (EV_A); 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));
2583 2714
2584 EV_FREQUENT_CHECK; 2715 signals [w->signum - 1].loop = EV_A;
2716#endif
2585 2717
2718 EV_FREQUENT_CHECK;
2719
2720#if EV_USE_SIGNALFD
2721 if (sigfd == -2)
2586 { 2722 {
2587#ifndef _WIN32 2723 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2724 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2725 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2726
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2727 if (sigfd >= 0)
2728 {
2729 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2730
2595#ifndef _WIN32 2731 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2732
2597#endif 2733 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2734 ev_set_priority (&sigfd_w, EV_MAXPRI);
2735 ev_io_start (EV_A_ &sigfd_w);
2736 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2737 }
2598 } 2738 }
2739
2740 if (sigfd >= 0)
2741 {
2742 /* TODO: check .head */
2743 sigaddset (&sigfd_set, w->signum);
2744 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2745
2746 signalfd (sigfd, &sigfd_set, 0);
2747 }
2748#endif
2599 2749
2600 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2752
2603 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2604 { 2757 {
2605#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2606 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2607#else 2762# else
2608 struct sigaction sa = { }; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2609 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2611 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 */
2612 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);
2613#endif 2775#endif
2614 } 2776 }
2615 2777
2616 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2617} 2779}
2618 2780
2619void noinline 2781void noinline
2627 2789
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2630 2792
2631 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
2798#if EV_USE_SIGNALFD
2799 if (sigfd >= 0)
2800 {
2801 sigset_t ss;
2802
2803 sigemptyset (&ss);
2804 sigaddset (&ss, w->signum);
2805 sigdelset (&sigfd_set, w->signum);
2806
2807 signalfd (sigfd, &sigfd_set, 0);
2808 sigprocmask (SIG_UNBLOCK, &ss, 0);
2809 }
2810 else
2811#endif
2632 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2633 2814
2634 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2635} 2816}
2636 2817
2637void 2818void
2685static void noinline 2866static void noinline
2686infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2687{ 2868{
2688 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 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);
2689 2870
2690 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 */
2691 { 2891 }
2892 else
2893 {
2894 /* can't use inotify, continue to stat */
2692 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2895 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2693 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2694 2896
2695 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2696 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2697 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2698 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2699 { 2901 {
2700 char path [4096]; 2902 char path [4096];
2716 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2717 } 2919 }
2718 } 2920 }
2719 2921
2720 if (w->wd >= 0) 2922 if (w->wd >= 0)
2721 {
2722 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);
2723 2924
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 2925 /* now re-arm timer, if required */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 2926 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2726 /* also do poll on <2.6.25, but with normal frequency */
2727 struct statfs sfs;
2728
2729 if (fs_2625 && !statfs (w->path, &sfs))
2730 if (sfs.f_type == 0x1373 /* devfs */
2731 || sfs.f_type == 0xEF53 /* ext2/3 */
2732 || sfs.f_type == 0x3153464a /* jfs */
2733 || sfs.f_type == 0x52654973 /* reiser3 */
2734 || sfs.f_type == 0x01021994 /* tempfs */
2735 || sfs.f_type == 0x58465342 /* xfs */)
2736 return;
2737
2738 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2739 ev_timer_again (EV_A_ &w->timer); 2927 ev_timer_again (EV_A_ &w->timer);
2740 } 2928 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2741} 2929}
2742 2930
2743static void noinline 2931static void noinline
2744infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2745{ 2933{
2821 return; 3009 return;
2822 3010
2823 fs_2625 = 1; 3011 fs_2625 = 1;
2824} 3012}
2825 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
2826inline_size void 3025inline_size void
2827infy_init (EV_P) 3026infy_init (EV_P)
2828{ 3027{
2829 if (fs_fd != -2) 3028 if (fs_fd != -2)
2830 return; 3029 return;
2831 3030
2832 fs_fd = -1; 3031 fs_fd = -1;
2833 3032
2834 check_2625 (EV_A); 3033 check_2625 (EV_A);
2835 3034
2836 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2837 3036
2838 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2839 { 3038 {
3039 fd_intern (fs_fd);
2840 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2841 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2843 } 3044 }
2844} 3045}
2845 3046
2846inline_size void 3047inline_size void
2847infy_fork (EV_P) 3048infy_fork (EV_P)
2849 int slot; 3050 int slot;
2850 3051
2851 if (fs_fd < 0) 3052 if (fs_fd < 0)
2852 return; 3053 return;
2853 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2854 close (fs_fd); 3057 close (fs_fd);
2855 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 }
2856 3067
2857 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2858 { 3069 {
2859 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2860 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
2867 w->wd = -1; 3078 w->wd = -1;
2868 3079
2869 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2870 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2871 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);
2872 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 }
2873 } 3089 }
2874 } 3090 }
2875} 3091}
2876 3092
2877#endif 3093#endif
2894static void noinline 3110static void noinline
2895stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2896{ 3112{
2897 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2898 3114
2899 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
2900 /* prev has the old value when the callback gets invoked */
2901 w->prev = w->attr;
2902 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
2903 3117
2904 /* 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 */
2905 if ( 3119 if (
2906 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
2907 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
2908 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
2909 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
2910 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
2911 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
2912 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
2913 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
2914 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
2915 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
2916 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
2917 ) { 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
2918 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
2919 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
2920 { 3139 {
2921 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
2922 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
2947 3166
2948 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
2949 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
2950 else 3169 else
2951#endif 3170#endif
3171 {
2952 ev_timer_again (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
2953 3175
2954 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
2955 3177
2956 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
2957} 3179}
2966 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
2967 3189
2968#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
2969 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
2970#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
2971 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
2972 3199
2973 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
2974 3201
2975 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
2976} 3203}
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3345{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3347
3121 { 3348 {
3122 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
3123 3350
3124 while (fdchangecnt) 3351 while (fdchangecnt)
3125 { 3352 {
3126 fd_reify (EV_A); 3353 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3135 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));
3136 3363
3137 ev_embed_stop (EV_A_ w); 3364 ev_embed_stop (EV_A_ w);
3138 3365
3139 { 3366 {
3140 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
3141 3368
3142 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3144 } 3371 }
3145 3372
3159{ 3386{
3160 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3161 return; 3388 return;
3162 3389
3163 { 3390 {
3164 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
3165 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 ()));
3166 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);
3167 } 3394 }
3168 3395
3169 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
3281 3508
3282void 3509void
3283ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3284{ 3511{
3285 w->sent = 1; 3512 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3287} 3514}
3288#endif 3515#endif
3289 3516
3290/*****************************************************************************/ 3517/*****************************************************************************/
3291 3518
3440 if (types & EV_CHECK) 3667 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3668 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3669 cb (EV_A_ EV_CHECK, checks [i]);
3443 3670
3444 if (types & EV_SIGNAL) 3671 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3672 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3673 for (wl = signals [i].head; wl; )
3447 { 3674 {
3448 wn = wl->next; 3675 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3676 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3677 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines