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

Comparing libev/ev.c (file contents):
Revision 1.304 by root, Sun Jul 19 03:12:28 2009 UTC vs.
Revision 1.328 by root, Sun Feb 14 19:23:19 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
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
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
… …
186# endif 188# endif
187#endif 189#endif
188 190
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
190 192
193/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG)
195/* use what's provided */
196#elif defined (NSIG)
197# define EV_NSIG (NSIG)
198#elif defined(_NSIG)
199# define EV_NSIG (_NSIG)
200#elif defined (SIGMAX)
201# define EV_NSIG (SIGMAX+1)
202#elif defined (SIG_MAX)
203# define EV_NSIG (SIG_MAX+1)
204#elif defined (_SIG_MAX)
205# define EV_NSIG (_SIG_MAX+1)
206#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else
215# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */
217# define EV_NSIG 65
218#endif
219
191#ifndef EV_USE_CLOCK_SYSCALL 220#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 221# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 222# define EV_USE_CLOCK_SYSCALL 1
194# else 223# else
195# define EV_USE_CLOCK_SYSCALL 0 224# define EV_USE_CLOCK_SYSCALL 0
… …
275# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
276# endif 305# endif
277#endif 306#endif
278 307
279#ifndef EV_USE_SIGNALFD 308#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 310# define EV_USE_SIGNALFD 1
282# else 311# else
283# define EV_USE_SIGNALFD 0 312# define EV_USE_SIGNALFD 0
284# endif 313# endif
285#endif 314#endif
… …
316# endif 345# endif
317#endif 346#endif
318 347
319/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
320 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
321#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
324#endif 359#endif
325 360
… …
359# include <stdint.h> 394# include <stdint.h>
360# ifndef EFD_NONBLOCK 395# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 396# define EFD_NONBLOCK O_NONBLOCK
362# endif 397# endif
363# ifndef EFD_CLOEXEC 398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
365# endif 404# endif
366# ifdef __cplusplus 405# ifdef __cplusplus
367extern "C" { 406extern "C" {
368# endif 407# endif
369int eventfd (unsigned int initval, int flags); 408int eventfd (unsigned int initval, int flags);
… …
371} 410}
372# endif 411# endif
373#endif 412#endif
374 413
375#if EV_USE_SIGNALFD 414#if EV_USE_SIGNALFD
376# include <sys/signalfd.h> 415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
377#endif 419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
378 442
379/**/ 443/**/
380 444
381#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
394 */ 458 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 460
397#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#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) */ 462#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 463
401#if __GNUC__ >= 4 464#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
404#else 467#else
… …
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 506static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif 507#endif
445 508
446#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
511#endif
512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
448#endif 521#endif
449 522
450#ifdef _WIN32 523#ifdef _WIN32
451# include "ev_win32.c" 524# include "ev_win32.c"
452#endif 525#endif
… …
845 918
846#if EV_SELECT_IS_WINSOCKET 919#if EV_SELECT_IS_WINSOCKET
847 if (events) 920 if (events)
848 { 921 {
849 unsigned long arg; 922 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 923 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)); 924 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
856 } 925 }
857#endif 926#endif
858 927
859 { 928 {
… …
902/* check whether the given fd is atcually valid, for error recovery */ 971/* check whether the given fd is atcually valid, for error recovery */
903inline_size int 972inline_size int
904fd_valid (int fd) 973fd_valid (int fd)
905{ 974{
906#ifdef _WIN32 975#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 977#else
909 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
910#endif 979#endif
911} 980}
912 981
… …
930 999
931 for (fd = anfdmax; fd--; ) 1000 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1001 if (anfds [fd].events)
933 { 1002 {
934 fd_kill (EV_A_ fd); 1003 fd_kill (EV_A_ fd);
935 return; 1004 break;
936 } 1005 }
937} 1006}
938 1007
939/* usually called after fork if backend needs to re-arm all fds from scratch */ 1008/* usually called after fork if backend needs to re-arm all fds from scratch */
940static void noinline 1009static void noinline
… …
1030 1099
1031 for (;;) 1100 for (;;)
1032 { 1101 {
1033 int c = k << 1; 1102 int c = k << 1;
1034 1103
1035 if (c > N + HEAP0 - 1) 1104 if (c >= N + HEAP0)
1036 break; 1105 break;
1037 1106
1038 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1107 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1039 ? 1 : 0; 1108 ? 1 : 0;
1040 1109
… …
1076 1145
1077/* move an element suitably so it is in a correct place */ 1146/* move an element suitably so it is in a correct place */
1078inline_size void 1147inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1148adjustheap (ANHE *heap, int N, int k)
1080{ 1149{
1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1150 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1082 upheap (heap, k); 1151 upheap (heap, k);
1083 else 1152 else
1084 downheap (heap, N, k); 1153 downheap (heap, N, k);
1085} 1154}
1086 1155
… …
1099/*****************************************************************************/ 1168/*****************************************************************************/
1100 1169
1101/* associate signal watchers to a signal signal */ 1170/* associate signal watchers to a signal signal */
1102typedef struct 1171typedef struct
1103{ 1172{
1173 EV_ATOMIC_T pending;
1174#if EV_MULTIPLICITY
1175 EV_P;
1176#endif
1104 WL head; 1177 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1178} ANSIG;
1107 1179
1108static ANSIG *signals; 1180static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1181
1113/*****************************************************************************/ 1182/*****************************************************************************/
1114 1183
1115/* used to prepare libev internal fd's */ 1184/* used to prepare libev internal fd's */
1116/* this is not fork-safe */ 1185/* this is not fork-safe */
1117inline_speed void 1186inline_speed void
1118fd_intern (int fd) 1187fd_intern (int fd)
1119{ 1188{
1120#ifdef _WIN32 1189#ifdef _WIN32
1121 unsigned long arg = 1; 1190 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1123#else 1192#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif 1195#endif
1127} 1196}
… …
1184/* called whenever the libev signal pipe */ 1253/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1254/* got some events (signal, async) */
1186static void 1255static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1256pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1257{
1258 int i;
1259
1189#if EV_USE_EVENTFD 1260#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1261 if (evfd >= 0)
1191 { 1262 {
1192 uint64_t counter; 1263 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1264 read (evfd, &counter, sizeof (uint64_t));
… …
1197 { 1268 {
1198 char dummy; 1269 char dummy;
1199 read (evpipe [0], &dummy, 1); 1270 read (evpipe [0], &dummy, 1);
1200 } 1271 }
1201 1272
1202 if (gotsig && ev_is_default_loop (EV_A)) 1273 if (sig_pending)
1203 { 1274 {
1204 int signum; 1275 sig_pending = 0;
1205 gotsig = 0;
1206 1276
1207 for (signum = signalmax; signum--; ) 1277 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1278 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1279 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1280 }
1211 1281
1212#if EV_ASYNC_ENABLE 1282#if EV_ASYNC_ENABLE
1213 if (gotasync) 1283 if (async_pending)
1214 { 1284 {
1215 int i; 1285 async_pending = 0;
1216 gotasync = 0;
1217 1286
1218 for (i = asynccnt; i--; ) 1287 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1288 if (asyncs [i]->sent)
1220 { 1289 {
1221 asyncs [i]->sent = 0; 1290 asyncs [i]->sent = 0;
… …
1229 1298
1230static void 1299static void
1231ev_sighandler (int signum) 1300ev_sighandler (int signum)
1232{ 1301{
1233#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1303 EV_P = signals [signum - 1].loop;
1235#endif 1304#endif
1236 1305
1237#if _WIN32 1306#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1239#endif 1308#endif
1240 1309
1241 signals [signum - 1].gotsig = 1; 1310 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1311 evpipe_write (EV_A_ &sig_pending);
1243} 1312}
1244 1313
1245void noinline 1314void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1315ev_feed_signal_event (EV_P_ int signum)
1247{ 1316{
1248 WL w; 1317 WL w;
1249 1318
1319 if (expect_false (signum <= 0 || signum > EV_NSIG))
1320 return;
1321
1322 --signum;
1323
1250#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1325 /* it is permissible to try to feed a signal to the wrong loop */
1252#endif 1326 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1327
1254 --signum; 1328 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1329 return;
1330#endif
1258 1331
1259 signals [signum].gotsig = 0; 1332 signals [signum].pending = 0;
1260 1333
1261 for (w = signals [signum].head; w; w = w->next) 1334 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1335 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1336}
1264 1337
1265#if EV_USE_SIGNALFD 1338#if EV_USE_SIGNALFD
1266static void 1339static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1340sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1341{
1269 struct signalfd_siginfo si[4], *sip; 1342 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1343
1271 for (;;) 1344 for (;;)
1272 { 1345 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1346 ssize_t res = read (sigfd, si, sizeof (si));
1274 1347
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1581 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1582 have_monotonic = 1;
1510 } 1583 }
1511#endif 1584#endif
1512 1585
1586 /* pid check not overridable via env */
1587#ifndef _WIN32
1588 if (flags & EVFLAG_FORKCHECK)
1589 curpid = getpid ();
1590#endif
1591
1592 if (!(flags & EVFLAG_NOENV)
1593 && !enable_secure ()
1594 && getenv ("LIBEV_FLAGS"))
1595 flags = atoi (getenv ("LIBEV_FLAGS"));
1596
1513 ev_rt_now = ev_time (); 1597 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1598 mn_now = get_clock ();
1515 now_floor = mn_now; 1599 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1600 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1601#if EV_MINIMAL < 2
… …
1520 1604
1521 io_blocktime = 0.; 1605 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1606 timeout_blocktime = 0.;
1523 backend = 0; 1607 backend = 0;
1524 backend_fd = -1; 1608 backend_fd = -1;
1525 gotasync = 0; 1609 sig_pending = 0;
1610#if EV_ASYNC_ENABLE
1611 async_pending = 0;
1612#endif
1526#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1527 fs_fd = -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1615#endif
1529#if EV_USE_SIGNALFD 1616#if EV_USE_SIGNALFD
1530 sigfd = -2; 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1618#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 1619
1544 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1546 1622
1547#if EV_USE_PORT 1623#if EV_USE_PORT
… …
1583 close (evfd); 1659 close (evfd);
1584#endif 1660#endif
1585 1661
1586 if (evpipe [0] >= 0) 1662 if (evpipe [0] >= 0)
1587 { 1663 {
1588 close (evpipe [0]); 1664 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1665 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1666 }
1591 } 1667 }
1592 1668
1593#if EV_USE_SIGNALFD 1669#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1670 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1671 close (sigfd);
1600 }
1601#endif 1672#endif
1602 1673
1603#if EV_USE_INOTIFY 1674#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1675 if (fs_fd >= 0)
1605 close (fs_fd); 1676 close (fs_fd);
… …
1630#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1702 array_free (idle, [i]);
1632#endif 1703#endif
1633 } 1704 }
1634 1705
1635 ev_free (anfds); anfdmax = 0; 1706 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1707
1637 /* have to use the microsoft-never-gets-it-right macro */ 1708 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1709 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1710 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1711 array_free (timer, EMPTY);
… …
1675 1746
1676 if (ev_is_active (&pipe_w)) 1747 if (ev_is_active (&pipe_w))
1677 { 1748 {
1678 /* this "locks" the handlers against writing to the pipe */ 1749 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1750 /* while we modify the fd vars */
1680 gotsig = 1; 1751 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1752#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1753 async_pending = 1;
1683#endif 1754#endif
1684 1755
1685 ev_ref (EV_A); 1756 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1757 ev_io_stop (EV_A_ &pipe_w);
1687 1758
… …
1690 close (evfd); 1761 close (evfd);
1691#endif 1762#endif
1692 1763
1693 if (evpipe [0] >= 0) 1764 if (evpipe [0] >= 0)
1694 { 1765 {
1695 close (evpipe [0]); 1766 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1767 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1768 }
1698 1769
1699 evpipe_init (EV_A); 1770 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1771 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1772 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1707#if EV_MULTIPLICITY 1778#if EV_MULTIPLICITY
1708 1779
1709struct ev_loop * 1780struct ev_loop *
1710ev_loop_new (unsigned int flags) 1781ev_loop_new (unsigned int flags)
1711{ 1782{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1783 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1784
1714 memset (loop, 0, sizeof (struct ev_loop)); 1785 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1786 loop_init (EV_A_ flags);
1716 1787
1717 if (ev_backend (EV_A)) 1788 if (ev_backend (EV_A))
1718 return loop; 1789 return EV_A;
1719 1790
1720 return 0; 1791 return 0;
1721} 1792}
1722 1793
1723void 1794void
… …
1827 assert (checkmax >= checkcnt); 1898 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1899 array_verify (EV_A_ (W *)checks, checkcnt);
1829 1900
1830# if 0 1901# if 0
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1902 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) 1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1833# endif 1904# endif
1834#endif 1905#endif
1835} 1906}
1836#endif 1907#endif
1837 1908
… …
1844#endif 1915#endif
1845{ 1916{
1846 if (!ev_default_loop_ptr) 1917 if (!ev_default_loop_ptr)
1847 { 1918 {
1848#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1920 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1921#else
1851 ev_default_loop_ptr = 1; 1922 ev_default_loop_ptr = 1;
1852#endif 1923#endif
1853 1924
1854 loop_init (EV_A_ flags); 1925 loop_init (EV_A_ flags);
… …
1871 1942
1872void 1943void
1873ev_default_destroy (void) 1944ev_default_destroy (void)
1874{ 1945{
1875#if EV_MULTIPLICITY 1946#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1947 EV_P = ev_default_loop_ptr;
1877#endif 1948#endif
1878 1949
1879 ev_default_loop_ptr = 0; 1950 ev_default_loop_ptr = 0;
1880 1951
1881#ifndef _WIN32 1952#ifndef _WIN32
… …
1888 1959
1889void 1960void
1890ev_default_fork (void) 1961ev_default_fork (void)
1891{ 1962{
1892#if EV_MULTIPLICITY 1963#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 1964 EV_P = ev_default_loop_ptr;
1894#endif 1965#endif
1895 1966
1896 postfork = 1; /* must be in line with ev_loop_fork */ 1967 postfork = 1; /* must be in line with ev_loop_fork */
1897} 1968}
1898 1969
… …
2093 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
2094 } 2165 }
2095} 2166}
2096 2167
2097/* fetch new monotonic and realtime times from the kernel */ 2168/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2169/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2170inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
2101{ 2172{
2102#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
… …
2364inline_size void 2435inline_size void
2365wlist_del (WL *head, WL elem) 2436wlist_del (WL *head, WL elem)
2366{ 2437{
2367 while (*head) 2438 while (*head)
2368 { 2439 {
2369 if (*head == elem) 2440 if (expect_true (*head == elem))
2370 { 2441 {
2371 *head = elem->next; 2442 *head = elem->next;
2372 return; 2443 break;
2373 } 2444 }
2374 2445
2375 head = &(*head)->next; 2446 head = &(*head)->next;
2376 } 2447 }
2377} 2448}
… …
2437 2508
2438 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2439 return; 2510 return;
2440 2511
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2513 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2443 2514
2444 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2445 2516
2446 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2517 timers [active] = timers [timercnt + HEAP0]; 2588 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2589 adjustheap (timers, timercnt, active);
2519 } 2590 }
2520 } 2591 }
2521 2592
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2593 ev_at (w) -= mn_now;
2525 2594
2526 ev_stop (EV_A_ (W)w); 2595 ev_stop (EV_A_ (W)w);
2596
2597 EV_FREQUENT_CHECK;
2527} 2598}
2528 2599
2529void noinline 2600void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2601ev_timer_again (EV_P_ ev_timer *w)
2531{ 2602{
… …
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2681 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2682 adjustheap (periodics, periodiccnt, active);
2612 } 2683 }
2613 } 2684 }
2614 2685
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2686 ev_stop (EV_A_ (W)w);
2687
2688 EV_FREQUENT_CHECK;
2618} 2689}
2619 2690
2620void noinline 2691void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2692ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2693{
… …
2631#endif 2702#endif
2632 2703
2633void noinline 2704void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2705ev_signal_start (EV_P_ ev_signal *w)
2635{ 2706{
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))) 2707 if (expect_false (ev_is_active (w)))
2640 return; 2708 return;
2641 2709
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2710 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2711
2712#if EV_MULTIPLICITY
2713 assert (("libev: a signal must not be attached to two different loops",
2714 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2715
2716 signals [w->signum - 1].loop = EV_A;
2717#endif
2643 2718
2644 EV_FREQUENT_CHECK; 2719 EV_FREQUENT_CHECK;
2645 2720
2646#if EV_USE_SIGNALFD 2721#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2722 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2744 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2745 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2746
2672 signalfd (sigfd, &sigfd_set, 0); 2747 signalfd (sigfd, &sigfd_set, 0);
2673 } 2748 }
2674 else
2675#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 EV_USE_SIGNALFD
2689 if (sigfd < 0)/*TODO*/
2690# endif 2749#endif
2691 sigdelset (&prev, w->signum);
2692 sigprocmask (SIG_SETMASK, &prev, 0);
2693#endif
2694 }
2695 2750
2696 ev_start (EV_A_ (W)w, 1); 2751 ev_start (EV_A_ (W)w, 1);
2697 wlist_add (&signals [w->signum - 1].head, (WL)w); 2752 wlist_add (&signals [w->signum - 1].head, (WL)w);
2698 2753
2699 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2700 {
2701#if _WIN32
2702 signal (w->signum, ev_sighandler);
2703#else
2704# if EV_USE_SIGNALFD 2755# if EV_USE_SIGNALFD
2705 if (sigfd < 0) /*TODO*/ 2756 if (sigfd < 0) /*TODO*/
2706# endif 2757# endif
2707 { 2758 {
2759# ifdef _WIN32
2760 evpipe_init (EV_A);
2761
2762 signal (w->signum, ev_sighandler);
2763# else
2708 struct sigaction sa = { }; 2764 struct sigaction sa;
2765
2766 evpipe_init (EV_A);
2767
2709 sa.sa_handler = ev_sighandler; 2768 sa.sa_handler = ev_sighandler;
2710 sigfillset (&sa.sa_mask); 2769 sigfillset (&sa.sa_mask);
2711 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2770 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2712 sigaction (w->signum, &sa, 0); 2771 sigaction (w->signum, &sa, 0);
2772
2773 sigemptyset (&sa.sa_mask);
2774 sigaddset (&sa.sa_mask, w->signum);
2775 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2776#endif
2713 } 2777 }
2714#endif
2715 }
2716 2778
2717 EV_FREQUENT_CHECK; 2779 EV_FREQUENT_CHECK;
2718} 2780}
2719 2781
2720void noinline 2782void noinline
… …
2728 2790
2729 wlist_del (&signals [w->signum - 1].head, (WL)w); 2791 wlist_del (&signals [w->signum - 1].head, (WL)w);
2730 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2731 2793
2732 if (!signals [w->signum - 1].head) 2794 if (!signals [w->signum - 1].head)
2795 {
2796#if EV_MULTIPLICITY
2797 signals [w->signum - 1].loop = 0; /* unattach from signal */
2798#endif
2733#if EV_USE_SIGNALFD 2799#if EV_USE_SIGNALFD
2734 if (sigfd >= 0) 2800 if (sigfd >= 0)
2735 { 2801 {
2736 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2802 sigset_t ss;
2803
2804 sigemptyset (&ss);
2805 sigaddset (&ss, w->signum);
2737 sigdelset (&sigfd_set, w->signum); 2806 sigdelset (&sigfd_set, w->signum);
2807
2738 signalfd (sigfd, &sigfd_set, 0); 2808 signalfd (sigfd, &sigfd_set, 0);
2739 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2809 sigprocmask (SIG_UNBLOCK, &ss, 0);
2740 /*TODO: maybe unblock signal? */
2741 } 2810 }
2742 else 2811 else
2743#endif 2812#endif
2744 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2814 }
2745 2815
2746 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2747} 2817}
2748 2818
2749void 2819void
… …
2790#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2791 2861
2792static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2862static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2793 2863
2794#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2795# define EV_INOTIFY_BUFSIZE 8192 2865
2866/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2867# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2796 2868
2797static void noinline 2869static void noinline
2798infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2799{ 2871{
2800 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); 2872 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);
2801 2873
2802 if (w->wd < 0) 2874 if (w->wd >= 0)
2875 {
2876 struct statfs sfs;
2877
2878 /* now local changes will be tracked by inotify, but remote changes won't */
2879 /* unless the filesystem is known to be local, we therefore still poll */
2880 /* also do poll on <2.6.25, but with normal frequency */
2881
2882 if (!fs_2625)
2883 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2884 else if (!statfs (w->path, &sfs)
2885 && (sfs.f_type == 0x1373 /* devfs */
2886 || sfs.f_type == 0xEF53 /* ext2/3 */
2887 || sfs.f_type == 0x3153464a /* jfs */
2888 || sfs.f_type == 0x52654973 /* reiser3 */
2889 || sfs.f_type == 0x01021994 /* tempfs */
2890 || sfs.f_type == 0x58465342 /* xfs */))
2891 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2892 else
2893 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2803 { 2894 }
2895 else
2896 {
2897 /* can't use inotify, continue to stat */
2804 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2898 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2805 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2806 2899
2807 /* monitor some parent directory for speedup hints */ 2900 /* if path is not there, monitor some parent directory for speedup hints */
2808 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2901 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2809 /* but an efficiency issue only */ 2902 /* but an efficiency issue only */
2810 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2903 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2811 { 2904 {
2812 char path [4096]; 2905 char path [4096];
… …
2828 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2829 } 2922 }
2830 } 2923 }
2831 2924
2832 if (w->wd >= 0) 2925 if (w->wd >= 0)
2833 {
2834 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2926 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2835 2927
2836 /* now local changes will be tracked by inotify, but remote changes won't */ 2928 /* now re-arm timer, if required */
2837 /* unless the filesystem it known to be local, we therefore still poll */ 2929 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2838 /* also do poll on <2.6.25, but with normal frequency */
2839 struct statfs sfs;
2840
2841 if (fs_2625 && !statfs (w->path, &sfs))
2842 if (sfs.f_type == 0x1373 /* devfs */
2843 || sfs.f_type == 0xEF53 /* ext2/3 */
2844 || sfs.f_type == 0x3153464a /* jfs */
2845 || sfs.f_type == 0x52654973 /* reiser3 */
2846 || sfs.f_type == 0x01021994 /* tempfs */
2847 || sfs.f_type == 0x58465342 /* xfs */)
2848 return;
2849
2850 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2851 ev_timer_again (EV_A_ &w->timer); 2930 ev_timer_again (EV_A_ &w->timer);
2852 } 2931 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2853} 2932}
2854 2933
2855static void noinline 2934static void noinline
2856infy_del (EV_P_ ev_stat *w) 2935infy_del (EV_P_ ev_stat *w)
2857{ 2936{
… …
2902 2981
2903static void 2982static void
2904infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2905{ 2984{
2906 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2907 struct inotify_event *ev = (struct inotify_event *)buf;
2908 int ofs; 2986 int ofs;
2909 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2910 2988
2911 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2989 for (ofs = 0; ofs < len; )
2990 {
2991 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2912 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2992 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len;
2994 }
2913} 2995}
2914 2996
2915inline_size void 2997inline_size void
2916check_2625 (EV_P) 2998check_2625 (EV_P)
2917{ 2999{
… …
2933 return; 3015 return;
2934 3016
2935 fs_2625 = 1; 3017 fs_2625 = 1;
2936} 3018}
2937 3019
3020inline_size int
3021infy_newfd (void)
3022{
3023#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3024 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3025 if (fd >= 0)
3026 return fd;
3027#endif
3028 return inotify_init ();
3029}
3030
2938inline_size void 3031inline_size void
2939infy_init (EV_P) 3032infy_init (EV_P)
2940{ 3033{
2941 if (fs_fd != -2) 3034 if (fs_fd != -2)
2942 return; 3035 return;
2943 3036
2944 fs_fd = -1; 3037 fs_fd = -1;
2945 3038
2946 check_2625 (EV_A); 3039 check_2625 (EV_A);
2947 3040
2948 fs_fd = inotify_init (); 3041 fs_fd = infy_newfd ();
2949 3042
2950 if (fs_fd >= 0) 3043 if (fs_fd >= 0)
2951 { 3044 {
3045 fd_intern (fs_fd);
2952 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3046 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2953 ev_set_priority (&fs_w, EV_MAXPRI); 3047 ev_set_priority (&fs_w, EV_MAXPRI);
2954 ev_io_start (EV_A_ &fs_w); 3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
2955 } 3050 }
2956} 3051}
2957 3052
2958inline_size void 3053inline_size void
2959infy_fork (EV_P) 3054infy_fork (EV_P)
… …
2961 int slot; 3056 int slot;
2962 3057
2963 if (fs_fd < 0) 3058 if (fs_fd < 0)
2964 return; 3059 return;
2965 3060
3061 ev_ref (EV_A);
3062 ev_io_stop (EV_A_ &fs_w);
2966 close (fs_fd); 3063 close (fs_fd);
2967 fs_fd = inotify_init (); 3064 fs_fd = infy_newfd ();
3065
3066 if (fs_fd >= 0)
3067 {
3068 fd_intern (fs_fd);
3069 ev_io_set (&fs_w, fs_fd, EV_READ);
3070 ev_io_start (EV_A_ &fs_w);
3071 ev_unref (EV_A);
3072 }
2968 3073
2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2970 { 3075 {
2971 WL w_ = fs_hash [slot].head; 3076 WL w_ = fs_hash [slot].head;
2972 fs_hash [slot].head = 0; 3077 fs_hash [slot].head = 0;
… …
2979 w->wd = -1; 3084 w->wd = -1;
2980 3085
2981 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2982 infy_add (EV_A_ w); /* re-add, no matter what */ 3087 infy_add (EV_A_ w); /* re-add, no matter what */
2983 else 3088 else
3089 {
3090 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3091 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2984 ev_timer_again (EV_A_ &w->timer); 3092 ev_timer_again (EV_A_ &w->timer);
3093 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3094 }
2985 } 3095 }
2986 } 3096 }
2987} 3097}
2988 3098
2989#endif 3099#endif
… …
3006static void noinline 3116static void noinline
3007stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3008{ 3118{
3009 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3010 3120
3011 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
3012 /* prev has the old value when the callback gets invoked */
3013 w->prev = w->attr;
3014 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
3015 3123
3016 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3124 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3017 if ( 3125 if (
3018 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
3019 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
3020 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
3021 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
3022 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
3023 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
3024 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
3025 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
3026 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
3027 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
3028 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
3029 ) { 3137 ) {
3138 /* we only update w->prev on actual differences */
3139 /* in case we test more often than invoke the callback, */
3140 /* to ensure that prev is always different to attr */
3141 w->prev = prev;
3142
3030 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
3031 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
3032 { 3145 {
3033 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
3034 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);
… …
3059 3172
3060 if (fs_fd >= 0) 3173 if (fs_fd >= 0)
3061 infy_add (EV_A_ w); 3174 infy_add (EV_A_ w);
3062 else 3175 else
3063#endif 3176#endif
3177 {
3064 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 ev_unref (EV_A);
3180 }
3065 3181
3066 ev_start (EV_A_ (W)w, 1); 3182 ev_start (EV_A_ (W)w, 1);
3067 3183
3068 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
3069} 3185}
… …
3078 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
3079 3195
3080#if EV_USE_INOTIFY 3196#if EV_USE_INOTIFY
3081 infy_del (EV_A_ w); 3197 infy_del (EV_A_ w);
3082#endif 3198#endif
3199
3200 if (ev_is_active (&w->timer))
3201 {
3202 ev_ref (EV_A);
3083 ev_timer_stop (EV_A_ &w->timer); 3203 ev_timer_stop (EV_A_ &w->timer);
3204 }
3084 3205
3085 ev_stop (EV_A_ (W)w); 3206 ev_stop (EV_A_ (W)w);
3086 3207
3087 EV_FREQUENT_CHECK; 3208 EV_FREQUENT_CHECK;
3088} 3209}
… …
3229embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3350embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3230{ 3351{
3231 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3352 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3232 3353
3233 { 3354 {
3234 struct ev_loop *loop = w->other; 3355 EV_P = w->other;
3235 3356
3236 while (fdchangecnt) 3357 while (fdchangecnt)
3237 { 3358 {
3238 fd_reify (EV_A); 3359 fd_reify (EV_A);
3239 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3360 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3247 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3368 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3248 3369
3249 ev_embed_stop (EV_A_ w); 3370 ev_embed_stop (EV_A_ w);
3250 3371
3251 { 3372 {
3252 struct ev_loop *loop = w->other; 3373 EV_P = w->other;
3253 3374
3254 ev_loop_fork (EV_A); 3375 ev_loop_fork (EV_A);
3255 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3376 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3256 } 3377 }
3257 3378
… …
3271{ 3392{
3272 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
3273 return; 3394 return;
3274 3395
3275 { 3396 {
3276 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
3277 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3398 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3278 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3399 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3279 } 3400 }
3280 3401
3281 EV_FREQUENT_CHECK; 3402 EV_FREQUENT_CHECK;
… …
3308 3429
3309 ev_io_stop (EV_A_ &w->io); 3430 ev_io_stop (EV_A_ &w->io);
3310 ev_prepare_stop (EV_A_ &w->prepare); 3431 ev_prepare_stop (EV_A_ &w->prepare);
3311 ev_fork_stop (EV_A_ &w->fork); 3432 ev_fork_stop (EV_A_ &w->fork);
3312 3433
3434 ev_stop (EV_A_ (W)w);
3435
3313 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3314} 3437}
3315#endif 3438#endif
3316 3439
3317#if EV_FORK_ENABLE 3440#if EV_FORK_ENABLE
… …
3393 3516
3394void 3517void
3395ev_async_send (EV_P_ ev_async *w) 3518ev_async_send (EV_P_ ev_async *w)
3396{ 3519{
3397 w->sent = 1; 3520 w->sent = 1;
3398 evpipe_write (EV_A_ &gotasync); 3521 evpipe_write (EV_A_ &async_pending);
3399} 3522}
3400#endif 3523#endif
3401 3524
3402/*****************************************************************************/ 3525/*****************************************************************************/
3403 3526
… …
3552 if (types & EV_CHECK) 3675 if (types & EV_CHECK)
3553 for (i = checkcnt; i--; ) 3676 for (i = checkcnt; i--; )
3554 cb (EV_A_ EV_CHECK, checks [i]); 3677 cb (EV_A_ EV_CHECK, checks [i]);
3555 3678
3556 if (types & EV_SIGNAL) 3679 if (types & EV_SIGNAL)
3557 for (i = 0; i < signalmax; ++i) 3680 for (i = 0; i < EV_NSIG - 1; ++i)
3558 for (wl = signals [i].head; wl; ) 3681 for (wl = signals [i].head; wl; )
3559 { 3682 {
3560 wn = wl->next; 3683 wn = wl->next;
3561 cb (EV_A_ EV_SIGNAL, wl); 3684 cb (EV_A_ EV_SIGNAL, wl);
3562 wl = wn; 3685 wl = wn;

Diff Legend

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