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.330 by root, Tue Mar 9 08:46:17 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);
370# ifdef __cplusplus 409# ifdef __cplusplus
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
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? */
448#endif 511#endif
449 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)
521#endif
522
450#ifdef _WIN32 523#ifdef _WIN32
451# include "ev_win32.c" 524# include "ev_win32.c"
452#endif 525#endif
453 526
454/*****************************************************************************/ 527/*****************************************************************************/
469 542
470 if (syserr_cb) 543 if (syserr_cb)
471 syserr_cb (msg); 544 syserr_cb (msg);
472 else 545 else
473 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
474 perror (msg); 554 perror (msg);
555#endif
475 abort (); 556 abort ();
476 } 557 }
477} 558}
478 559
479static void * 560static void *
504{ 585{
505 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
506 587
507 if (!ptr && size) 588 if (!ptr && size)
508 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
509 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
510 abort (); 596 abort ();
511 } 597 }
512 598
513 return ptr; 599 return ptr;
514} 600}
845 931
846#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
847 if (events) 933 if (events)
848 { 934 {
849 unsigned long arg; 935 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 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)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
856 } 938 }
857#endif 939#endif
858 940
859 { 941 {
902/* check whether the given fd is atcually valid, for error recovery */ 984/* check whether the given fd is atcually valid, for error recovery */
903inline_size int 985inline_size int
904fd_valid (int fd) 986fd_valid (int fd)
905{ 987{
906#ifdef _WIN32 988#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 990#else
909 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
910#endif 992#endif
911} 993}
912 994
930 1012
931 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1014 if (anfds [fd].events)
933 { 1015 {
934 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
935 return; 1017 break;
936 } 1018 }
937} 1019}
938 1020
939/* usually called after fork if backend needs to re-arm all fds from scratch */ 1021/* usually called after fork if backend needs to re-arm all fds from scratch */
940static void noinline 1022static void noinline
1030 1112
1031 for (;;) 1113 for (;;)
1032 { 1114 {
1033 int c = k << 1; 1115 int c = k << 1;
1034 1116
1035 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
1036 break; 1118 break;
1037 1119
1038 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1120 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1039 ? 1 : 0; 1121 ? 1 : 0;
1040 1122
1076 1158
1077/* move an element suitably so it is in a correct place */ 1159/* move an element suitably so it is in a correct place */
1078inline_size void 1160inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
1080{ 1162{
1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1163 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1082 upheap (heap, k); 1164 upheap (heap, k);
1083 else 1165 else
1084 downheap (heap, N, k); 1166 downheap (heap, N, k);
1085} 1167}
1086 1168
1099/*****************************************************************************/ 1181/*****************************************************************************/
1100 1182
1101/* associate signal watchers to a signal signal */ 1183/* associate signal watchers to a signal signal */
1102typedef struct 1184typedef struct
1103{ 1185{
1186 EV_ATOMIC_T pending;
1187#if EV_MULTIPLICITY
1188 EV_P;
1189#endif
1104 WL head; 1190 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1191} ANSIG;
1107 1192
1108static ANSIG *signals; 1193static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1194
1113/*****************************************************************************/ 1195/*****************************************************************************/
1114 1196
1115/* used to prepare libev internal fd's */ 1197/* used to prepare libev internal fd's */
1116/* this is not fork-safe */ 1198/* this is not fork-safe */
1117inline_speed void 1199inline_speed void
1118fd_intern (int fd) 1200fd_intern (int fd)
1119{ 1201{
1120#ifdef _WIN32 1202#ifdef _WIN32
1121 unsigned long arg = 1; 1203 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1123#else 1205#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif 1208#endif
1127} 1209}
1184/* called whenever the libev signal pipe */ 1266/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1267/* got some events (signal, async) */
1186static void 1268static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1270{
1271 int i;
1272
1189#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1274 if (evfd >= 0)
1191 { 1275 {
1192 uint64_t counter; 1276 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
1197 { 1281 {
1198 char dummy; 1282 char dummy;
1199 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1200 } 1284 }
1201 1285
1202 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1203 { 1287 {
1204 int signum; 1288 sig_pending = 0;
1205 gotsig = 0;
1206 1289
1207 for (signum = signalmax; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1293 }
1211 1294
1212#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1213 if (gotasync) 1296 if (async_pending)
1214 { 1297 {
1215 int i; 1298 async_pending = 0;
1216 gotasync = 0;
1217 1299
1218 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1220 { 1302 {
1221 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
1229 1311
1230static void 1312static void
1231ev_sighandler (int signum) 1313ev_sighandler (int signum)
1232{ 1314{
1233#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1316 EV_P = signals [signum - 1].loop;
1235#endif 1317#endif
1236 1318
1237#if _WIN32 1319#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1239#endif 1321#endif
1240 1322
1241 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1243} 1325}
1244 1326
1245void noinline 1327void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1247{ 1329{
1248 WL w; 1330 WL w;
1249 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1250#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1338 /* it is permissible to try to feed a signal to the wrong loop */
1252#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1340
1254 --signum; 1341 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1342 return;
1343#endif
1258 1344
1259 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1260 1346
1261 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1349}
1264 1350
1265#if EV_USE_SIGNALFD 1351#if EV_USE_SIGNALFD
1266static void 1352static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1353sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1354{
1269 struct signalfd_siginfo si[4], *sip; 1355 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1356
1271 for (;;) 1357 for (;;)
1272 { 1358 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1359 ssize_t res = read (sigfd, si, sizeof (si));
1274 1360
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1594 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1595 have_monotonic = 1;
1510 } 1596 }
1511#endif 1597#endif
1512 1598
1599 /* pid check not overridable via env */
1600#ifndef _WIN32
1601 if (flags & EVFLAG_FORKCHECK)
1602 curpid = getpid ();
1603#endif
1604
1605 if (!(flags & EVFLAG_NOENV)
1606 && !enable_secure ()
1607 && getenv ("LIBEV_FLAGS"))
1608 flags = atoi (getenv ("LIBEV_FLAGS"));
1609
1513 ev_rt_now = ev_time (); 1610 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1611 mn_now = get_clock ();
1515 now_floor = mn_now; 1612 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1613 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1614#if EV_MINIMAL < 2
1520 1617
1521 io_blocktime = 0.; 1618 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1523 backend = 0; 1620 backend = 0;
1524 backend_fd = -1; 1621 backend_fd = -1;
1525 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1526#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1527 fs_fd = -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1628#endif
1529#if EV_USE_SIGNALFD 1629#if EV_USE_SIGNALFD
1530 sigfd = -2; 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1631#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 1632
1544 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1546 1635
1547#if EV_USE_PORT 1636#if EV_USE_PORT
1583 close (evfd); 1672 close (evfd);
1584#endif 1673#endif
1585 1674
1586 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1587 { 1676 {
1588 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1679 }
1591 } 1680 }
1592 1681
1593#if EV_USE_SIGNALFD 1682#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1683 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1684 close (sigfd);
1600 }
1601#endif 1685#endif
1602 1686
1603#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1605 close (fs_fd); 1689 close (fs_fd);
1630#if EV_IDLE_ENABLE 1714#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1715 array_free (idle, [i]);
1632#endif 1716#endif
1633 } 1717 }
1634 1718
1635 ev_free (anfds); anfdmax = 0; 1719 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1720
1637 /* have to use the microsoft-never-gets-it-right macro */ 1721 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1722 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1723 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1724 array_free (timer, EMPTY);
1675 1759
1676 if (ev_is_active (&pipe_w)) 1760 if (ev_is_active (&pipe_w))
1677 { 1761 {
1678 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1680 gotsig = 1; 1764 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1766 async_pending = 1;
1683#endif 1767#endif
1684 1768
1685 ev_ref (EV_A); 1769 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1770 ev_io_stop (EV_A_ &pipe_w);
1687 1771
1690 close (evfd); 1774 close (evfd);
1691#endif 1775#endif
1692 1776
1693 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1694 { 1778 {
1695 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1781 }
1698 1782
1699 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
1707#if EV_MULTIPLICITY 1791#if EV_MULTIPLICITY
1708 1792
1709struct ev_loop * 1793struct ev_loop *
1710ev_loop_new (unsigned int flags) 1794ev_loop_new (unsigned int flags)
1711{ 1795{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1796 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1797
1714 memset (loop, 0, sizeof (struct ev_loop)); 1798 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1799 loop_init (EV_A_ flags);
1716 1800
1717 if (ev_backend (EV_A)) 1801 if (ev_backend (EV_A))
1718 return loop; 1802 return EV_A;
1719 1803
1720 return 0; 1804 return 0;
1721} 1805}
1722 1806
1723void 1807void
1827 assert (checkmax >= checkcnt); 1911 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1912 array_verify (EV_A_ (W *)checks, checkcnt);
1829 1913
1830# if 0 1914# if 0
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1915 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) 1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1833# endif 1917# endif
1834#endif 1918#endif
1835} 1919}
1836#endif 1920#endif
1837 1921
1844#endif 1928#endif
1845{ 1929{
1846 if (!ev_default_loop_ptr) 1930 if (!ev_default_loop_ptr)
1847 { 1931 {
1848#if EV_MULTIPLICITY 1932#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1933 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1934#else
1851 ev_default_loop_ptr = 1; 1935 ev_default_loop_ptr = 1;
1852#endif 1936#endif
1853 1937
1854 loop_init (EV_A_ flags); 1938 loop_init (EV_A_ flags);
1871 1955
1872void 1956void
1873ev_default_destroy (void) 1957ev_default_destroy (void)
1874{ 1958{
1875#if EV_MULTIPLICITY 1959#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1960 EV_P = ev_default_loop_ptr;
1877#endif 1961#endif
1878 1962
1879 ev_default_loop_ptr = 0; 1963 ev_default_loop_ptr = 0;
1880 1964
1881#ifndef _WIN32 1965#ifndef _WIN32
1888 1972
1889void 1973void
1890ev_default_fork (void) 1974ev_default_fork (void)
1891{ 1975{
1892#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 1977 EV_P = ev_default_loop_ptr;
1894#endif 1978#endif
1895 1979
1896 postfork = 1; /* must be in line with ev_loop_fork */ 1980 postfork = 1; /* must be in line with ev_loop_fork */
1897} 1981}
1898 1982
2093 ANHE_at_cache (*he); 2177 ANHE_at_cache (*he);
2094 } 2178 }
2095} 2179}
2096 2180
2097/* fetch new monotonic and realtime times from the kernel */ 2181/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2182/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2183inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
2101{ 2185{
2102#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
2364inline_size void 2448inline_size void
2365wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
2366{ 2450{
2367 while (*head) 2451 while (*head)
2368 { 2452 {
2369 if (*head == elem) 2453 if (expect_true (*head == elem))
2370 { 2454 {
2371 *head = elem->next; 2455 *head = elem->next;
2372 return; 2456 break;
2373 } 2457 }
2374 2458
2375 head = &(*head)->next; 2459 head = &(*head)->next;
2376 } 2460 }
2377} 2461}
2437 2521
2438 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2439 return; 2523 return;
2440 2524
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 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)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2443 2527
2444 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2445 2529
2446 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2517 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2519 } 2603 }
2520 } 2604 }
2521 2605
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2525 2607
2526 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2527} 2611}
2528 2612
2529void noinline 2613void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2531{ 2615{
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2612 } 2696 }
2613 } 2697 }
2614 2698
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2618} 2702}
2619 2703
2620void noinline 2704void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2706{
2631#endif 2715#endif
2632 2716
2633void noinline 2717void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2718ev_signal_start (EV_P_ ev_signal *w)
2635{ 2719{
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))) 2720 if (expect_false (ev_is_active (w)))
2640 return; 2721 return;
2641 2722
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2723 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2724
2725#if EV_MULTIPLICITY
2726 assert (("libev: a signal must not be attached to two different loops",
2727 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2728
2729 signals [w->signum - 1].loop = EV_A;
2730#endif
2643 2731
2644 EV_FREQUENT_CHECK; 2732 EV_FREQUENT_CHECK;
2645 2733
2646#if EV_USE_SIGNALFD 2734#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2735 if (sigfd == -2)
2669 sigaddset (&sigfd_set, w->signum); 2757 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2758 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2759
2672 signalfd (sigfd, &sigfd_set, 0); 2760 signalfd (sigfd, &sigfd_set, 0);
2673 } 2761 }
2674 else
2675#endif 2762#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 2763
2694 ev_start (EV_A_ (W)w, 1); 2764 ev_start (EV_A_ (W)w, 1);
2695 wlist_add (&signals [w->signum - 1].head, (WL)w); 2765 wlist_add (&signals [w->signum - 1].head, (WL)w);
2696 2766
2697 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2768# if EV_USE_SIGNALFD
2769 if (sigfd < 0) /*TODO*/
2770# endif
2698 { 2771 {
2699#if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2700 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2701#else 2776# else
2702 if (sigfd < 0) /*TODO*/
2703 {
2704 struct sigaction sa = { }; 2777 struct sigaction sa;
2778
2779 evpipe_init (EV_A);
2780
2705 sa.sa_handler = ev_sighandler; 2781 sa.sa_handler = ev_sighandler;
2706 sigfillset (&sa.sa_mask); 2782 sigfillset (&sa.sa_mask);
2707 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2708 sigaction (w->signum, &sa, 0); 2784 sigaction (w->signum, &sa, 0);
2785
2786 sigemptyset (&sa.sa_mask);
2787 sigaddset (&sa.sa_mask, w->signum);
2788 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2789#endif
2709 } 2790 }
2710#endif
2711 }
2712 2791
2713 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
2714} 2793}
2715 2794
2716void noinline 2795void noinline
2724 2803
2725 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2726 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2727 2806
2728 if (!signals [w->signum - 1].head) 2807 if (!signals [w->signum - 1].head)
2808 {
2809#if EV_MULTIPLICITY
2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2811#endif
2729#if EV_USE_SIGNALFD 2812#if EV_USE_SIGNALFD
2730 if (sigfd >= 0) 2813 if (sigfd >= 0)
2731 { 2814 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2733 sigdelset (&sigfd_set, w->signum); 2819 sigdelset (&sigfd_set, w->signum);
2820
2734 signalfd (sigfd, &sigfd_set, 0); 2821 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2736 /*TODO: maybe unblock signal? */
2737 } 2823 }
2738 else 2824 else
2739#endif 2825#endif
2740 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2827 }
2741 2828
2742 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2743} 2830}
2744 2831
2745void 2832void
2786#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2787 2874
2788static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2789 2876
2790#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2791# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2792 2881
2793static void noinline 2882static void noinline
2794infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2795{ 2884{
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); 2885 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 2886
2798 if (w->wd < 0) 2887 if (w->wd >= 0)
2888 {
2889 struct statfs sfs;
2890
2891 /* now local changes will be tracked by inotify, but remote changes won't */
2892 /* unless the filesystem is known to be local, we therefore still poll */
2893 /* also do poll on <2.6.25, but with normal frequency */
2894
2895 if (!fs_2625)
2896 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2897 else if (!statfs (w->path, &sfs)
2898 && (sfs.f_type == 0x1373 /* devfs */
2899 || sfs.f_type == 0xEF53 /* ext2/3 */
2900 || sfs.f_type == 0x3153464a /* jfs */
2901 || sfs.f_type == 0x52654973 /* reiser3 */
2902 || sfs.f_type == 0x01021994 /* tempfs */
2903 || sfs.f_type == 0x58465342 /* xfs */))
2904 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2905 else
2906 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2799 { 2907 }
2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2800 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2911 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 2912
2803 /* monitor some parent directory for speedup hints */ 2913 /* 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, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2805 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2806 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2807 { 2917 {
2808 char path [4096]; 2918 char path [4096];
2824 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2825 } 2935 }
2826 } 2936 }
2827 2937
2828 if (w->wd >= 0) 2938 if (w->wd >= 0)
2829 {
2830 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2831 2940
2832 /* now local changes will be tracked by inotify, but remote changes won't */ 2941 /* now re-arm timer, if required */
2833 /* unless the filesystem it known to be local, we therefore still poll */ 2942 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); 2943 ev_timer_again (EV_A_ &w->timer);
2848 } 2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2849} 2945}
2850 2946
2851static void noinline 2947static void noinline
2852infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2853{ 2949{
2898 2994
2899static void 2995static void
2900infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2901{ 2997{
2902 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2903 struct inotify_event *ev = (struct inotify_event *)buf;
2904 int ofs; 2999 int ofs;
2905 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2906 3001
2907 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2908 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
2909} 3040}
2910 3041
2911inline_size void 3042inline_size void
2912check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2913{ 3044{
2914 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2915 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2916 */ 3047 */
2917 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2918 int major, minor, micro;
2919
2920 if (uname (&buf))
2921 return; 3049 return;
2922 3050
2923 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2924 return;
2925
2926 if (major < 2
2927 || (major == 2 && minor < 6)
2928 || (major == 2 && minor == 6 && micro < 25))
2929 return;
2930
2931 fs_2625 = 1; 3051 fs_2625 = 1;
3052}
3053
3054inline_size int
3055infy_newfd (void)
3056{
3057#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3058 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3059 if (fd >= 0)
3060 return fd;
3061#endif
3062 return inotify_init ();
2932} 3063}
2933 3064
2934inline_size void 3065inline_size void
2935infy_init (EV_P) 3066infy_init (EV_P)
2936{ 3067{
2937 if (fs_fd != -2) 3068 if (fs_fd != -2)
2938 return; 3069 return;
2939 3070
2940 fs_fd = -1; 3071 fs_fd = -1;
2941 3072
2942 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
2943 3074
2944 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2945 3076
2946 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2947 { 3078 {
3079 fd_intern (fs_fd);
2948 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2949 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2950 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2951 } 3084 }
2952} 3085}
2953 3086
2954inline_size void 3087inline_size void
2955infy_fork (EV_P) 3088infy_fork (EV_P)
2957 int slot; 3090 int slot;
2958 3091
2959 if (fs_fd < 0) 3092 if (fs_fd < 0)
2960 return; 3093 return;
2961 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2962 close (fs_fd); 3097 close (fs_fd);
2963 fs_fd = inotify_init (); 3098 fs_fd = infy_newfd ();
3099
3100 if (fs_fd >= 0)
3101 {
3102 fd_intern (fs_fd);
3103 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A);
3106 }
2964 3107
2965 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2966 { 3109 {
2967 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2968 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
2975 w->wd = -1; 3118 w->wd = -1;
2976 3119
2977 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
2978 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2979 else 3122 else
3123 {
3124 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3125 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2980 ev_timer_again (EV_A_ &w->timer); 3126 ev_timer_again (EV_A_ &w->timer);
3127 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3128 }
2981 } 3129 }
2982 } 3130 }
2983} 3131}
2984 3132
2985#endif 3133#endif
3002static void noinline 3150static void noinline
3003stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3004{ 3152{
3005 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3006 3154
3007 /* we copy this here each the time so that */ 3155 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); 3156 ev_stat_stat (EV_A_ w);
3011 3157
3012 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3158 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3013 if ( 3159 if (
3014 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
3015 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
3016 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
3017 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
3018 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
3019 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
3020 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
3021 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
3022 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
3023 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
3024 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
3025 ) { 3171 ) {
3172 /* we only update w->prev on actual differences */
3173 /* in case we test more often than invoke the callback, */
3174 /* to ensure that prev is always different to attr */
3175 w->prev = prev;
3176
3026 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
3027 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
3028 { 3179 {
3029 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
3030 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
3055 3206
3056 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
3057 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
3058 else 3209 else
3059#endif 3210#endif
3211 {
3060 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
3061 3215
3062 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
3063 3217
3064 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
3065} 3219}
3074 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
3075 3229
3076#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
3077 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
3078#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
3079 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
3080 3239
3081 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
3082 3241
3083 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
3084} 3243}
3225embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3226{ 3385{
3227 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3386 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3228 3387
3229 { 3388 {
3230 struct ev_loop *loop = w->other; 3389 EV_P = w->other;
3231 3390
3232 while (fdchangecnt) 3391 while (fdchangecnt)
3233 { 3392 {
3234 fd_reify (EV_A); 3393 fd_reify (EV_A);
3235 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3394 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3243 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3402 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3244 3403
3245 ev_embed_stop (EV_A_ w); 3404 ev_embed_stop (EV_A_ w);
3246 3405
3247 { 3406 {
3248 struct ev_loop *loop = w->other; 3407 EV_P = w->other;
3249 3408
3250 ev_loop_fork (EV_A); 3409 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3410 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 } 3411 }
3253 3412
3267{ 3426{
3268 if (expect_false (ev_is_active (w))) 3427 if (expect_false (ev_is_active (w)))
3269 return; 3428 return;
3270 3429
3271 { 3430 {
3272 struct ev_loop *loop = w->other; 3431 EV_P = w->other;
3273 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3432 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); 3433 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3275 } 3434 }
3276 3435
3277 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3304 3463
3305 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3306 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3307 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3308 3467
3468 ev_stop (EV_A_ (W)w);
3469
3309 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3310} 3471}
3311#endif 3472#endif
3312 3473
3313#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE
3389 3550
3390void 3551void
3391ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
3392{ 3553{
3393 w->sent = 1; 3554 w->sent = 1;
3394 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
3395} 3556}
3396#endif 3557#endif
3397 3558
3398/*****************************************************************************/ 3559/*****************************************************************************/
3399 3560
3548 if (types & EV_CHECK) 3709 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; ) 3710 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]); 3711 cb (EV_A_ EV_CHECK, checks [i]);
3551 3712
3552 if (types & EV_SIGNAL) 3713 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i) 3714 for (i = 0; i < EV_NSIG - 1; ++i)
3554 for (wl = signals [i].head; wl; ) 3715 for (wl = signals [i].head; wl; )
3555 { 3716 {
3556 wn = wl->next; 3717 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl); 3718 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn; 3719 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines