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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.331 by root, Tue Mar 9 08:55:03 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
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 64 218# define EV_NSIG 65
216#endif 219#endif
217 220
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 221#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 222# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 223# define EV_USE_CLOCK_SYSCALL 1
228# else 224# else
229# define EV_USE_CLOCK_SYSCALL 0 225# define EV_USE_CLOCK_SYSCALL 0
309# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
310# endif 306# endif
311#endif 307#endif
312 308
313#ifndef EV_USE_SIGNALFD 309#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 311# define EV_USE_SIGNALFD 1
316# else 312# else
317# define EV_USE_SIGNALFD 0 313# define EV_USE_SIGNALFD 0
318# endif 314# endif
319#endif 315#endif
350# endif 346# endif
351#endif 347#endif
352 348
353/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
354 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
355#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
358#endif 360#endif
359 361
393# include <stdint.h> 395# include <stdint.h>
394# ifndef EFD_NONBLOCK 396# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 397# define EFD_NONBLOCK O_NONBLOCK
396# endif 398# endif
397# ifndef EFD_CLOEXEC 399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
399# endif 405# endif
400# ifdef __cplusplus 406# ifdef __cplusplus
401extern "C" { 407extern "C" {
402# endif 408# endif
403int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
404# ifdef __cplusplus 410# ifdef __cplusplus
405} 411}
406# endif 412# endif
407#endif 413#endif
408 414
409#if EV_USE_SIGNALFD 415#if EV_USE_SIGNALFD
410# include <sys/signalfd.h> 416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
411#endif 420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
412 443
413/**/ 444/**/
414 445
415#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
428 */ 459 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 461
431#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
432#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
433/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
434 464
435#if __GNUC__ >= 4 465#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
438#else 468#else
479 509
480#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
482#endif 512#endif
483 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
484#ifdef _WIN32 524#ifdef _WIN32
485# include "ev_win32.c" 525# include "ev_win32.c"
486#endif 526#endif
487 527
488/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
489 537
490static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
491 539
492void 540void
493ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
503 551
504 if (syserr_cb) 552 if (syserr_cb)
505 syserr_cb (msg); 553 syserr_cb (msg);
506 else 554 else
507 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
508 perror (msg); 564 perror (msg);
565#endif
509 abort (); 566 abort ();
510 } 567 }
511} 568}
512 569
513static void * 570static void *
538{ 595{
539 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
540 597
541 if (!ptr && size) 598 if (!ptr && size)
542 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
544 abort (); 605 abort ();
545 } 606 }
546 607
547 return ptr; 608 return ptr;
548} 609}
879 940
880#if EV_SELECT_IS_WINSOCKET 941#if EV_SELECT_IS_WINSOCKET
881 if (events) 942 if (events)
882 { 943 {
883 unsigned long arg; 944 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 945 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
886 #else
887 anfd->handle = _get_osfhandle (fd);
888 #endif
889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 947 }
891#endif 948#endif
892 949
893 { 950 {
936/* check whether the given fd is atcually valid, for error recovery */ 993/* check whether the given fd is atcually valid, for error recovery */
937inline_size int 994inline_size int
938fd_valid (int fd) 995fd_valid (int fd)
939{ 996{
940#ifdef _WIN32 997#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 998 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 999#else
943 return fcntl (fd, F_GETFD) != -1; 1000 return fcntl (fd, F_GETFD) != -1;
944#endif 1001#endif
945} 1002}
946 1003
964 1021
965 for (fd = anfdmax; fd--; ) 1022 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1023 if (anfds [fd].events)
967 { 1024 {
968 fd_kill (EV_A_ fd); 1025 fd_kill (EV_A_ fd);
969 return; 1026 break;
970 } 1027 }
971} 1028}
972 1029
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1030/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1031static void noinline
1064 1121
1065 for (;;) 1122 for (;;)
1066 { 1123 {
1067 int c = k << 1; 1124 int c = k << 1;
1068 1125
1069 if (c > N + HEAP0 - 1) 1126 if (c >= N + HEAP0)
1070 break; 1127 break;
1071 1128
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1129 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1130 ? 1 : 0;
1074 1131
1110 1167
1111/* move an element suitably so it is in a correct place */ 1168/* move an element suitably so it is in a correct place */
1112inline_size void 1169inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1170adjustheap (ANHE *heap, int N, int k)
1114{ 1171{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1172 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1173 upheap (heap, k);
1117 else 1174 else
1118 downheap (heap, N, k); 1175 downheap (heap, N, k);
1119} 1176}
1120 1177
1133/*****************************************************************************/ 1190/*****************************************************************************/
1134 1191
1135/* associate signal watchers to a signal signal */ 1192/* associate signal watchers to a signal signal */
1136typedef struct 1193typedef struct
1137{ 1194{
1195 EV_ATOMIC_T pending;
1196#if EV_MULTIPLICITY
1197 EV_P;
1198#endif
1138 WL head; 1199 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1200} ANSIG;
1141 1201
1142static ANSIG *signals; 1202static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1203
1147/*****************************************************************************/ 1204/*****************************************************************************/
1148 1205
1149/* used to prepare libev internal fd's */ 1206/* used to prepare libev internal fd's */
1150/* this is not fork-safe */ 1207/* this is not fork-safe */
1151inline_speed void 1208inline_speed void
1152fd_intern (int fd) 1209fd_intern (int fd)
1153{ 1210{
1154#ifdef _WIN32 1211#ifdef _WIN32
1155 unsigned long arg = 1; 1212 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1157#else 1214#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC); 1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK); 1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif 1217#endif
1161} 1218}
1218/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1220static void 1277static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1279{
1280 int i;
1281
1223#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1283 if (evfd >= 0)
1225 { 1284 {
1226 uint64_t counter; 1285 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
1231 { 1290 {
1232 char dummy; 1291 char dummy;
1233 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1234 } 1293 }
1235 1294
1236 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1237 { 1296 {
1238 int signum; 1297 sig_pending = 0;
1239 gotsig = 0;
1240 1298
1241 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1302 }
1245 1303
1246#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1247 if (gotasync) 1305 if (async_pending)
1248 { 1306 {
1249 int i; 1307 async_pending = 0;
1250 gotasync = 0;
1251 1308
1252 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1254 { 1311 {
1255 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
1263 1320
1264static void 1321static void
1265ev_sighandler (int signum) 1322ev_sighandler (int signum)
1266{ 1323{
1267#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1269#endif 1326#endif
1270 1327
1271#if _WIN32 1328#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1273#endif 1330#endif
1274 1331
1275 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1277} 1334}
1278 1335
1279void noinline 1336void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1281{ 1338{
1282 WL w; 1339 WL w;
1283 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1284#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1349
1288 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1351 return;
1352#endif
1292 1353
1293 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1294 1355
1295 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1358}
1298 1359
1299#if EV_USE_SIGNALFD 1360#if EV_USE_SIGNALFD
1300static void 1361static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1362sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1363{
1303 struct signalfd_siginfo si[4], *sip; 1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1365
1305 for (;;) 1366 for (;;)
1306 { 1367 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1368 ssize_t res = read (sigfd, si, sizeof (si));
1308 1369
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1603 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1604 have_monotonic = 1;
1544 } 1605 }
1545#endif 1606#endif
1546 1607
1608 /* pid check not overridable via env */
1609#ifndef _WIN32
1610 if (flags & EVFLAG_FORKCHECK)
1611 curpid = getpid ();
1612#endif
1613
1614 if (!(flags & EVFLAG_NOENV)
1615 && !enable_secure ()
1616 && getenv ("LIBEV_FLAGS"))
1617 flags = atoi (getenv ("LIBEV_FLAGS"));
1618
1547 ev_rt_now = ev_time (); 1619 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1620 mn_now = get_clock ();
1549 now_floor = mn_now; 1621 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1622 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1623#if EV_MINIMAL < 2
1554 1626
1555 io_blocktime = 0.; 1627 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1628 timeout_blocktime = 0.;
1557 backend = 0; 1629 backend = 0;
1558 backend_fd = -1; 1630 backend_fd = -1;
1559 gotasync = 0; 1631 sig_pending = 0;
1632#if EV_ASYNC_ENABLE
1633 async_pending = 0;
1634#endif
1560#if EV_USE_INOTIFY 1635#if EV_USE_INOTIFY
1561 fs_fd = -2; 1636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1637#endif
1563#if EV_USE_SIGNALFD 1638#if EV_USE_SIGNALFD
1564 sigfd = -2; 1639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1640#endif
1566
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV)
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577 1641
1578 if (!(flags & 0x0000ffffU)) 1642 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1643 flags |= ev_recommended_backends ();
1580 1644
1581#if EV_USE_PORT 1645#if EV_USE_PORT
1617 close (evfd); 1681 close (evfd);
1618#endif 1682#endif
1619 1683
1620 if (evpipe [0] >= 0) 1684 if (evpipe [0] >= 0)
1621 { 1685 {
1622 close (evpipe [0]); 1686 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1687 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1688 }
1625 } 1689 }
1626 1690
1627#if EV_USE_SIGNALFD 1691#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1692 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1693 close (sigfd);
1634 }
1635#endif 1694#endif
1636 1695
1637#if EV_USE_INOTIFY 1696#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1697 if (fs_fd >= 0)
1639 close (fs_fd); 1698 close (fs_fd);
1709 1768
1710 if (ev_is_active (&pipe_w)) 1769 if (ev_is_active (&pipe_w))
1711 { 1770 {
1712 /* this "locks" the handlers against writing to the pipe */ 1771 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1772 /* while we modify the fd vars */
1714 gotsig = 1; 1773 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1774#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1775 async_pending = 1;
1717#endif 1776#endif
1718 1777
1719 ev_ref (EV_A); 1778 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1779 ev_io_stop (EV_A_ &pipe_w);
1721 1780
1724 close (evfd); 1783 close (evfd);
1725#endif 1784#endif
1726 1785
1727 if (evpipe [0] >= 0) 1786 if (evpipe [0] >= 0)
1728 { 1787 {
1729 close (evpipe [0]); 1788 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1789 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1790 }
1732 1791
1733 evpipe_init (EV_A); 1792 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1793 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1794 pipecb (EV_A_ &pipe_w, EV_READ);
1741#if EV_MULTIPLICITY 1800#if EV_MULTIPLICITY
1742 1801
1743struct ev_loop * 1802struct ev_loop *
1744ev_loop_new (unsigned int flags) 1803ev_loop_new (unsigned int flags)
1745{ 1804{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1805 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1806
1748 memset (loop, 0, sizeof (struct ev_loop)); 1807 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1808 loop_init (EV_A_ flags);
1750 1809
1751 if (ev_backend (EV_A)) 1810 if (ev_backend (EV_A))
1752 return loop; 1811 return EV_A;
1753 1812
1754 return 0; 1813 return 0;
1755} 1814}
1756 1815
1757void 1816void
1861 assert (checkmax >= checkcnt); 1920 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1921 array_verify (EV_A_ (W *)checks, checkcnt);
1863 1922
1864# if 0 1923# if 0
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1867# endif 1926# endif
1868#endif 1927#endif
1869} 1928}
1870#endif 1929#endif
1871 1930
1878#endif 1937#endif
1879{ 1938{
1880 if (!ev_default_loop_ptr) 1939 if (!ev_default_loop_ptr)
1881 { 1940 {
1882#if EV_MULTIPLICITY 1941#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1942 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1943#else
1885 ev_default_loop_ptr = 1; 1944 ev_default_loop_ptr = 1;
1886#endif 1945#endif
1887 1946
1888 loop_init (EV_A_ flags); 1947 loop_init (EV_A_ flags);
1905 1964
1906void 1965void
1907ev_default_destroy (void) 1966ev_default_destroy (void)
1908{ 1967{
1909#if EV_MULTIPLICITY 1968#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1969 EV_P = ev_default_loop_ptr;
1911#endif 1970#endif
1912 1971
1913 ev_default_loop_ptr = 0; 1972 ev_default_loop_ptr = 0;
1914 1973
1915#ifndef _WIN32 1974#ifndef _WIN32
1922 1981
1923void 1982void
1924ev_default_fork (void) 1983ev_default_fork (void)
1925{ 1984{
1926#if EV_MULTIPLICITY 1985#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 1986 EV_P = ev_default_loop_ptr;
1928#endif 1987#endif
1929 1988
1930 postfork = 1; /* must be in line with ev_loop_fork */ 1989 postfork = 1; /* must be in line with ev_loop_fork */
1931} 1990}
1932 1991
2127 ANHE_at_cache (*he); 2186 ANHE_at_cache (*he);
2128 } 2187 }
2129} 2188}
2130 2189
2131/* fetch new monotonic and realtime times from the kernel */ 2190/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2191/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2192inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2193time_update (EV_P_ ev_tstamp max_block)
2135{ 2194{
2136#if EV_USE_MONOTONIC 2195#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2196 if (expect_true (have_monotonic))
2398inline_size void 2457inline_size void
2399wlist_del (WL *head, WL elem) 2458wlist_del (WL *head, WL elem)
2400{ 2459{
2401 while (*head) 2460 while (*head)
2402 { 2461 {
2403 if (*head == elem) 2462 if (expect_true (*head == elem))
2404 { 2463 {
2405 *head = elem->next; 2464 *head = elem->next;
2406 return; 2465 break;
2407 } 2466 }
2408 2467
2409 head = &(*head)->next; 2468 head = &(*head)->next;
2410 } 2469 }
2411} 2470}
2471 2530
2472 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2473 return; 2532 return;
2474 2533
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2534 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2535 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2536
2478 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2479 2538
2480 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2551 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2553 } 2612 }
2554 } 2613 }
2555 2614
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2559 2616
2560 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2561} 2620}
2562 2621
2563void noinline 2622void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2565{ 2624{
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2646 } 2705 }
2647 } 2706 }
2648 2707
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2652} 2711}
2653 2712
2654void noinline 2713void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2715{
2665#endif 2724#endif
2666 2725
2667void noinline 2726void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2727ev_signal_start (EV_P_ ev_signal *w)
2669{ 2728{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2729 if (expect_false (ev_is_active (w)))
2674 return; 2730 return;
2675 2731
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2732 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2733
2734#if EV_MULTIPLICITY
2735 assert (("libev: a signal must not be attached to two different loops",
2736 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2737
2738 signals [w->signum - 1].loop = EV_A;
2739#endif
2677 2740
2678 EV_FREQUENT_CHECK; 2741 EV_FREQUENT_CHECK;
2679 2742
2680#if EV_USE_SIGNALFD 2743#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2744 if (sigfd == -2)
2703 sigaddset (&sigfd_set, w->signum); 2766 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2767 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2768
2706 signalfd (sigfd, &sigfd_set, 0); 2769 signalfd (sigfd, &sigfd_set, 0);
2707 } 2770 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2771#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2772
2730 ev_start (EV_A_ (W)w, 1); 2773 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2774 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2775
2733 if (!((WL)w)->next) 2776 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2777# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2778 if (sigfd < 0) /*TODO*/
2740# endif 2779# endif
2741 { 2780 {
2781# ifdef _WIN32
2782 evpipe_init (EV_A);
2783
2784 signal (w->signum, ev_sighandler);
2785# else
2742 struct sigaction sa = { }; 2786 struct sigaction sa;
2787
2788 evpipe_init (EV_A);
2789
2743 sa.sa_handler = ev_sighandler; 2790 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2791 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2792 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2793 sigaction (w->signum, &sa, 0);
2794
2795 sigemptyset (&sa.sa_mask);
2796 sigaddset (&sa.sa_mask, w->signum);
2797 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2798#endif
2747 } 2799 }
2748#endif
2749 }
2750 2800
2751 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
2752} 2802}
2753 2803
2754void noinline 2804void noinline
2762 2812
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2813 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2814 ev_stop (EV_A_ (W)w);
2765 2815
2766 if (!signals [w->signum - 1].head) 2816 if (!signals [w->signum - 1].head)
2817 {
2818#if EV_MULTIPLICITY
2819 signals [w->signum - 1].loop = 0; /* unattach from signal */
2820#endif
2767#if EV_USE_SIGNALFD 2821#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2822 if (sigfd >= 0)
2769 { 2823 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2824 sigset_t ss;
2825
2826 sigemptyset (&ss);
2827 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2828 sigdelset (&sigfd_set, w->signum);
2829
2772 signalfd (sigfd, &sigfd_set, 0); 2830 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2831 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2832 }
2776 else 2833 else
2777#endif 2834#endif
2778 signal (w->signum, SIG_DFL); 2835 signal (w->signum, SIG_DFL);
2836 }
2779 2837
2780 EV_FREQUENT_CHECK; 2838 EV_FREQUENT_CHECK;
2781} 2839}
2782 2840
2783void 2841void
2824#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2825 2883
2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2884static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2827 2885
2828#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2829# define EV_INOTIFY_BUFSIZE 8192 2887
2888/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2889# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2830 2890
2831static void noinline 2891static void noinline
2832infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2833{ 2893{
2834 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); 2894 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);
2835 2895
2836 if (w->wd < 0) 2896 if (w->wd >= 0)
2897 {
2898 struct statfs sfs;
2899
2900 /* now local changes will be tracked by inotify, but remote changes won't */
2901 /* unless the filesystem is known to be local, we therefore still poll */
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (!fs_2625)
2905 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2906 else if (!statfs (w->path, &sfs)
2907 && (sfs.f_type == 0x1373 /* devfs */
2908 || sfs.f_type == 0xEF53 /* ext2/3 */
2909 || sfs.f_type == 0x3153464a /* jfs */
2910 || sfs.f_type == 0x52654973 /* reiser3 */
2911 || sfs.f_type == 0x01021994 /* tempfs */
2912 || sfs.f_type == 0x58465342 /* xfs */))
2913 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2914 else
2915 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 2916 }
2917 else
2918 {
2919 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2920 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2839 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2840 2921
2841 /* monitor some parent directory for speedup hints */ 2922 /* if path is not there, monitor some parent directory for speedup hints */
2842 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2923 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 2924 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2925 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 2926 {
2846 char path [4096]; 2927 char path [4096];
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 2944 }
2864 } 2945 }
2865 2946
2866 if (w->wd >= 0) 2947 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869 2949
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2950 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2951 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874
2875 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */)
2882 return;
2883
2884 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2885 ev_timer_again (EV_A_ &w->timer); 2952 ev_timer_again (EV_A_ &w->timer);
2886 } 2953 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 2954}
2888 2955
2889static void noinline 2956static void noinline
2890infy_del (EV_P_ ev_stat *w) 2957infy_del (EV_P_ ev_stat *w)
2891{ 2958{
2936 3003
2937static void 3004static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3006{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3008 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2944 3010
2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3011 for (ofs = 0; ofs < len; )
3012 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2946 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3014 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len;
3016 }
3017}
3018
3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
2947} 3049}
2948 3050
2949inline_size void 3051inline_size void
2950check_2625 (EV_P) 3052ev_check_2625 (EV_P)
2951{ 3053{
2952 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */ 3056 */
2955 struct utsname buf; 3057 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3058 return;
2960 3059
2961 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2962 return;
2963
2964 if (major < 2
2965 || (major == 2 && minor < 6)
2966 || (major == 2 && minor == 6 && micro < 25))
2967 return;
2968
2969 fs_2625 = 1; 3060 fs_2625 = 1;
3061}
3062
3063inline_size int
3064infy_newfd (void)
3065{
3066#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3067 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3068 if (fd >= 0)
3069 return fd;
3070#endif
3071 return inotify_init ();
2970} 3072}
2971 3073
2972inline_size void 3074inline_size void
2973infy_init (EV_P) 3075infy_init (EV_P)
2974{ 3076{
2975 if (fs_fd != -2) 3077 if (fs_fd != -2)
2976 return; 3078 return;
2977 3079
2978 fs_fd = -1; 3080 fs_fd = -1;
2979 3081
2980 check_2625 (EV_A); 3082 ev_check_2625 (EV_A);
2981 3083
2982 fs_fd = inotify_init (); 3084 fs_fd = infy_newfd ();
2983 3085
2984 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2985 { 3087 {
3088 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3089 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3090 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3091 ev_io_start (EV_A_ &fs_w);
3092 ev_unref (EV_A);
2989 } 3093 }
2990} 3094}
2991 3095
2992inline_size void 3096inline_size void
2993infy_fork (EV_P) 3097infy_fork (EV_P)
2995 int slot; 3099 int slot;
2996 3100
2997 if (fs_fd < 0) 3101 if (fs_fd < 0)
2998 return; 3102 return;
2999 3103
3104 ev_ref (EV_A);
3105 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3106 close (fs_fd);
3001 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
3108
3109 if (fs_fd >= 0)
3110 {
3111 fd_intern (fs_fd);
3112 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A);
3115 }
3002 3116
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3004 { 3118 {
3005 WL w_ = fs_hash [slot].head; 3119 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3120 fs_hash [slot].head = 0;
3013 w->wd = -1; 3127 w->wd = -1;
3014 3128
3015 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3130 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3131 else
3132 {
3133 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3134 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3135 ev_timer_again (EV_A_ &w->timer);
3136 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3137 }
3019 } 3138 }
3020 } 3139 }
3021} 3140}
3022 3141
3023#endif 3142#endif
3040static void noinline 3159static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3160stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3161{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3162 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3163
3045 /* we copy this here each the time so that */ 3164 ev_statdata prev = w->attr;
3046 /* prev has the old value when the callback gets invoked */
3047 w->prev = w->attr;
3048 ev_stat_stat (EV_A_ w); 3165 ev_stat_stat (EV_A_ w);
3049 3166
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3167 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3168 if (
3052 w->prev.st_dev != w->attr.st_dev 3169 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3170 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3171 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3172 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3173 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3174 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3175 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3176 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3177 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3178 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3179 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3180 ) {
3181 /* we only update w->prev on actual differences */
3182 /* in case we test more often than invoke the callback, */
3183 /* to ensure that prev is always different to attr */
3184 w->prev = prev;
3185
3064 #if EV_USE_INOTIFY 3186 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
3066 { 3188 {
3067 infy_del (EV_A_ w); 3189 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3190 infy_add (EV_A_ w);
3093 3215
3094 if (fs_fd >= 0) 3216 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3217 infy_add (EV_A_ w);
3096 else 3218 else
3097#endif 3219#endif
3220 {
3098 ev_timer_again (EV_A_ &w->timer); 3221 ev_timer_again (EV_A_ &w->timer);
3222 ev_unref (EV_A);
3223 }
3099 3224
3100 ev_start (EV_A_ (W)w, 1); 3225 ev_start (EV_A_ (W)w, 1);
3101 3226
3102 EV_FREQUENT_CHECK; 3227 EV_FREQUENT_CHECK;
3103} 3228}
3112 EV_FREQUENT_CHECK; 3237 EV_FREQUENT_CHECK;
3113 3238
3114#if EV_USE_INOTIFY 3239#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3240 infy_del (EV_A_ w);
3116#endif 3241#endif
3242
3243 if (ev_is_active (&w->timer))
3244 {
3245 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3246 ev_timer_stop (EV_A_ &w->timer);
3247 }
3118 3248
3119 ev_stop (EV_A_ (W)w); 3249 ev_stop (EV_A_ (W)w);
3120 3250
3121 EV_FREQUENT_CHECK; 3251 EV_FREQUENT_CHECK;
3122} 3252}
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3393embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3394{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3395 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3396
3267 { 3397 {
3268 struct ev_loop *loop = w->other; 3398 EV_P = w->other;
3269 3399
3270 while (fdchangecnt) 3400 while (fdchangecnt)
3271 { 3401 {
3272 fd_reify (EV_A); 3402 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3403 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3411 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3412
3283 ev_embed_stop (EV_A_ w); 3413 ev_embed_stop (EV_A_ w);
3284 3414
3285 { 3415 {
3286 struct ev_loop *loop = w->other; 3416 EV_P = w->other;
3287 3417
3288 ev_loop_fork (EV_A); 3418 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3419 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3420 }
3291 3421
3305{ 3435{
3306 if (expect_false (ev_is_active (w))) 3436 if (expect_false (ev_is_active (w)))
3307 return; 3437 return;
3308 3438
3309 { 3439 {
3310 struct ev_loop *loop = w->other; 3440 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3441 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3312 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3442 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3443 }
3314 3444
3315 EV_FREQUENT_CHECK; 3445 EV_FREQUENT_CHECK;
3342 3472
3343 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
3346 3476
3477 ev_stop (EV_A_ (W)w);
3478
3347 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
3348} 3480}
3349#endif 3481#endif
3350 3482
3351#if EV_FORK_ENABLE 3483#if EV_FORK_ENABLE
3427 3559
3428void 3560void
3429ev_async_send (EV_P_ ev_async *w) 3561ev_async_send (EV_P_ ev_async *w)
3430{ 3562{
3431 w->sent = 1; 3563 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3564 evpipe_write (EV_A_ &async_pending);
3433} 3565}
3434#endif 3566#endif
3435 3567
3436/*****************************************************************************/ 3568/*****************************************************************************/
3437 3569
3586 if (types & EV_CHECK) 3718 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3719 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3720 cb (EV_A_ EV_CHECK, checks [i]);
3589 3721
3590 if (types & EV_SIGNAL) 3722 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3723 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3724 for (wl = signals [i].head; wl; )
3593 { 3725 {
3594 wn = wl->next; 3726 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3727 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3728 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines