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.332 by root, Tue Mar 9 08:58: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
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 *
515{ 572{
516 /* some systems, notably openbsd and darwin, fail to properly 573 /* some systems, notably openbsd and darwin, fail to properly
517 * implement realloc (x, 0) (as required by both ansi c-98 and 574 * implement realloc (x, 0) (as required by both ansi c-98 and
518 * the single unix specification, so work around them here. 575 * the single unix specification, so work around them here.
519 */ 576 */
520
521 if (size) 577 if (size)
522 return realloc (ptr, size); 578 return realloc (ptr, size);
523 579
524 free (ptr); 580 free (ptr);
525 return 0; 581 return 0;
538{ 594{
539 ptr = alloc (ptr, size); 595 ptr = alloc (ptr, size);
540 596
541 if (!ptr && size) 597 if (!ptr && size)
542 { 598 {
599#if EV_AVOID_STDIO
600 ev_printerr ("libev: memory allocation failed, aborting.\n");
601#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 602 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
603#endif
544 abort (); 604 abort ();
545 } 605 }
546 606
547 return ptr; 607 return ptr;
548} 608}
879 939
880#if EV_SELECT_IS_WINSOCKET 940#if EV_SELECT_IS_WINSOCKET
881 if (events) 941 if (events)
882 { 942 {
883 unsigned long arg; 943 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 944 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)); 945 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 946 }
891#endif 947#endif
892 948
893 { 949 {
936/* check whether the given fd is atcually valid, for error recovery */ 992/* check whether the given fd is atcually valid, for error recovery */
937inline_size int 993inline_size int
938fd_valid (int fd) 994fd_valid (int fd)
939{ 995{
940#ifdef _WIN32 996#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 997 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 998#else
943 return fcntl (fd, F_GETFD) != -1; 999 return fcntl (fd, F_GETFD) != -1;
944#endif 1000#endif
945} 1001}
946 1002
964 1020
965 for (fd = anfdmax; fd--; ) 1021 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1022 if (anfds [fd].events)
967 { 1023 {
968 fd_kill (EV_A_ fd); 1024 fd_kill (EV_A_ fd);
969 return; 1025 break;
970 } 1026 }
971} 1027}
972 1028
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1029/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1030static void noinline
1064 1120
1065 for (;;) 1121 for (;;)
1066 { 1122 {
1067 int c = k << 1; 1123 int c = k << 1;
1068 1124
1069 if (c > N + HEAP0 - 1) 1125 if (c >= N + HEAP0)
1070 break; 1126 break;
1071 1127
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1128 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1129 ? 1 : 0;
1074 1130
1110 1166
1111/* move an element suitably so it is in a correct place */ 1167/* move an element suitably so it is in a correct place */
1112inline_size void 1168inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1169adjustheap (ANHE *heap, int N, int k)
1114{ 1170{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1171 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1172 upheap (heap, k);
1117 else 1173 else
1118 downheap (heap, N, k); 1174 downheap (heap, N, k);
1119} 1175}
1120 1176
1133/*****************************************************************************/ 1189/*****************************************************************************/
1134 1190
1135/* associate signal watchers to a signal signal */ 1191/* associate signal watchers to a signal signal */
1136typedef struct 1192typedef struct
1137{ 1193{
1194 EV_ATOMIC_T pending;
1195#if EV_MULTIPLICITY
1196 EV_P;
1197#endif
1138 WL head; 1198 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1199} ANSIG;
1141 1200
1142static ANSIG *signals; 1201static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1202
1147/*****************************************************************************/ 1203/*****************************************************************************/
1148 1204
1149/* used to prepare libev internal fd's */ 1205/* used to prepare libev internal fd's */
1150/* this is not fork-safe */ 1206/* this is not fork-safe */
1151inline_speed void 1207inline_speed void
1152fd_intern (int fd) 1208fd_intern (int fd)
1153{ 1209{
1154#ifdef _WIN32 1210#ifdef _WIN32
1155 unsigned long arg = 1; 1211 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1212 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1157#else 1213#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC); 1214 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK); 1215 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif 1216#endif
1161} 1217}
1218/* called whenever the libev signal pipe */ 1274/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1275/* got some events (signal, async) */
1220static void 1276static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1277pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1278{
1279 int i;
1280
1223#if EV_USE_EVENTFD 1281#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1282 if (evfd >= 0)
1225 { 1283 {
1226 uint64_t counter; 1284 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1285 read (evfd, &counter, sizeof (uint64_t));
1231 { 1289 {
1232 char dummy; 1290 char dummy;
1233 read (evpipe [0], &dummy, 1); 1291 read (evpipe [0], &dummy, 1);
1234 } 1292 }
1235 1293
1236 if (gotsig && ev_is_default_loop (EV_A)) 1294 if (sig_pending)
1237 { 1295 {
1238 int signum; 1296 sig_pending = 0;
1239 gotsig = 0;
1240 1297
1241 for (signum = signalmax; signum--; ) 1298 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1299 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1300 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1301 }
1245 1302
1246#if EV_ASYNC_ENABLE 1303#if EV_ASYNC_ENABLE
1247 if (gotasync) 1304 if (async_pending)
1248 { 1305 {
1249 int i; 1306 async_pending = 0;
1250 gotasync = 0;
1251 1307
1252 for (i = asynccnt; i--; ) 1308 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1309 if (asyncs [i]->sent)
1254 { 1310 {
1255 asyncs [i]->sent = 0; 1311 asyncs [i]->sent = 0;
1263 1319
1264static void 1320static void
1265ev_sighandler (int signum) 1321ev_sighandler (int signum)
1266{ 1322{
1267#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1324 EV_P = signals [signum - 1].loop;
1269#endif 1325#endif
1270 1326
1271#if _WIN32 1327#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1328 signal (signum, ev_sighandler);
1273#endif 1329#endif
1274 1330
1275 signals [signum - 1].gotsig = 1; 1331 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1332 evpipe_write (EV_A_ &sig_pending);
1277} 1333}
1278 1334
1279void noinline 1335void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1336ev_feed_signal_event (EV_P_ int signum)
1281{ 1337{
1282 WL w; 1338 WL w;
1283 1339
1340 if (expect_false (signum <= 0 || signum > EV_NSIG))
1341 return;
1342
1343 --signum;
1344
1284#if EV_MULTIPLICITY 1345#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1346 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1347 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1348
1288 --signum; 1349 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1350 return;
1351#endif
1292 1352
1293 signals [signum].gotsig = 0; 1353 signals [signum].pending = 0;
1294 1354
1295 for (w = signals [signum].head; w; w = w->next) 1355 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1356 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1357}
1298 1358
1299#if EV_USE_SIGNALFD 1359#if EV_USE_SIGNALFD
1300static void 1360static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1361sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1362{
1303 struct signalfd_siginfo si[4], *sip; 1363 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1364
1305 for (;;) 1365 for (;;)
1306 { 1366 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1367 ssize_t res = read (sigfd, si, sizeof (si));
1308 1368
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1602 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1603 have_monotonic = 1;
1544 } 1604 }
1545#endif 1605#endif
1546 1606
1607 /* pid check not overridable via env */
1608#ifndef _WIN32
1609 if (flags & EVFLAG_FORKCHECK)
1610 curpid = getpid ();
1611#endif
1612
1613 if (!(flags & EVFLAG_NOENV)
1614 && !enable_secure ()
1615 && getenv ("LIBEV_FLAGS"))
1616 flags = atoi (getenv ("LIBEV_FLAGS"));
1617
1547 ev_rt_now = ev_time (); 1618 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1619 mn_now = get_clock ();
1549 now_floor = mn_now; 1620 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1621 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1622#if EV_MINIMAL < 2
1554 1625
1555 io_blocktime = 0.; 1626 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1627 timeout_blocktime = 0.;
1557 backend = 0; 1628 backend = 0;
1558 backend_fd = -1; 1629 backend_fd = -1;
1559 gotasync = 0; 1630 sig_pending = 0;
1631#if EV_ASYNC_ENABLE
1632 async_pending = 0;
1633#endif
1560#if EV_USE_INOTIFY 1634#if EV_USE_INOTIFY
1561 fs_fd = -2; 1635 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1636#endif
1563#if EV_USE_SIGNALFD 1637#if EV_USE_SIGNALFD
1564 sigfd = -2; 1638 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1639#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 1640
1578 if (!(flags & 0x0000ffffU)) 1641 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1642 flags |= ev_recommended_backends ();
1580 1643
1581#if EV_USE_PORT 1644#if EV_USE_PORT
1617 close (evfd); 1680 close (evfd);
1618#endif 1681#endif
1619 1682
1620 if (evpipe [0] >= 0) 1683 if (evpipe [0] >= 0)
1621 { 1684 {
1622 close (evpipe [0]); 1685 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1686 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1687 }
1625 } 1688 }
1626 1689
1627#if EV_USE_SIGNALFD 1690#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1691 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1692 close (sigfd);
1634 }
1635#endif 1693#endif
1636 1694
1637#if EV_USE_INOTIFY 1695#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1696 if (fs_fd >= 0)
1639 close (fs_fd); 1697 close (fs_fd);
1709 1767
1710 if (ev_is_active (&pipe_w)) 1768 if (ev_is_active (&pipe_w))
1711 { 1769 {
1712 /* this "locks" the handlers against writing to the pipe */ 1770 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1771 /* while we modify the fd vars */
1714 gotsig = 1; 1772 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1773#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1774 async_pending = 1;
1717#endif 1775#endif
1718 1776
1719 ev_ref (EV_A); 1777 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1778 ev_io_stop (EV_A_ &pipe_w);
1721 1779
1724 close (evfd); 1782 close (evfd);
1725#endif 1783#endif
1726 1784
1727 if (evpipe [0] >= 0) 1785 if (evpipe [0] >= 0)
1728 { 1786 {
1729 close (evpipe [0]); 1787 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1788 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1789 }
1732 1790
1733 evpipe_init (EV_A); 1791 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1792 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1793 pipecb (EV_A_ &pipe_w, EV_READ);
1741#if EV_MULTIPLICITY 1799#if EV_MULTIPLICITY
1742 1800
1743struct ev_loop * 1801struct ev_loop *
1744ev_loop_new (unsigned int flags) 1802ev_loop_new (unsigned int flags)
1745{ 1803{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1804 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1805
1748 memset (loop, 0, sizeof (struct ev_loop)); 1806 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1807 loop_init (EV_A_ flags);
1750 1808
1751 if (ev_backend (EV_A)) 1809 if (ev_backend (EV_A))
1752 return loop; 1810 return EV_A;
1753 1811
1754 return 0; 1812 return 0;
1755} 1813}
1756 1814
1757void 1815void
1861 assert (checkmax >= checkcnt); 1919 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1920 array_verify (EV_A_ (W *)checks, checkcnt);
1863 1921
1864# if 0 1922# if 0
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1923 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) 1924 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1867# endif 1925# endif
1868#endif 1926#endif
1869} 1927}
1870#endif 1928#endif
1871 1929
1878#endif 1936#endif
1879{ 1937{
1880 if (!ev_default_loop_ptr) 1938 if (!ev_default_loop_ptr)
1881 { 1939 {
1882#if EV_MULTIPLICITY 1940#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1941 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1942#else
1885 ev_default_loop_ptr = 1; 1943 ev_default_loop_ptr = 1;
1886#endif 1944#endif
1887 1945
1888 loop_init (EV_A_ flags); 1946 loop_init (EV_A_ flags);
1905 1963
1906void 1964void
1907ev_default_destroy (void) 1965ev_default_destroy (void)
1908{ 1966{
1909#if EV_MULTIPLICITY 1967#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1968 EV_P = ev_default_loop_ptr;
1911#endif 1969#endif
1912 1970
1913 ev_default_loop_ptr = 0; 1971 ev_default_loop_ptr = 0;
1914 1972
1915#ifndef _WIN32 1973#ifndef _WIN32
1922 1980
1923void 1981void
1924ev_default_fork (void) 1982ev_default_fork (void)
1925{ 1983{
1926#if EV_MULTIPLICITY 1984#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 1985 EV_P = ev_default_loop_ptr;
1928#endif 1986#endif
1929 1987
1930 postfork = 1; /* must be in line with ev_loop_fork */ 1988 postfork = 1; /* must be in line with ev_loop_fork */
1931} 1989}
1932 1990
2127 ANHE_at_cache (*he); 2185 ANHE_at_cache (*he);
2128 } 2186 }
2129} 2187}
2130 2188
2131/* fetch new monotonic and realtime times from the kernel */ 2189/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2190/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2191inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2192time_update (EV_P_ ev_tstamp max_block)
2135{ 2193{
2136#if EV_USE_MONOTONIC 2194#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2195 if (expect_true (have_monotonic))
2398inline_size void 2456inline_size void
2399wlist_del (WL *head, WL elem) 2457wlist_del (WL *head, WL elem)
2400{ 2458{
2401 while (*head) 2459 while (*head)
2402 { 2460 {
2403 if (*head == elem) 2461 if (expect_true (*head == elem))
2404 { 2462 {
2405 *head = elem->next; 2463 *head = elem->next;
2406 return; 2464 break;
2407 } 2465 }
2408 2466
2409 head = &(*head)->next; 2467 head = &(*head)->next;
2410 } 2468 }
2411} 2469}
2471 2529
2472 if (expect_false (ev_is_active (w))) 2530 if (expect_false (ev_is_active (w)))
2473 return; 2531 return;
2474 2532
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2533 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)))); 2534 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2535
2478 EV_FREQUENT_CHECK; 2536 EV_FREQUENT_CHECK;
2479 2537
2480 ev_start (EV_A_ (W)w, 1); 2538 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2539 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2551 timers [active] = timers [timercnt + HEAP0]; 2609 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2610 adjustheap (timers, timercnt, active);
2553 } 2611 }
2554 } 2612 }
2555 2613
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2614 ev_at (w) -= mn_now;
2559 2615
2560 ev_stop (EV_A_ (W)w); 2616 ev_stop (EV_A_ (W)w);
2617
2618 EV_FREQUENT_CHECK;
2561} 2619}
2562 2620
2563void noinline 2621void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2622ev_timer_again (EV_P_ ev_timer *w)
2565{ 2623{
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2702 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2703 adjustheap (periodics, periodiccnt, active);
2646 } 2704 }
2647 } 2705 }
2648 2706
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2707 ev_stop (EV_A_ (W)w);
2708
2709 EV_FREQUENT_CHECK;
2652} 2710}
2653 2711
2654void noinline 2712void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2713ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2714{
2665#endif 2723#endif
2666 2724
2667void noinline 2725void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2726ev_signal_start (EV_P_ ev_signal *w)
2669{ 2727{
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))) 2728 if (expect_false (ev_is_active (w)))
2674 return; 2729 return;
2675 2730
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2731 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2732
2733#if EV_MULTIPLICITY
2734 assert (("libev: a signal must not be attached to two different loops",
2735 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2736
2737 signals [w->signum - 1].loop = EV_A;
2738#endif
2677 2739
2678 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2679 2741
2680#if EV_USE_SIGNALFD 2742#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2743 if (sigfd == -2)
2703 sigaddset (&sigfd_set, w->signum); 2765 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2767
2706 signalfd (sigfd, &sigfd_set, 0); 2768 signalfd (sigfd, &sigfd_set, 0);
2707 } 2769 }
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 2770#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2771
2730 ev_start (EV_A_ (W)w, 1); 2772 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2773 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2774
2733 if (!((WL)w)->next) 2775 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2776# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2777 if (sigfd < 0) /*TODO*/
2740# endif 2778# endif
2741 { 2779 {
2780# ifdef _WIN32
2781 evpipe_init (EV_A);
2782
2783 signal (w->signum, ev_sighandler);
2784# else
2742 struct sigaction sa = { }; 2785 struct sigaction sa;
2786
2787 evpipe_init (EV_A);
2788
2743 sa.sa_handler = ev_sighandler; 2789 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2790 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2791 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2792 sigaction (w->signum, &sa, 0);
2793
2794 sigemptyset (&sa.sa_mask);
2795 sigaddset (&sa.sa_mask, w->signum);
2796 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2797#endif
2747 } 2798 }
2748#endif
2749 }
2750 2799
2751 EV_FREQUENT_CHECK; 2800 EV_FREQUENT_CHECK;
2752} 2801}
2753 2802
2754void noinline 2803void noinline
2762 2811
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2812 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2813 ev_stop (EV_A_ (W)w);
2765 2814
2766 if (!signals [w->signum - 1].head) 2815 if (!signals [w->signum - 1].head)
2816 {
2817#if EV_MULTIPLICITY
2818 signals [w->signum - 1].loop = 0; /* unattach from signal */
2819#endif
2767#if EV_USE_SIGNALFD 2820#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2821 if (sigfd >= 0)
2769 { 2822 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2823 sigset_t ss;
2824
2825 sigemptyset (&ss);
2826 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2827 sigdelset (&sigfd_set, w->signum);
2828
2772 signalfd (sigfd, &sigfd_set, 0); 2829 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2830 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2831 }
2776 else 2832 else
2777#endif 2833#endif
2778 signal (w->signum, SIG_DFL); 2834 signal (w->signum, SIG_DFL);
2835 }
2779 2836
2780 EV_FREQUENT_CHECK; 2837 EV_FREQUENT_CHECK;
2781} 2838}
2782 2839
2783void 2840void
2824#define MIN_STAT_INTERVAL 0.1074891 2881#define MIN_STAT_INTERVAL 0.1074891
2825 2882
2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2883static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2827 2884
2828#if EV_USE_INOTIFY 2885#if EV_USE_INOTIFY
2829# define EV_INOTIFY_BUFSIZE 8192 2886
2887/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2888# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2830 2889
2831static void noinline 2890static void noinline
2832infy_add (EV_P_ ev_stat *w) 2891infy_add (EV_P_ ev_stat *w)
2833{ 2892{
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); 2893 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 2894
2836 if (w->wd < 0) 2895 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 /* now local changes will be tracked by inotify, but remote changes won't */
2900 /* unless the filesystem is known to be local, we therefore still poll */
2901 /* also do poll on <2.6.25, but with normal frequency */
2902
2903 if (!fs_2625)
2904 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2905 else if (!statfs (w->path, &sfs)
2906 && (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */))
2912 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2913 else
2914 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 2915 }
2916 else
2917 {
2918 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2919 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 2920
2841 /* monitor some parent directory for speedup hints */ 2921 /* 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, */ 2922 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 2923 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2924 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 2925 {
2846 char path [4096]; 2926 char path [4096];
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2942 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 2943 }
2864 } 2944 }
2865 2945
2866 if (w->wd >= 0) 2946 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2947 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869 2948
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2949 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2950 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); 2951 ev_timer_again (EV_A_ &w->timer);
2886 } 2952 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 2953}
2888 2954
2889static void noinline 2955static void noinline
2890infy_del (EV_P_ ev_stat *w) 2956infy_del (EV_P_ ev_stat *w)
2891{ 2957{
2936 3002
2937static void 3003static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3004infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3005{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3006 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3007 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3008 int len = read (fs_fd, buf, sizeof (buf));
2944 3009
2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3010 for (ofs = 0; ofs < len; )
3011 {
3012 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2946 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3013 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3014 ofs += sizeof (struct inotify_event) + ev->len;
3015 }
3016}
3017
3018inline_size unsigned int
3019ev_linux_version (void)
3020{
3021 struct utsname buf;
3022 unsigned int v;
3023 int i;
3024 char *p = buf.release;
3025
3026 if (uname (&buf))
3027 return 0;
3028
3029 for (i = 3+1; --i; )
3030 {
3031 unsigned int c = 0;
3032
3033 for (;;)
3034 {
3035 if (*p >= '0' && *p <= '9')
3036 c = c * 10 + *p++ - '0';
3037 else
3038 {
3039 p += *p == '.';
3040 break;
3041 }
3042 }
3043
3044 v = (v << 8) | c;
3045 }
3046
3047 return v;
2947} 3048}
2948 3049
2949inline_size void 3050inline_size void
2950check_2625 (EV_P) 3051ev_check_2625 (EV_P)
2951{ 3052{
2952 /* kernels < 2.6.25 are borked 3053 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3054 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */ 3055 */
2955 struct utsname buf; 3056 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3057 return;
2960 3058
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; 3059 fs_2625 = 1;
3060}
3061
3062inline_size int
3063infy_newfd (void)
3064{
3065#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3066 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3067 if (fd >= 0)
3068 return fd;
3069#endif
3070 return inotify_init ();
2970} 3071}
2971 3072
2972inline_size void 3073inline_size void
2973infy_init (EV_P) 3074infy_init (EV_P)
2974{ 3075{
2975 if (fs_fd != -2) 3076 if (fs_fd != -2)
2976 return; 3077 return;
2977 3078
2978 fs_fd = -1; 3079 fs_fd = -1;
2979 3080
2980 check_2625 (EV_A); 3081 ev_check_2625 (EV_A);
2981 3082
2982 fs_fd = inotify_init (); 3083 fs_fd = infy_newfd ();
2983 3084
2984 if (fs_fd >= 0) 3085 if (fs_fd >= 0)
2985 { 3086 {
3087 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3088 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3089 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3090 ev_io_start (EV_A_ &fs_w);
3091 ev_unref (EV_A);
2989 } 3092 }
2990} 3093}
2991 3094
2992inline_size void 3095inline_size void
2993infy_fork (EV_P) 3096infy_fork (EV_P)
2995 int slot; 3098 int slot;
2996 3099
2997 if (fs_fd < 0) 3100 if (fs_fd < 0)
2998 return; 3101 return;
2999 3102
3103 ev_ref (EV_A);
3104 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3105 close (fs_fd);
3001 fs_fd = inotify_init (); 3106 fs_fd = infy_newfd ();
3107
3108 if (fs_fd >= 0)
3109 {
3110 fd_intern (fs_fd);
3111 ev_io_set (&fs_w, fs_fd, EV_READ);
3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
3114 }
3002 3115
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3116 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3004 { 3117 {
3005 WL w_ = fs_hash [slot].head; 3118 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3119 fs_hash [slot].head = 0;
3013 w->wd = -1; 3126 w->wd = -1;
3014 3127
3015 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3129 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3130 else
3131 {
3132 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3133 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3134 ev_timer_again (EV_A_ &w->timer);
3135 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3136 }
3019 } 3137 }
3020 } 3138 }
3021} 3139}
3022 3140
3023#endif 3141#endif
3040static void noinline 3158static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3159stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3160{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3161 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3162
3045 /* we copy this here each the time so that */ 3163 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); 3164 ev_stat_stat (EV_A_ w);
3049 3165
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3166 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3167 if (
3052 w->prev.st_dev != w->attr.st_dev 3168 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3169 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3170 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3171 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3172 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3173 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3174 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3175 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3176 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3177 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3178 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3179 ) {
3180 /* we only update w->prev on actual differences */
3181 /* in case we test more often than invoke the callback, */
3182 /* to ensure that prev is always different to attr */
3183 w->prev = prev;
3184
3064 #if EV_USE_INOTIFY 3185 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3186 if (fs_fd >= 0)
3066 { 3187 {
3067 infy_del (EV_A_ w); 3188 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3189 infy_add (EV_A_ w);
3093 3214
3094 if (fs_fd >= 0) 3215 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
3096 else 3217 else
3097#endif 3218#endif
3219 {
3098 ev_timer_again (EV_A_ &w->timer); 3220 ev_timer_again (EV_A_ &w->timer);
3221 ev_unref (EV_A);
3222 }
3099 3223
3100 ev_start (EV_A_ (W)w, 1); 3224 ev_start (EV_A_ (W)w, 1);
3101 3225
3102 EV_FREQUENT_CHECK; 3226 EV_FREQUENT_CHECK;
3103} 3227}
3112 EV_FREQUENT_CHECK; 3236 EV_FREQUENT_CHECK;
3113 3237
3114#if EV_USE_INOTIFY 3238#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
3116#endif 3240#endif
3241
3242 if (ev_is_active (&w->timer))
3243 {
3244 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3245 ev_timer_stop (EV_A_ &w->timer);
3246 }
3118 3247
3119 ev_stop (EV_A_ (W)w); 3248 ev_stop (EV_A_ (W)w);
3120 3249
3121 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
3122} 3251}
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3392embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3393{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3394 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3395
3267 { 3396 {
3268 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
3269 3398
3270 while (fdchangecnt) 3399 while (fdchangecnt)
3271 { 3400 {
3272 fd_reify (EV_A); 3401 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3402 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3410 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3411
3283 ev_embed_stop (EV_A_ w); 3412 ev_embed_stop (EV_A_ w);
3284 3413
3285 { 3414 {
3286 struct ev_loop *loop = w->other; 3415 EV_P = w->other;
3287 3416
3288 ev_loop_fork (EV_A); 3417 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3418 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3419 }
3291 3420
3305{ 3434{
3306 if (expect_false (ev_is_active (w))) 3435 if (expect_false (ev_is_active (w)))
3307 return; 3436 return;
3308 3437
3309 { 3438 {
3310 struct ev_loop *loop = w->other; 3439 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3440 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); 3441 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3442 }
3314 3443
3315 EV_FREQUENT_CHECK; 3444 EV_FREQUENT_CHECK;
3342 3471
3343 ev_io_stop (EV_A_ &w->io); 3472 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3473 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3474 ev_fork_stop (EV_A_ &w->fork);
3346 3475
3476 ev_stop (EV_A_ (W)w);
3477
3347 EV_FREQUENT_CHECK; 3478 EV_FREQUENT_CHECK;
3348} 3479}
3349#endif 3480#endif
3350 3481
3351#if EV_FORK_ENABLE 3482#if EV_FORK_ENABLE
3427 3558
3428void 3559void
3429ev_async_send (EV_P_ ev_async *w) 3560ev_async_send (EV_P_ ev_async *w)
3430{ 3561{
3431 w->sent = 1; 3562 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3563 evpipe_write (EV_A_ &async_pending);
3433} 3564}
3434#endif 3565#endif
3435 3566
3436/*****************************************************************************/ 3567/*****************************************************************************/
3437 3568
3586 if (types & EV_CHECK) 3717 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3718 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3719 cb (EV_A_ EV_CHECK, checks [i]);
3589 3720
3590 if (types & EV_SIGNAL) 3721 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3722 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3723 for (wl = signals [i].head; wl; )
3593 { 3724 {
3594 wn = wl->next; 3725 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3726 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3727 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines