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

Comparing libev/ev.c (file contents):
Revision 1.252 by root, Thu May 22 03:43:32 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 */
167 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
188
168#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1
192# else
169# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif
170#endif 195#endif
171 196
172#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
174#endif 199#endif
175 200
176#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1
204# else
177# define EV_USE_NANOSLEEP 0 205# define EV_USE_NANOSLEEP 0
206# endif
178#endif 207#endif
179 208
180#ifndef EV_USE_SELECT 209#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 210# define EV_USE_SELECT 1
182#endif 211#endif
… …
277# include <sys/select.h> 306# include <sys/select.h>
278# endif 307# endif
279#endif 308#endif
280 309
281#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
282# 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
283#endif 319#endif
284 320
285#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
286# 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
287#endif 332#endif
288 333
289#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
290/* 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 */
291# include <stdint.h> 336# include <stdint.h>
… …
352typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
353 398
354#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
355#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
356 401
357#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
358/* 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 */
359/* 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
360static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
361#endif 410#endif
362 411
363#ifdef _WIN32 412#ifdef _WIN32
364# include "ev_win32.c" 413# include "ev_win32.c"
… …
373{ 422{
374 syserr_cb = cb; 423 syserr_cb = cb;
375} 424}
376 425
377static void noinline 426static void noinline
378syserr (const char *msg) 427ev_syserr (const char *msg)
379{ 428{
380 if (!msg) 429 if (!msg)
381 msg = "(libev) system error"; 430 msg = "(libev) system error";
382 431
383 if (syserr_cb) 432 if (syserr_cb)
… …
434typedef struct 483typedef struct
435{ 484{
436 WL head; 485 WL head;
437 unsigned char events; 486 unsigned char events;
438 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
439#if EV_SELECT_IS_WINSOCKET 493#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 494 SOCKET handle;
441#endif 495#endif
442} ANFD; 496} ANFD;
443 497
… …
503 557
504ev_tstamp 558ev_tstamp
505ev_time (void) 559ev_time (void)
506{ 560{
507#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
508 struct timespec ts; 564 struct timespec ts;
509 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
510 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
511#else 567 }
568#endif
569
512 struct timeval tv; 570 struct timeval tv;
513 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
514 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
515#endif
516} 573}
517 574
518ev_tstamp inline_size 575ev_tstamp inline_size
519get_clock (void) 576get_clock (void)
520{ 577{
… …
556 struct timeval tv; 613 struct timeval tv;
557 614
558 tv.tv_sec = (time_t)delay; 615 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 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 */
561 select (0, 0, 0, 0, &tv); 621 select (0, 0, 0, 0, &tv);
562#endif 622#endif
563 } 623 }
564} 624}
565 625
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 652array_realloc (int elem, void *base, int *cur, int cnt)
593{ 653{
594 *cur = array_nextsize (elem, *cur, cnt); 654 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 655 return ev_realloc (base, elem * *cur);
596} 656}
657
658#define array_init_zero(base,count) \
659 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 660
598#define array_needsize(type,base,cur,cnt,init) \ 661#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 662 if (expect_false ((cnt) > (cur))) \
600 { \ 663 { \
601 int ocur_ = (cur); \ 664 int ocur_ = (cur); \
… …
645 ev_feed_event (EV_A_ events [i], type); 708 ev_feed_event (EV_A_ events [i], type);
646} 709}
647 710
648/*****************************************************************************/ 711/*****************************************************************************/
649 712
650void inline_size
651anfds_init (ANFD *base, int count)
652{
653 while (count--)
654 {
655 base->head = 0;
656 base->events = EV_NONE;
657 base->reify = 0;
658
659 ++base;
660 }
661}
662
663void inline_speed 713void inline_speed
664fd_event (EV_P_ int fd, int revents) 714fd_event (EV_P_ int fd, int revents)
665{ 715{
666 ANFD *anfd = anfds + fd; 716 ANFD *anfd = anfds + fd;
667 ev_io *w; 717 ev_io *w;
… …
699 events |= (unsigned char)w->events; 749 events |= (unsigned char)w->events;
700 750
701#if EV_SELECT_IS_WINSOCKET 751#if EV_SELECT_IS_WINSOCKET
702 if (events) 752 if (events)
703 { 753 {
704 unsigned long argp; 754 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 755 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 757 #else
708 anfd->handle = _get_osfhandle (fd); 758 anfd->handle = _get_osfhandle (fd);
709 #endif 759 #endif
710 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));
711 } 761 }
712#endif 762#endif
713 763
714 { 764 {
715 unsigned char o_events = anfd->events; 765 unsigned char o_events = anfd->events;
… …
768{ 818{
769 int fd; 819 int fd;
770 820
771 for (fd = 0; fd < anfdmax; ++fd) 821 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 822 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 823 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 824 fd_kill (EV_A_ fd);
775} 825}
776 826
777/* 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 */
778static void noinline 828static void noinline
… …
796 846
797 for (fd = 0; fd < anfdmax; ++fd) 847 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 848 if (anfds [fd].events)
799 { 849 {
800 anfds [fd].events = 0; 850 anfds [fd].events = 0;
851 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 852 fd_change (EV_A_ fd, EV_IOFDSET | 1);
802 } 853 }
803} 854}
804 855
805/*****************************************************************************/ 856/*****************************************************************************/
… …
957static ANSIG *signals; 1008static ANSIG *signals;
958static int signalmax; 1009static int signalmax;
959 1010
960static EV_ATOMIC_T gotsig; 1011static EV_ATOMIC_T gotsig;
961 1012
962void inline_size
963signals_init (ANSIG *base, int count)
964{
965 while (count--)
966 {
967 base->head = 0;
968 base->gotsig = 0;
969
970 ++base;
971 }
972}
973
974/*****************************************************************************/ 1013/*****************************************************************************/
975 1014
976void inline_speed 1015void inline_speed
977fd_intern (int fd) 1016fd_intern (int fd)
978{ 1017{
979#ifdef _WIN32 1018#ifdef _WIN32
980 int arg = 1; 1019 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 1021#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 1022 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 1023 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 1024#endif
… …
999 } 1038 }
1000 else 1039 else
1001#endif 1040#endif
1002 { 1041 {
1003 while (pipe (evpipe)) 1042 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1043 ev_syserr ("(libev) error creating signal/async pipe");
1005 1044
1006 fd_intern (evpipe [0]); 1045 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1046 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1047 ev_io_set (&pipeev, evpipe [0], EV_READ);
1009 } 1048 }
… …
1099ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1100{ 1139{
1101 WL w; 1140 WL w;
1102 1141
1103#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1104 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));
1105#endif 1144#endif
1106 1145
1107 --signum; 1146 --signum;
1108 1147
1109 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
… …
1238 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1239 /* 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 */
1240 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1241#endif 1280#endif
1242#ifdef __APPLE__ 1281#ifdef __APPLE__
1243 // flags &= ~EVBACKEND_KQUEUE; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1244 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 */
1245#endif 1285#endif
1246 1286
1247 return flags; 1287 return flags;
1248} 1288}
1249 1289
… …
1286static void noinline 1326static void noinline
1287loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1288{ 1328{
1289 if (!backend) 1329 if (!backend)
1290 { 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
1291#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1292 { 1343 {
1293 struct timespec ts; 1344 struct timespec ts;
1345
1294 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1295 have_monotonic = 1; 1347 have_monotonic = 1;
1296 } 1348 }
1297#endif 1349#endif
1298 1350
1299 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1300 mn_now = get_clock (); 1352 mn_now = get_clock ();
1301 now_floor = mn_now; 1353 now_floor = mn_now;
… …
1499{ 1551{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1552 postfork = 1; /* must be in line with ev_default_fork */
1501} 1553}
1502 1554
1503#if EV_VERIFY 1555#if EV_VERIFY
1504void noinline 1556static void noinline
1505verify_watcher (EV_P_ W w) 1557verify_watcher (EV_P_ W w)
1506{ 1558{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1560
1509 if (w->pending) 1561 if (w->pending)
1510 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));
1511} 1563}
1512 1564
1513static void noinline 1565static void noinline
1514verify_heap (EV_P_ ANHE *heap, int N) 1566verify_heap (EV_P_ ANHE *heap, int N)
1515{ 1567{
1516 int i; 1568 int i;
1517 1569
1518 for (i = HEAP0; i < N + HEAP0; ++i) 1570 for (i = HEAP0; i < N + HEAP0; ++i)
1519 { 1571 {
1520 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));
1521 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])));
1522 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]))));
1523 1575
1524 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1525 } 1577 }
1526} 1578}
1527 1579
1528static void noinline 1580static void noinline
1529array_verify (EV_P_ W *ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1530{ 1582{
1531 while (cnt--) 1583 while (cnt--)
1532 { 1584 {
1533 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1534 verify_watcher (EV_A_ ws [cnt]); 1586 verify_watcher (EV_A_ ws [cnt]);
1535 } 1587 }
1536} 1588}
1537#endif 1589#endif
1538 1590
… …
1545 1597
1546 assert (activecnt >= -1); 1598 assert (activecnt >= -1);
1547 1599
1548 assert (fdchangemax >= fdchangecnt); 1600 assert (fdchangemax >= fdchangecnt);
1549 for (i = 0; i < fdchangecnt; ++i) 1601 for (i = 0; i < fdchangecnt; ++i)
1550 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1551 1603
1552 assert (anfdmax >= 0); 1604 assert (anfdmax >= 0);
1553 for (i = 0; i < anfdmax; ++i) 1605 for (i = 0; i < anfdmax; ++i)
1554 for (w = anfds [i].head; w; w = w->next) 1606 for (w = anfds [i].head; w; w = w->next)
1555 { 1607 {
1556 verify_watcher (EV_A_ (W)w); 1608 verify_watcher (EV_A_ (W)w);
1557 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1609 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1558 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));
1559 } 1611 }
1560 1612
1561 assert (timermax >= timercnt); 1613 assert (timermax >= timercnt);
1562 verify_heap (EV_A_ timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1563 1615
… …
1640{ 1692{
1641#if EV_MULTIPLICITY 1693#if EV_MULTIPLICITY
1642 struct ev_loop *loop = ev_default_loop_ptr; 1694 struct ev_loop *loop = ev_default_loop_ptr;
1643#endif 1695#endif
1644 1696
1697 ev_default_loop_ptr = 0;
1698
1645#ifndef _WIN32 1699#ifndef _WIN32
1646 ev_ref (EV_A); /* child watcher */ 1700 ev_ref (EV_A); /* child watcher */
1647 ev_signal_stop (EV_A_ &childev); 1701 ev_signal_stop (EV_A_ &childev);
1648#endif 1702#endif
1649 1703
… …
1655{ 1709{
1656#if EV_MULTIPLICITY 1710#if EV_MULTIPLICITY
1657 struct ev_loop *loop = ev_default_loop_ptr; 1711 struct ev_loop *loop = ev_default_loop_ptr;
1658#endif 1712#endif
1659 1713
1660 if (backend)
1661 postfork = 1; /* must be in line with ev_loop_fork */ 1714 postfork = 1; /* must be in line with ev_loop_fork */
1662} 1715}
1663 1716
1664/*****************************************************************************/ 1717/*****************************************************************************/
1665 1718
1666void 1719void
… …
1679 { 1732 {
1680 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1681 1734
1682 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1683 { 1736 {
1684 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1685 1738
1686 p->w->pending = 0; 1739 p->w->pending = 0;
1687 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1688 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1689 } 1742 }
… …
1720 1773
1721 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1722 { 1775 {
1723 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1724 1777
1725 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1726 1779
1727 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1728 if (w->repeat) 1781 if (w->repeat)
1729 { 1782 {
1730 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1731 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1732 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1733 1786
1734 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.));
1735 1788
1736 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1737 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1738 } 1791 }
1739 else 1792 else
… …
1752 1805
1753 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1754 { 1807 {
1755 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1756 1809
1757 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1758 1811
1759 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1760 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1761 { 1814 {
1762 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1763 1816
1764 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));
1765 1818
1766 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1767 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1768 } 1821 }
1769 else if (w->interval) 1822 else if (w->interval)
… …
1897ev_unref (EV_P) 1950ev_unref (EV_P)
1898{ 1951{
1899 --activecnt; 1952 --activecnt;
1900} 1953}
1901 1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1902static int loop_done; 1961static int loop_done;
1903 1962
1904void 1963void
1905ev_loop (EV_P_ int flags) 1964ev_loop (EV_P_ int flags)
1906{ 1965{
… …
2114 int fd = w->fd; 2173 int fd = w->fd;
2115 2174
2116 if (expect_false (ev_is_active (w))) 2175 if (expect_false (ev_is_active (w)))
2117 return; 2176 return;
2118 2177
2119 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))));
2120 2180
2121 EV_FREQUENT_CHECK; 2181 EV_FREQUENT_CHECK;
2122 2182
2123 ev_start (EV_A_ (W)w, 1); 2183 ev_start (EV_A_ (W)w, 1);
2124 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2125 wlist_add (&anfds[fd].head, (WL)w); 2185 wlist_add (&anfds[fd].head, (WL)w);
2126 2186
2127 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2187 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2128 w->events &= ~EV_IOFDSET; 2188 w->events &= ~EV_IOFDSET;
2129 2189
… …
2135{ 2195{
2136 clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2137 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2138 return; 2198 return;
2139 2199
2140 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));
2141 2201
2142 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2143 2203
2144 wlist_del (&anfds[w->fd].head, (WL)w); 2204 wlist_del (&anfds[w->fd].head, (WL)w);
2145 ev_stop (EV_A_ (W)w); 2205 ev_stop (EV_A_ (W)w);
… …
2155 if (expect_false (ev_is_active (w))) 2215 if (expect_false (ev_is_active (w)))
2156 return; 2216 return;
2157 2217
2158 ev_at (w) += mn_now; 2218 ev_at (w) += mn_now;
2159 2219
2160 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.));
2161 2221
2162 EV_FREQUENT_CHECK; 2222 EV_FREQUENT_CHECK;
2163 2223
2164 ++timercnt; 2224 ++timercnt;
2165 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2225 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2168 ANHE_at_cache (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2169 upheap (timers, ev_active (w)); 2229 upheap (timers, ev_active (w));
2170 2230
2171 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2172 2232
2173 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2233 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2174} 2234}
2175 2235
2176void noinline 2236void noinline
2177ev_timer_stop (EV_P_ ev_timer *w) 2237ev_timer_stop (EV_P_ ev_timer *w)
2178{ 2238{
… …
2183 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2184 2244
2185 { 2245 {
2186 int active = ev_active (w); 2246 int active = ev_active (w);
2187 2247
2188 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2248 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2189 2249
2190 --timercnt; 2250 --timercnt;
2191 2251
2192 if (expect_true (active < timercnt + HEAP0)) 2252 if (expect_true (active < timercnt + HEAP0))
2193 { 2253 {
… …
2237 2297
2238 if (w->reschedule_cb) 2298 if (w->reschedule_cb)
2239 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2240 else if (w->interval) 2300 else if (w->interval)
2241 { 2301 {
2242 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.));
2243 /* 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 */
2244 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;
2245 } 2305 }
2246 else 2306 else
2247 ev_at (w) = w->offset; 2307 ev_at (w) = w->offset;
… …
2255 ANHE_at_cache (periodics [ev_active (w)]); 2315 ANHE_at_cache (periodics [ev_active (w)]);
2256 upheap (periodics, ev_active (w)); 2316 upheap (periodics, ev_active (w));
2257 2317
2258 EV_FREQUENT_CHECK; 2318 EV_FREQUENT_CHECK;
2259 2319
2260 /*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));*/
2261} 2321}
2262 2322
2263void noinline 2323void noinline
2264ev_periodic_stop (EV_P_ ev_periodic *w) 2324ev_periodic_stop (EV_P_ ev_periodic *w)
2265{ 2325{
… …
2270 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2271 2331
2272 { 2332 {
2273 int active = ev_active (w); 2333 int active = ev_active (w);
2274 2334
2275 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2335 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2276 2336
2277 --periodiccnt; 2337 --periodiccnt;
2278 2338
2279 if (expect_true (active < periodiccnt + HEAP0)) 2339 if (expect_true (active < periodiccnt + HEAP0))
2280 { 2340 {
… …
2303 2363
2304void noinline 2364void noinline
2305ev_signal_start (EV_P_ ev_signal *w) 2365ev_signal_start (EV_P_ ev_signal *w)
2306{ 2366{
2307#if EV_MULTIPLICITY 2367#if EV_MULTIPLICITY
2308 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));
2309#endif 2369#endif
2310 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2311 return; 2371 return;
2312 2372
2313 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));
2314 2374
2315 evpipe_init (EV_A); 2375 evpipe_init (EV_A);
2316 2376
2317 EV_FREQUENT_CHECK; 2377 EV_FREQUENT_CHECK;
2318 2378
… …
2321 sigset_t full, prev; 2381 sigset_t full, prev;
2322 sigfillset (&full); 2382 sigfillset (&full);
2323 sigprocmask (SIG_SETMASK, &full, &prev); 2383 sigprocmask (SIG_SETMASK, &full, &prev);
2324#endif 2384#endif
2325 2385
2326 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2386 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2327 2387
2328#ifndef _WIN32 2388#ifndef _WIN32
2329 sigprocmask (SIG_SETMASK, &prev, 0); 2389 sigprocmask (SIG_SETMASK, &prev, 0);
2330#endif 2390#endif
2331 } 2391 }
… …
2369 2429
2370void 2430void
2371ev_child_start (EV_P_ ev_child *w) 2431ev_child_start (EV_P_ ev_child *w)
2372{ 2432{
2373#if EV_MULTIPLICITY 2433#if EV_MULTIPLICITY
2374 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));
2375#endif 2435#endif
2376 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
2377 return; 2437 return;
2378 2438
2379 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
… …
2404# ifdef _WIN32 2464# ifdef _WIN32
2405# undef lstat 2465# undef lstat
2406# define lstat(a,b) _stati64 (a,b) 2466# define lstat(a,b) _stati64 (a,b)
2407# endif 2467# endif
2408 2468
2409#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 */
2410#define MIN_STAT_INTERVAL 0.1074891 2471#define MIN_STAT_INTERVAL 0.1074891
2411 2472
2412static 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);
2413 2474
2414#if EV_USE_INOTIFY 2475#if EV_USE_INOTIFY
2415# define EV_INOTIFY_BUFSIZE 8192 2476# define EV_INOTIFY_BUFSIZE 8192
… …
2419{ 2480{
2420 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);
2421 2482
2422 if (w->wd < 0) 2483 if (w->wd < 0)
2423 { 2484 {
2485 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2424 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 */
2425 2487
2426 /* monitor some parent directory for speedup hints */ 2488 /* monitor some parent directory for speedup hints */
2427 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2428 /* but an efficiency issue only */ 2490 /* but an efficiency issue only */
2429 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2430 { 2492 {
2431 char path [4096]; 2493 char path [4096];
2432 strcpy (path, w->path); 2494 strcpy (path, w->path);
… …
2436 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2498 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2437 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2499 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2438 2500
2439 char *pend = strrchr (path, '/'); 2501 char *pend = strrchr (path, '/');
2440 2502
2441 if (!pend) 2503 if (!pend || pend == path)
2442 break; /* whoops, no '/', complain to your admin */ 2504 break;
2443 2505
2444 *pend = 0; 2506 *pend = 0;
2445 w->wd = inotify_add_watch (fs_fd, path, mask); 2507 w->wd = inotify_add_watch (fs_fd, path, mask);
2446 } 2508 }
2447 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2448 } 2510 }
2449 } 2511 }
2450 else
2451 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2452 2512
2453 if (w->wd >= 0) 2513 if (w->wd >= 0)
2514 {
2454 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 }
2455} 2534}
2456 2535
2457static void noinline 2536static void noinline
2458infy_del (EV_P_ ev_stat *w) 2537infy_del (EV_P_ ev_stat *w)
2459{ 2538{
… …
2473 2552
2474static void noinline 2553static void noinline
2475infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2554infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2476{ 2555{
2477 if (slot < 0) 2556 if (slot < 0)
2478 /* overflow, need to check for all hahs slots */ 2557 /* overflow, need to check for all hash slots */
2479 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2558 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2480 infy_wd (EV_A_ slot, wd, ev); 2559 infy_wd (EV_A_ slot, wd, ev);
2481 else 2560 else
2482 { 2561 {
2483 WL w_; 2562 WL w_;
… …
2489 2568
2490 if (w->wd == wd || wd == -1) 2569 if (w->wd == wd || wd == -1)
2491 { 2570 {
2492 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2571 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2493 { 2572 {
2573 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2494 w->wd = -1; 2574 w->wd = -1;
2495 infy_add (EV_A_ w); /* re-add, no matter what */ 2575 infy_add (EV_A_ w); /* re-add, no matter what */
2496 } 2576 }
2497 2577
2498 stat_timer_cb (EV_A_ &w->timer, 0); 2578 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2512 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)
2513 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2593 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2514} 2594}
2515 2595
2516void 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
2517infy_init (EV_P) 2620infy_init (EV_P)
2518{ 2621{
2519 if (fs_fd != -2) 2622 if (fs_fd != -2)
2520 return; 2623 return;
2624
2625 fs_fd = -1;
2626
2627 check_2625 (EV_A);
2521 2628
2522 fs_fd = inotify_init (); 2629 fs_fd = inotify_init ();
2523 2630
2524 if (fs_fd >= 0) 2631 if (fs_fd >= 0)
2525 { 2632 {
… …
2553 w->wd = -1; 2660 w->wd = -1;
2554 2661
2555 if (fs_fd >= 0) 2662 if (fs_fd >= 0)
2556 infy_add (EV_A_ w); /* re-add, no matter what */ 2663 infy_add (EV_A_ w); /* re-add, no matter what */
2557 else 2664 else
2558 ev_timer_start (EV_A_ &w->timer); 2665 ev_timer_again (EV_A_ &w->timer);
2559 } 2666 }
2560
2561 } 2667 }
2562} 2668}
2563 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)
2564#endif 2676#endif
2565 2677
2566void 2678void
2567ev_stat_stat (EV_P_ ev_stat *w) 2679ev_stat_stat (EV_P_ ev_stat *w)
2568{ 2680{
… …
2595 || w->prev.st_atime != w->attr.st_atime 2707 || w->prev.st_atime != w->attr.st_atime
2596 || w->prev.st_mtime != w->attr.st_mtime 2708 || w->prev.st_mtime != w->attr.st_mtime
2597 || w->prev.st_ctime != w->attr.st_ctime 2709 || w->prev.st_ctime != w->attr.st_ctime
2598 ) { 2710 ) {
2599 #if EV_USE_INOTIFY 2711 #if EV_USE_INOTIFY
2712 if (fs_fd >= 0)
2713 {
2600 infy_del (EV_A_ w); 2714 infy_del (EV_A_ w);
2601 infy_add (EV_A_ w); 2715 infy_add (EV_A_ w);
2602 ev_stat_stat (EV_A_ w); /* avoid race... */ 2716 ev_stat_stat (EV_A_ w); /* avoid race... */
2717 }
2603 #endif 2718 #endif
2604 2719
2605 ev_feed_event (EV_A_ w, EV_STAT); 2720 ev_feed_event (EV_A_ w, EV_STAT);
2606 } 2721 }
2607} 2722}
… …
2610ev_stat_start (EV_P_ ev_stat *w) 2725ev_stat_start (EV_P_ ev_stat *w)
2611{ 2726{
2612 if (expect_false (ev_is_active (w))) 2727 if (expect_false (ev_is_active (w)))
2613 return; 2728 return;
2614 2729
2615 /* since we use memcmp, we need to clear any padding data etc. */
2616 memset (&w->prev, 0, sizeof (ev_statdata));
2617 memset (&w->attr, 0, sizeof (ev_statdata));
2618
2619 ev_stat_stat (EV_A_ w); 2730 ev_stat_stat (EV_A_ w);
2620 2731
2732 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2621 if (w->interval < MIN_STAT_INTERVAL) 2733 w->interval = MIN_STAT_INTERVAL;
2622 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 2734
2624 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);
2625 ev_set_priority (&w->timer, ev_priority (w)); 2736 ev_set_priority (&w->timer, ev_priority (w));
2626 2737
2627#if EV_USE_INOTIFY 2738#if EV_USE_INOTIFY
2628 infy_init (EV_A); 2739 infy_init (EV_A);
2629 2740
2630 if (fs_fd >= 0) 2741 if (fs_fd >= 0)
2631 infy_add (EV_A_ w); 2742 infy_add (EV_A_ w);
2632 else 2743 else
2633#endif 2744#endif
2634 ev_timer_start (EV_A_ &w->timer); 2745 ev_timer_again (EV_A_ &w->timer);
2635 2746
2636 ev_start (EV_A_ (W)w, 1); 2747 ev_start (EV_A_ (W)w, 1);
2637 2748
2638 EV_FREQUENT_CHECK; 2749 EV_FREQUENT_CHECK;
2639} 2750}
… …
2809 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2920 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2810 } 2921 }
2811 } 2922 }
2812} 2923}
2813 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
2814#if 0 2942#if 0
2815static void 2943static void
2816embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2944embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2817{ 2945{
2818 ev_idle_stop (EV_A_ idle); 2946 ev_idle_stop (EV_A_ idle);
… …
2825 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2826 return; 2954 return;
2827 2955
2828 { 2956 {
2829 struct ev_loop *loop = w->other; 2957 struct ev_loop *loop = w->other;
2830 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 ()));
2831 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);
2832 } 2960 }
2833 2961
2834 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2835 2963
… …
2838 2966
2839 ev_prepare_init (&w->prepare, embed_prepare_cb); 2967 ev_prepare_init (&w->prepare, embed_prepare_cb);
2840 ev_set_priority (&w->prepare, EV_MINPRI); 2968 ev_set_priority (&w->prepare, EV_MINPRI);
2841 ev_prepare_start (EV_A_ &w->prepare); 2969 ev_prepare_start (EV_A_ &w->prepare);
2842 2970
2971 ev_fork_init (&w->fork, embed_fork_cb);
2972 ev_fork_start (EV_A_ &w->fork);
2973
2843 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2974 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2844 2975
2845 ev_start (EV_A_ (W)w, 1); 2976 ev_start (EV_A_ (W)w, 1);
2846 2977
2847 EV_FREQUENT_CHECK; 2978 EV_FREQUENT_CHECK;
… …
2854 if (expect_false (!ev_is_active (w))) 2985 if (expect_false (!ev_is_active (w)))
2855 return; 2986 return;
2856 2987
2857 EV_FREQUENT_CHECK; 2988 EV_FREQUENT_CHECK;
2858 2989
2859 ev_io_stop (EV_A_ &w->io); 2990 ev_io_stop (EV_A_ &w->io);
2860 ev_prepare_stop (EV_A_ &w->prepare); 2991 ev_prepare_stop (EV_A_ &w->prepare);
2861 2992 ev_fork_stop (EV_A_ &w->fork);
2862 ev_stop (EV_A_ (W)w);
2863 2993
2864 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2865} 2995}
2866#endif 2996#endif
2867 2997
… …
2964once_cb (EV_P_ struct ev_once *once, int revents) 3094once_cb (EV_P_ struct ev_once *once, int revents)
2965{ 3095{
2966 void (*cb)(int revents, void *arg) = once->cb; 3096 void (*cb)(int revents, void *arg) = once->cb;
2967 void *arg = once->arg; 3097 void *arg = once->arg;
2968 3098
2969 ev_io_stop (EV_A_ &once->io); 3099 ev_io_stop (EV_A_ &once->io);
2970 ev_timer_stop (EV_A_ &once->to); 3100 ev_timer_stop (EV_A_ &once->to);
2971 ev_free (once); 3101 ev_free (once);
2972 3102
2973 cb (revents, arg); 3103 cb (revents, arg);
2974} 3104}
2975 3105
2976static void 3106static void
2977once_cb_io (EV_P_ ev_io *w, int revents) 3107once_cb_io (EV_P_ ev_io *w, int revents)
2978{ 3108{
2979 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));
2980} 3112}
2981 3113
2982static void 3114static void
2983once_cb_to (EV_P_ ev_timer *w, int revents) 3115once_cb_to (EV_P_ ev_timer *w, int revents)
2984{ 3116{
2985 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));
2986} 3120}
2987 3121
2988void 3122void
2989ev_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)
2990{ 3124{

Diff Legend

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