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

Comparing libev/ev.c (file contents):
Revision 1.253 by root, Sat May 31 03:13:27 2008 UTC vs.
Revision 1.279 by root, Fri Feb 6 20:17:43 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 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 *
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
58# endif 70# endif
59# else 71# else
60# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
62# endif 74# endif
154#ifndef _WIN32 166#ifndef _WIN32
155# include <sys/time.h> 167# include <sys/time.h>
156# include <sys/wait.h> 168# include <sys/wait.h>
157# include <unistd.h> 169# include <unistd.h>
158#else 170#else
171# include <io.h>
159# define WIN32_LEAN_AND_MEAN 172# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 173# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 174# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 175# define EV_SELECT_IS_WINSOCKET 1
163# endif 176# endif
164#endif 177#endif
165 178
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
167 188
168#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
169# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
171# else 192# else
172# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
173# endif 194# endif
174#endif 195#endif
175 196
176#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
177# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
178#endif 199#endif
179 200
180#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
181# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
182# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
285# include <sys/select.h> 306# include <sys/select.h>
286# endif 307# endif
287#endif 308#endif
288 309
289#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
290# include <sys/inotify.h> 313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
291#endif 319#endif
292 320
293#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
294# include <winsock.h> 322# include <winsock.h>
323#endif
324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
295#endif 332#endif
296 333
297#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
298/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
299# include <stdint.h> 336# include <stdint.h>
360typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
361 398
362#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
363#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
364 401
365#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
366/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
367/* giving it a reasonably high chance of working on typical architetcures */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
368static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
369#endif 410#endif
370 411
371#ifdef _WIN32 412#ifdef _WIN32
372# include "ev_win32.c" 413# include "ev_win32.c"
381{ 422{
382 syserr_cb = cb; 423 syserr_cb = cb;
383} 424}
384 425
385static void noinline 426static void noinline
386syserr (const char *msg) 427ev_syserr (const char *msg)
387{ 428{
388 if (!msg) 429 if (!msg)
389 msg = "(libev) system error"; 430 msg = "(libev) system error";
390 431
391 if (syserr_cb) 432 if (syserr_cb)
442typedef struct 483typedef struct
443{ 484{
444 WL head; 485 WL head;
445 unsigned char events; 486 unsigned char events;
446 unsigned char reify; 487 unsigned char reify;
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused;
490#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif
447#if EV_SELECT_IS_WINSOCKET 493#if EV_SELECT_IS_WINSOCKET
448 SOCKET handle; 494 SOCKET handle;
449#endif 495#endif
450} ANFD; 496} ANFD;
451 497
511 557
512ev_tstamp 558ev_tstamp
513ev_time (void) 559ev_time (void)
514{ 560{
515#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
516 struct timespec ts; 564 struct timespec ts;
517 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
518 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
519#else 567 }
568#endif
569
520 struct timeval tv; 570 struct timeval tv;
521 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
522 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
523#endif
524} 573}
525 574
526ev_tstamp inline_size 575ev_tstamp inline_size
527get_clock (void) 576get_clock (void)
528{ 577{
564 struct timeval tv; 613 struct timeval tv;
565 614
566 tv.tv_sec = (time_t)delay; 615 tv.tv_sec = (time_t)delay;
567 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568 617
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */
569 select (0, 0, 0, 0, &tv); 621 select (0, 0, 0, 0, &tv);
570#endif 622#endif
571 } 623 }
572} 624}
573 625
600array_realloc (int elem, void *base, int *cur, int cnt) 652array_realloc (int elem, void *base, int *cur, int cnt)
601{ 653{
602 *cur = array_nextsize (elem, *cur, cnt); 654 *cur = array_nextsize (elem, *cur, cnt);
603 return ev_realloc (base, elem * *cur); 655 return ev_realloc (base, elem * *cur);
604} 656}
657
658#define array_init_zero(base,count) \
659 memset ((void *)(base), 0, sizeof (*(base)) * (count))
605 660
606#define array_needsize(type,base,cur,cnt,init) \ 661#define array_needsize(type,base,cur,cnt,init) \
607 if (expect_false ((cnt) > (cur))) \ 662 if (expect_false ((cnt) > (cur))) \
608 { \ 663 { \
609 int ocur_ = (cur); \ 664 int ocur_ = (cur); \
653 ev_feed_event (EV_A_ events [i], type); 708 ev_feed_event (EV_A_ events [i], type);
654} 709}
655 710
656/*****************************************************************************/ 711/*****************************************************************************/
657 712
658void inline_size
659anfds_init (ANFD *base, int count)
660{
661 while (count--)
662 {
663 base->head = 0;
664 base->events = EV_NONE;
665 base->reify = 0;
666
667 ++base;
668 }
669}
670
671void inline_speed 713void inline_speed
672fd_event (EV_P_ int fd, int revents) 714fd_event (EV_P_ int fd, int revents)
673{ 715{
674 ANFD *anfd = anfds + fd; 716 ANFD *anfd = anfds + fd;
675 ev_io *w; 717 ev_io *w;
707 events |= (unsigned char)w->events; 749 events |= (unsigned char)w->events;
708 750
709#if EV_SELECT_IS_WINSOCKET 751#if EV_SELECT_IS_WINSOCKET
710 if (events) 752 if (events)
711 { 753 {
712 unsigned long argp; 754 unsigned long arg;
713 #ifdef EV_FD_TO_WIN32_HANDLE 755 #ifdef EV_FD_TO_WIN32_HANDLE
714 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
715 #else 757 #else
716 anfd->handle = _get_osfhandle (fd); 758 anfd->handle = _get_osfhandle (fd);
717 #endif 759 #endif
718 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 760 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
719 } 761 }
720#endif 762#endif
721 763
722 { 764 {
723 unsigned char o_events = anfd->events; 765 unsigned char o_events = anfd->events;
776{ 818{
777 int fd; 819 int fd;
778 820
779 for (fd = 0; fd < anfdmax; ++fd) 821 for (fd = 0; fd < anfdmax; ++fd)
780 if (anfds [fd].events) 822 if (anfds [fd].events)
781 if (!fd_valid (fd) == -1 && errno == EBADF) 823 if (!fd_valid (fd) && errno == EBADF)
782 fd_kill (EV_A_ fd); 824 fd_kill (EV_A_ fd);
783} 825}
784 826
785/* called on ENOMEM in select/poll to kill some fds and retry */ 827/* called on ENOMEM in select/poll to kill some fds and retry */
786static void noinline 828static void noinline
804 846
805 for (fd = 0; fd < anfdmax; ++fd) 847 for (fd = 0; fd < anfdmax; ++fd)
806 if (anfds [fd].events) 848 if (anfds [fd].events)
807 { 849 {
808 anfds [fd].events = 0; 850 anfds [fd].events = 0;
851 anfds [fd].emask = 0;
809 fd_change (EV_A_ fd, EV_IOFDSET | 1); 852 fd_change (EV_A_ fd, EV_IOFDSET | 1);
810 } 853 }
811} 854}
812 855
813/*****************************************************************************/ 856/*****************************************************************************/
965static ANSIG *signals; 1008static ANSIG *signals;
966static int signalmax; 1009static int signalmax;
967 1010
968static EV_ATOMIC_T gotsig; 1011static EV_ATOMIC_T gotsig;
969 1012
970void inline_size
971signals_init (ANSIG *base, int count)
972{
973 while (count--)
974 {
975 base->head = 0;
976 base->gotsig = 0;
977
978 ++base;
979 }
980}
981
982/*****************************************************************************/ 1013/*****************************************************************************/
983 1014
984void inline_speed 1015void inline_speed
985fd_intern (int fd) 1016fd_intern (int fd)
986{ 1017{
987#ifdef _WIN32 1018#ifdef _WIN32
988 int arg = 1; 1019 unsigned long arg = 1;
989 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
990#else 1021#else
991 fcntl (fd, F_SETFD, FD_CLOEXEC); 1022 fcntl (fd, F_SETFD, FD_CLOEXEC);
992 fcntl (fd, F_SETFL, O_NONBLOCK); 1023 fcntl (fd, F_SETFL, O_NONBLOCK);
993#endif 1024#endif
1007 } 1038 }
1008 else 1039 else
1009#endif 1040#endif
1010 { 1041 {
1011 while (pipe (evpipe)) 1042 while (pipe (evpipe))
1012 syserr ("(libev) error creating signal/async pipe"); 1043 ev_syserr ("(libev) error creating signal/async pipe");
1013 1044
1014 fd_intern (evpipe [0]); 1045 fd_intern (evpipe [0]);
1015 fd_intern (evpipe [1]); 1046 fd_intern (evpipe [1]);
1016 ev_io_set (&pipeev, evpipe [0], EV_READ); 1047 ev_io_set (&pipeev, evpipe [0], EV_READ);
1017 } 1048 }
1107ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1108{ 1139{
1109 WL w; 1140 WL w;
1110 1141
1111#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1112 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1113#endif 1144#endif
1114 1145
1115 --signum; 1146 --signum;
1116 1147
1117 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
1246 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1247 /* it usually doesn't work correctly on anything but sockets and pipes */ 1278 /* it usually doesn't work correctly on anything but sockets and pipes */
1248 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1249#endif 1280#endif
1250#ifdef __APPLE__ 1281#ifdef __APPLE__
1251 // flags &= ~EVBACKEND_KQUEUE; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1252 flags &= ~EVBACKEND_POLL; 1283 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1284 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1253#endif 1285#endif
1254 1286
1255 return flags; 1287 return flags;
1256} 1288}
1257 1289
1294static void noinline 1326static void noinline
1295loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1296{ 1328{
1297 if (!backend) 1329 if (!backend)
1298 { 1330 {
1331#if EV_USE_REALTIME
1332 if (!have_realtime)
1333 {
1334 struct timespec ts;
1335
1336 if (!clock_gettime (CLOCK_REALTIME, &ts))
1337 have_realtime = 1;
1338 }
1339#endif
1340
1299#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1300 { 1343 {
1301 struct timespec ts; 1344 struct timespec ts;
1345
1302 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1303 have_monotonic = 1; 1347 have_monotonic = 1;
1304 } 1348 }
1305#endif 1349#endif
1306 1350
1307 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1308 mn_now = get_clock (); 1352 mn_now = get_clock ();
1309 now_floor = mn_now; 1353 now_floor = mn_now;
1507{ 1551{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1552 postfork = 1; /* must be in line with ev_default_fork */
1509} 1553}
1510 1554
1511#if EV_VERIFY 1555#if EV_VERIFY
1512void noinline 1556static void noinline
1513verify_watcher (EV_P_ W w) 1557verify_watcher (EV_P_ W w)
1514{ 1558{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516 1560
1517 if (w->pending) 1561 if (w->pending)
1518 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1562 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1519} 1563}
1520 1564
1521static void noinline 1565static void noinline
1522verify_heap (EV_P_ ANHE *heap, int N) 1566verify_heap (EV_P_ ANHE *heap, int N)
1523{ 1567{
1524 int i; 1568 int i;
1525 1569
1526 for (i = HEAP0; i < N + HEAP0; ++i) 1570 for (i = HEAP0; i < N + HEAP0; ++i)
1527 { 1571 {
1528 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1572 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1529 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1573 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1530 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1574 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1531 1575
1532 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1533 } 1577 }
1534} 1578}
1535 1579
1536static void noinline 1580static void noinline
1537array_verify (EV_P_ W *ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1538{ 1582{
1539 while (cnt--) 1583 while (cnt--)
1540 { 1584 {
1541 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1542 verify_watcher (EV_A_ ws [cnt]); 1586 verify_watcher (EV_A_ ws [cnt]);
1543 } 1587 }
1544} 1588}
1545#endif 1589#endif
1546 1590
1553 1597
1554 assert (activecnt >= -1); 1598 assert (activecnt >= -1);
1555 1599
1556 assert (fdchangemax >= fdchangecnt); 1600 assert (fdchangemax >= fdchangecnt);
1557 for (i = 0; i < fdchangecnt; ++i) 1601 for (i = 0; i < fdchangecnt; ++i)
1558 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1559 1603
1560 assert (anfdmax >= 0); 1604 assert (anfdmax >= 0);
1561 for (i = 0; i < anfdmax; ++i) 1605 for (i = 0; i < anfdmax; ++i)
1562 for (w = anfds [i].head; w; w = w->next) 1606 for (w = anfds [i].head; w; w = w->next)
1563 { 1607 {
1564 verify_watcher (EV_A_ (W)w); 1608 verify_watcher (EV_A_ (W)w);
1565 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1609 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1566 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1610 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1567 } 1611 }
1568 1612
1569 assert (timermax >= timercnt); 1613 assert (timermax >= timercnt);
1570 verify_heap (EV_A_ timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1571 1615
1648{ 1692{
1649#if EV_MULTIPLICITY 1693#if EV_MULTIPLICITY
1650 struct ev_loop *loop = ev_default_loop_ptr; 1694 struct ev_loop *loop = ev_default_loop_ptr;
1651#endif 1695#endif
1652 1696
1697 ev_default_loop_ptr = 0;
1698
1653#ifndef _WIN32 1699#ifndef _WIN32
1654 ev_ref (EV_A); /* child watcher */ 1700 ev_ref (EV_A); /* child watcher */
1655 ev_signal_stop (EV_A_ &childev); 1701 ev_signal_stop (EV_A_ &childev);
1656#endif 1702#endif
1657 1703
1663{ 1709{
1664#if EV_MULTIPLICITY 1710#if EV_MULTIPLICITY
1665 struct ev_loop *loop = ev_default_loop_ptr; 1711 struct ev_loop *loop = ev_default_loop_ptr;
1666#endif 1712#endif
1667 1713
1668 if (backend)
1669 postfork = 1; /* must be in line with ev_loop_fork */ 1714 postfork = 1; /* must be in line with ev_loop_fork */
1670} 1715}
1671 1716
1672/*****************************************************************************/ 1717/*****************************************************************************/
1673 1718
1674void 1719void
1687 { 1732 {
1688 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1689 1734
1690 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1691 { 1736 {
1692 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1693 1738
1694 p->w->pending = 0; 1739 p->w->pending = 0;
1695 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1697 } 1742 }
1728 1773
1729 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1730 { 1775 {
1731 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1732 1777
1733 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1734 1779
1735 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1736 if (w->repeat) 1781 if (w->repeat)
1737 { 1782 {
1738 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1739 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1740 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1741 1786
1742 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1743 1788
1744 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1745 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1746 } 1791 }
1747 else 1792 else
1760 1805
1761 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1762 { 1807 {
1763 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1764 1809
1765 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1766 1811
1767 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1768 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1769 { 1814 {
1770 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1771 1816
1772 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1773 1818
1774 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1775 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1776 } 1821 }
1777 else if (w->interval) 1822 else if (w->interval)
1905ev_unref (EV_P) 1950ev_unref (EV_P)
1906{ 1951{
1907 --activecnt; 1952 --activecnt;
1908} 1953}
1909 1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1910static int loop_done; 1961static int loop_done;
1911 1962
1912void 1963void
1913ev_loop (EV_P_ int flags) 1964ev_loop (EV_P_ int flags)
1914{ 1965{
2122 int fd = w->fd; 2173 int fd = w->fd;
2123 2174
2124 if (expect_false (ev_is_active (w))) 2175 if (expect_false (ev_is_active (w)))
2125 return; 2176 return;
2126 2177
2127 assert (("ev_io_start called with negative fd", fd >= 0)); 2178 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2128 2180
2129 EV_FREQUENT_CHECK; 2181 EV_FREQUENT_CHECK;
2130 2182
2131 ev_start (EV_A_ (W)w, 1); 2183 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2185 wlist_add (&anfds[fd].head, (WL)w);
2134 2186
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2187 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2136 w->events &= ~EV_IOFDSET; 2188 w->events &= ~EV_IOFDSET;
2137 2189
2143{ 2195{
2144 clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2146 return; 2198 return;
2147 2199
2148 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2200 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2149 2201
2150 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2151 2203
2152 wlist_del (&anfds[w->fd].head, (WL)w); 2204 wlist_del (&anfds[w->fd].head, (WL)w);
2153 ev_stop (EV_A_ (W)w); 2205 ev_stop (EV_A_ (W)w);
2163 if (expect_false (ev_is_active (w))) 2215 if (expect_false (ev_is_active (w)))
2164 return; 2216 return;
2165 2217
2166 ev_at (w) += mn_now; 2218 ev_at (w) += mn_now;
2167 2219
2168 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2220 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2169 2221
2170 EV_FREQUENT_CHECK; 2222 EV_FREQUENT_CHECK;
2171 2223
2172 ++timercnt; 2224 ++timercnt;
2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2225 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2176 ANHE_at_cache (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2177 upheap (timers, ev_active (w)); 2229 upheap (timers, ev_active (w));
2178 2230
2179 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2180 2232
2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2233 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2182} 2234}
2183 2235
2184void noinline 2236void noinline
2185ev_timer_stop (EV_P_ ev_timer *w) 2237ev_timer_stop (EV_P_ ev_timer *w)
2186{ 2238{
2191 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2192 2244
2193 { 2245 {
2194 int active = ev_active (w); 2246 int active = ev_active (w);
2195 2247
2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2248 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2197 2249
2198 --timercnt; 2250 --timercnt;
2199 2251
2200 if (expect_true (active < timercnt + HEAP0)) 2252 if (expect_true (active < timercnt + HEAP0))
2201 { 2253 {
2245 2297
2246 if (w->reschedule_cb) 2298 if (w->reschedule_cb)
2247 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2248 else if (w->interval) 2300 else if (w->interval)
2249 { 2301 {
2250 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2302 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2251 /* this formula differs from the one in periodic_reify because we do not always round up */ 2303 /* this formula differs from the one in periodic_reify because we do not always round up */
2252 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2304 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2253 } 2305 }
2254 else 2306 else
2255 ev_at (w) = w->offset; 2307 ev_at (w) = w->offset;
2263 ANHE_at_cache (periodics [ev_active (w)]); 2315 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w)); 2316 upheap (periodics, ev_active (w));
2265 2317
2266 EV_FREQUENT_CHECK; 2318 EV_FREQUENT_CHECK;
2267 2319
2268 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2320 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2269} 2321}
2270 2322
2271void noinline 2323void noinline
2272ev_periodic_stop (EV_P_ ev_periodic *w) 2324ev_periodic_stop (EV_P_ ev_periodic *w)
2273{ 2325{
2278 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2279 2331
2280 { 2332 {
2281 int active = ev_active (w); 2333 int active = ev_active (w);
2282 2334
2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2335 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2284 2336
2285 --periodiccnt; 2337 --periodiccnt;
2286 2338
2287 if (expect_true (active < periodiccnt + HEAP0)) 2339 if (expect_true (active < periodiccnt + HEAP0))
2288 { 2340 {
2311 2363
2312void noinline 2364void noinline
2313ev_signal_start (EV_P_ ev_signal *w) 2365ev_signal_start (EV_P_ ev_signal *w)
2314{ 2366{
2315#if EV_MULTIPLICITY 2367#if EV_MULTIPLICITY
2316 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2368 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2317#endif 2369#endif
2318 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2319 return; 2371 return;
2320 2372
2321 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2373 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2322 2374
2323 evpipe_init (EV_A); 2375 evpipe_init (EV_A);
2324 2376
2325 EV_FREQUENT_CHECK; 2377 EV_FREQUENT_CHECK;
2326 2378
2329 sigset_t full, prev; 2381 sigset_t full, prev;
2330 sigfillset (&full); 2382 sigfillset (&full);
2331 sigprocmask (SIG_SETMASK, &full, &prev); 2383 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif 2384#endif
2333 2385
2334 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2386 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335 2387
2336#ifndef _WIN32 2388#ifndef _WIN32
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2389 sigprocmask (SIG_SETMASK, &prev, 0);
2338#endif 2390#endif
2339 } 2391 }
2377 2429
2378void 2430void
2379ev_child_start (EV_P_ ev_child *w) 2431ev_child_start (EV_P_ ev_child *w)
2380{ 2432{
2381#if EV_MULTIPLICITY 2433#if EV_MULTIPLICITY
2382 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2434 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2383#endif 2435#endif
2384 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
2385 return; 2437 return;
2386 2438
2387 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
2412# ifdef _WIN32 2464# ifdef _WIN32
2413# undef lstat 2465# undef lstat
2414# define lstat(a,b) _stati64 (a,b) 2466# define lstat(a,b) _stati64 (a,b)
2415# endif 2467# endif
2416 2468
2417#define DEF_STAT_INTERVAL 5.0074891 2469#define DEF_STAT_INTERVAL 5.0074891
2470#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2418#define MIN_STAT_INTERVAL 0.1074891 2471#define MIN_STAT_INTERVAL 0.1074891
2419 2472
2420static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2473static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2421 2474
2422#if EV_USE_INOTIFY 2475#if EV_USE_INOTIFY
2423# define EV_INOTIFY_BUFSIZE 8192 2476# define EV_INOTIFY_BUFSIZE 8192
2427{ 2480{
2428 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); 2481 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);
2429 2482
2430 if (w->wd < 0) 2483 if (w->wd < 0)
2431 { 2484 {
2485 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2432 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2486 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2433 2487
2434 /* monitor some parent directory for speedup hints */ 2488 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2490 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2492 {
2439 char path [4096]; 2493 char path [4096];
2440 strcpy (path, w->path); 2494 strcpy (path, w->path);
2444 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2498 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2445 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2499 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2446 2500
2447 char *pend = strrchr (path, '/'); 2501 char *pend = strrchr (path, '/');
2448 2502
2449 if (!pend) 2503 if (!pend || pend == path)
2450 break; /* whoops, no '/', complain to your admin */ 2504 break;
2451 2505
2452 *pend = 0; 2506 *pend = 0;
2453 w->wd = inotify_add_watch (fs_fd, path, mask); 2507 w->wd = inotify_add_watch (fs_fd, path, mask);
2454 } 2508 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2510 }
2457 } 2511 }
2458 else
2459 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2460 2512
2461 if (w->wd >= 0) 2513 if (w->wd >= 0)
2514 {
2462 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2515 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2516
2517 /* now local changes will be tracked by inotify, but remote changes won't */
2518 /* unless the filesystem it known to be local, we therefore still poll */
2519 /* also do poll on <2.6.25, but with normal frequency */
2520 struct statfs sfs;
2521
2522 if (fs_2625 && !statfs (w->path, &sfs))
2523 if (sfs.f_type == 0x1373 /* devfs */
2524 || sfs.f_type == 0xEF53 /* ext2/3 */
2525 || sfs.f_type == 0x3153464a /* jfs */
2526 || sfs.f_type == 0x52654973 /* reiser3 */
2527 || sfs.f_type == 0x01021994 /* tempfs */
2528 || sfs.f_type == 0x58465342 /* xfs */)
2529 return;
2530
2531 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2532 ev_timer_again (EV_A_ &w->timer);
2533 }
2463} 2534}
2464 2535
2465static void noinline 2536static void noinline
2466infy_del (EV_P_ ev_stat *w) 2537infy_del (EV_P_ ev_stat *w)
2467{ 2538{
2481 2552
2482static void noinline 2553static void noinline
2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2554infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484{ 2555{
2485 if (slot < 0) 2556 if (slot < 0)
2486 /* overflow, need to check for all hahs slots */ 2557 /* overflow, need to check for all hash slots */
2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2558 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488 infy_wd (EV_A_ slot, wd, ev); 2559 infy_wd (EV_A_ slot, wd, ev);
2489 else 2560 else
2490 { 2561 {
2491 WL w_; 2562 WL w_;
2497 2568
2498 if (w->wd == wd || wd == -1) 2569 if (w->wd == wd || wd == -1)
2499 { 2570 {
2500 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2571 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2501 { 2572 {
2573 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2502 w->wd = -1; 2574 w->wd = -1;
2503 infy_add (EV_A_ w); /* re-add, no matter what */ 2575 infy_add (EV_A_ w); /* re-add, no matter what */
2504 } 2576 }
2505 2577
2506 stat_timer_cb (EV_A_ &w->timer, 0); 2578 stat_timer_cb (EV_A_ &w->timer, 0);
2520 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2592 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2593 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522} 2594}
2523 2595
2524void inline_size 2596void inline_size
2597check_2625 (EV_P)
2598{
2599 /* kernels < 2.6.25 are borked
2600 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2601 */
2602 struct utsname buf;
2603 int major, minor, micro;
2604
2605 if (uname (&buf))
2606 return;
2607
2608 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2609 return;
2610
2611 if (major < 2
2612 || (major == 2 && minor < 6)
2613 || (major == 2 && minor == 6 && micro < 25))
2614 return;
2615
2616 fs_2625 = 1;
2617}
2618
2619void inline_size
2525infy_init (EV_P) 2620infy_init (EV_P)
2526{ 2621{
2527 if (fs_fd != -2) 2622 if (fs_fd != -2)
2528 return; 2623 return;
2624
2625 fs_fd = -1;
2626
2627 check_2625 (EV_A);
2529 2628
2530 fs_fd = inotify_init (); 2629 fs_fd = inotify_init ();
2531 2630
2532 if (fs_fd >= 0) 2631 if (fs_fd >= 0)
2533 { 2632 {
2561 w->wd = -1; 2660 w->wd = -1;
2562 2661
2563 if (fs_fd >= 0) 2662 if (fs_fd >= 0)
2564 infy_add (EV_A_ w); /* re-add, no matter what */ 2663 infy_add (EV_A_ w); /* re-add, no matter what */
2565 else 2664 else
2566 ev_timer_start (EV_A_ &w->timer); 2665 ev_timer_again (EV_A_ &w->timer);
2567 } 2666 }
2568
2569 } 2667 }
2570} 2668}
2571 2669
2670#endif
2671
2672#ifdef _WIN32
2673# define EV_LSTAT(p,b) _stati64 (p, b)
2674#else
2675# define EV_LSTAT(p,b) lstat (p, b)
2572#endif 2676#endif
2573 2677
2574void 2678void
2575ev_stat_stat (EV_P_ ev_stat *w) 2679ev_stat_stat (EV_P_ ev_stat *w)
2576{ 2680{
2603 || w->prev.st_atime != w->attr.st_atime 2707 || w->prev.st_atime != w->attr.st_atime
2604 || w->prev.st_mtime != w->attr.st_mtime 2708 || w->prev.st_mtime != w->attr.st_mtime
2605 || w->prev.st_ctime != w->attr.st_ctime 2709 || w->prev.st_ctime != w->attr.st_ctime
2606 ) { 2710 ) {
2607 #if EV_USE_INOTIFY 2711 #if EV_USE_INOTIFY
2712 if (fs_fd >= 0)
2713 {
2608 infy_del (EV_A_ w); 2714 infy_del (EV_A_ w);
2609 infy_add (EV_A_ w); 2715 infy_add (EV_A_ w);
2610 ev_stat_stat (EV_A_ w); /* avoid race... */ 2716 ev_stat_stat (EV_A_ w); /* avoid race... */
2717 }
2611 #endif 2718 #endif
2612 2719
2613 ev_feed_event (EV_A_ w, EV_STAT); 2720 ev_feed_event (EV_A_ w, EV_STAT);
2614 } 2721 }
2615} 2722}
2618ev_stat_start (EV_P_ ev_stat *w) 2725ev_stat_start (EV_P_ ev_stat *w)
2619{ 2726{
2620 if (expect_false (ev_is_active (w))) 2727 if (expect_false (ev_is_active (w)))
2621 return; 2728 return;
2622 2729
2623 /* since we use memcmp, we need to clear any padding data etc. */
2624 memset (&w->prev, 0, sizeof (ev_statdata));
2625 memset (&w->attr, 0, sizeof (ev_statdata));
2626
2627 ev_stat_stat (EV_A_ w); 2730 ev_stat_stat (EV_A_ w);
2628 2731
2732 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2629 if (w->interval < MIN_STAT_INTERVAL) 2733 w->interval = MIN_STAT_INTERVAL;
2630 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2631 2734
2632 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2735 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2633 ev_set_priority (&w->timer, ev_priority (w)); 2736 ev_set_priority (&w->timer, ev_priority (w));
2634 2737
2635#if EV_USE_INOTIFY 2738#if EV_USE_INOTIFY
2636 infy_init (EV_A); 2739 infy_init (EV_A);
2637 2740
2638 if (fs_fd >= 0) 2741 if (fs_fd >= 0)
2639 infy_add (EV_A_ w); 2742 infy_add (EV_A_ w);
2640 else 2743 else
2641#endif 2744#endif
2642 ev_timer_start (EV_A_ &w->timer); 2745 ev_timer_again (EV_A_ &w->timer);
2643 2746
2644 ev_start (EV_A_ (W)w, 1); 2747 ev_start (EV_A_ (W)w, 1);
2645 2748
2646 EV_FREQUENT_CHECK; 2749 EV_FREQUENT_CHECK;
2647} 2750}
2817 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2920 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2818 } 2921 }
2819 } 2922 }
2820} 2923}
2821 2924
2925static void
2926embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2927{
2928 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2929
2930 ev_embed_stop (EV_A_ w);
2931
2932 {
2933 struct ev_loop *loop = w->other;
2934
2935 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2937 }
2938
2939 ev_embed_start (EV_A_ w);
2940}
2941
2822#if 0 2942#if 0
2823static void 2943static void
2824embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2944embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2825{ 2945{
2826 ev_idle_stop (EV_A_ idle); 2946 ev_idle_stop (EV_A_ idle);
2833 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2834 return; 2954 return;
2835 2955
2836 { 2956 {
2837 struct ev_loop *loop = w->other; 2957 struct ev_loop *loop = w->other;
2838 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2958 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2839 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2959 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2840 } 2960 }
2841 2961
2842 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2843 2963
2846 2966
2847 ev_prepare_init (&w->prepare, embed_prepare_cb); 2967 ev_prepare_init (&w->prepare, embed_prepare_cb);
2848 ev_set_priority (&w->prepare, EV_MINPRI); 2968 ev_set_priority (&w->prepare, EV_MINPRI);
2849 ev_prepare_start (EV_A_ &w->prepare); 2969 ev_prepare_start (EV_A_ &w->prepare);
2850 2970
2971 ev_fork_init (&w->fork, embed_fork_cb);
2972 ev_fork_start (EV_A_ &w->fork);
2973
2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2974 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2852 2975
2853 ev_start (EV_A_ (W)w, 1); 2976 ev_start (EV_A_ (W)w, 1);
2854 2977
2855 EV_FREQUENT_CHECK; 2978 EV_FREQUENT_CHECK;
2862 if (expect_false (!ev_is_active (w))) 2985 if (expect_false (!ev_is_active (w)))
2863 return; 2986 return;
2864 2987
2865 EV_FREQUENT_CHECK; 2988 EV_FREQUENT_CHECK;
2866 2989
2867 ev_io_stop (EV_A_ &w->io); 2990 ev_io_stop (EV_A_ &w->io);
2868 ev_prepare_stop (EV_A_ &w->prepare); 2991 ev_prepare_stop (EV_A_ &w->prepare);
2869 2992 ev_fork_stop (EV_A_ &w->fork);
2870 ev_stop (EV_A_ (W)w);
2871 2993
2872 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2873} 2995}
2874#endif 2996#endif
2875 2997
2972once_cb (EV_P_ struct ev_once *once, int revents) 3094once_cb (EV_P_ struct ev_once *once, int revents)
2973{ 3095{
2974 void (*cb)(int revents, void *arg) = once->cb; 3096 void (*cb)(int revents, void *arg) = once->cb;
2975 void *arg = once->arg; 3097 void *arg = once->arg;
2976 3098
2977 ev_io_stop (EV_A_ &once->io); 3099 ev_io_stop (EV_A_ &once->io);
2978 ev_timer_stop (EV_A_ &once->to); 3100 ev_timer_stop (EV_A_ &once->to);
2979 ev_free (once); 3101 ev_free (once);
2980 3102
2981 cb (revents, arg); 3103 cb (revents, arg);
2982} 3104}
2983 3105
2984static void 3106static void
2985once_cb_io (EV_P_ ev_io *w, int revents) 3107once_cb_io (EV_P_ ev_io *w, int revents)
2986{ 3108{
2987 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3109 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3110
3111 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2988} 3112}
2989 3113
2990static void 3114static void
2991once_cb_to (EV_P_ ev_timer *w, int revents) 3115once_cb_to (EV_P_ ev_timer *w, int revents)
2992{ 3116{
2993 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3117 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3118
3119 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2994} 3120}
2995 3121
2996void 3122void
2997ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3123ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2998{ 3124{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines