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

Comparing libev/ev.c (file contents):
Revision 1.250 by root, Thu May 22 02:44:57 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/*****************************************************************************/
… …
937/* rebuild the heap: this function is used only once and executed rarely */ 988/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 989void inline_size
939reheap (ANHE *heap, int N) 990reheap (ANHE *heap, int N)
940{ 991{
941 int i; 992 int i;
993
942 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 994 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
943 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */ 995 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
944 for (i = 0; i < N; ++i) 996 for (i = 0; i < N; ++i)
945 upheap (heap, i + HEAP0); 997 upheap (heap, i + HEAP0);
946} 998}
947 999
948#if EV_VERIFY
949static void
950checkheap (ANHE *heap, int N)
951{
952 int i;
953
954 for (i = HEAP0; i < N + HEAP0; ++i)
955 {
956 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
957 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
958 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
959 }
960}
961#endif
962
963/*****************************************************************************/ 1000/*****************************************************************************/
964 1001
965typedef struct 1002typedef struct
966{ 1003{
967 WL head; 1004 WL head;
… …
971static ANSIG *signals; 1008static ANSIG *signals;
972static int signalmax; 1009static int signalmax;
973 1010
974static EV_ATOMIC_T gotsig; 1011static EV_ATOMIC_T gotsig;
975 1012
976void inline_size
977signals_init (ANSIG *base, int count)
978{
979 while (count--)
980 {
981 base->head = 0;
982 base->gotsig = 0;
983
984 ++base;
985 }
986}
987
988/*****************************************************************************/ 1013/*****************************************************************************/
989 1014
990void inline_speed 1015void inline_speed
991fd_intern (int fd) 1016fd_intern (int fd)
992{ 1017{
993#ifdef _WIN32 1018#ifdef _WIN32
994 int arg = 1; 1019 unsigned long arg = 1;
995 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1020 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
996#else 1021#else
997 fcntl (fd, F_SETFD, FD_CLOEXEC); 1022 fcntl (fd, F_SETFD, FD_CLOEXEC);
998 fcntl (fd, F_SETFL, O_NONBLOCK); 1023 fcntl (fd, F_SETFL, O_NONBLOCK);
999#endif 1024#endif
… …
1013 } 1038 }
1014 else 1039 else
1015#endif 1040#endif
1016 { 1041 {
1017 while (pipe (evpipe)) 1042 while (pipe (evpipe))
1018 syserr ("(libev) error creating signal/async pipe"); 1043 ev_syserr ("(libev) error creating signal/async pipe");
1019 1044
1020 fd_intern (evpipe [0]); 1045 fd_intern (evpipe [0]);
1021 fd_intern (evpipe [1]); 1046 fd_intern (evpipe [1]);
1022 ev_io_set (&pipeev, evpipe [0], EV_READ); 1047 ev_io_set (&pipeev, evpipe [0], EV_READ);
1023 } 1048 }
… …
1113ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1114{ 1139{
1115 WL w; 1140 WL w;
1116 1141
1117#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1118 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));
1119#endif 1144#endif
1120 1145
1121 --signum; 1146 --signum;
1122 1147
1123 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
… …
1252 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1253 /* 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 */
1254 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1255#endif 1280#endif
1256#ifdef __APPLE__ 1281#ifdef __APPLE__
1257 // flags &= ~EVBACKEND_KQUEUE; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1258 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 */
1259#endif 1285#endif
1260 1286
1261 return flags; 1287 return flags;
1262} 1288}
1263 1289
… …
1300static void noinline 1326static void noinline
1301loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1302{ 1328{
1303 if (!backend) 1329 if (!backend)
1304 { 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
1305#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1306 { 1343 {
1307 struct timespec ts; 1344 struct timespec ts;
1345
1308 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1309 have_monotonic = 1; 1347 have_monotonic = 1;
1310 } 1348 }
1311#endif 1349#endif
1312 1350
1313 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1314 mn_now = get_clock (); 1352 mn_now = get_clock ();
1315 now_floor = mn_now; 1353 now_floor = mn_now;
… …
1513{ 1551{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1552 postfork = 1; /* must be in line with ev_default_fork */
1515} 1553}
1516 1554
1517#if EV_VERIFY 1555#if EV_VERIFY
1518static void 1556static void noinline
1557verify_watcher (EV_P_ W w)
1558{
1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1560
1561 if (w->pending)
1562 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1563}
1564
1565static void noinline
1566verify_heap (EV_P_ ANHE *heap, int N)
1567{
1568 int i;
1569
1570 for (i = HEAP0; i < N + HEAP0; ++i)
1571 {
1572 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1573 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1574 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1575
1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1577 }
1578}
1579
1580static void noinline
1519array_check (W **ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1520{ 1582{
1521 while (cnt--) 1583 while (cnt--)
1584 {
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1586 verify_watcher (EV_A_ ws [cnt]);
1587 }
1523} 1588}
1524#endif 1589#endif
1525 1590
1526void 1591void
1527ev_loop_verify (EV_P) 1592ev_loop_verify (EV_P)
1528{ 1593{
1529#if EV_VERIFY 1594#if EV_VERIFY
1530 int i; 1595 int i;
1596 WL w;
1531 1597
1598 assert (activecnt >= -1);
1599
1600 assert (fdchangemax >= fdchangecnt);
1601 for (i = 0; i < fdchangecnt; ++i)
1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1603
1604 assert (anfdmax >= 0);
1605 for (i = 0; i < anfdmax; ++i)
1606 for (w = anfds [i].head; w; w = w->next)
1607 {
1608 verify_watcher (EV_A_ (W)w);
1609 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1610 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1611 }
1612
1613 assert (timermax >= timercnt);
1532 checkheap (timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1615
1533#if EV_PERIODIC_ENABLE 1616#if EV_PERIODIC_ENABLE
1617 assert (periodicmax >= periodiccnt);
1534 checkheap (periodics, periodiccnt); 1618 verify_heap (EV_A_ periodics, periodiccnt);
1535#endif 1619#endif
1536 1620
1621 for (i = NUMPRI; i--; )
1622 {
1623 assert (pendingmax [i] >= pendingcnt [i]);
1537#if EV_IDLE_ENABLE 1624#if EV_IDLE_ENABLE
1538 for (i = NUMPRI; i--; ) 1625 assert (idleall >= 0);
1626 assert (idlemax [i] >= idlecnt [i]);
1539 array_check ((W **)idles [i], idlecnt [i]); 1627 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1540#endif 1628#endif
1629 }
1630
1541#if EV_FORK_ENABLE 1631#if EV_FORK_ENABLE
1632 assert (forkmax >= forkcnt);
1542 array_check ((W **)forks, forkcnt); 1633 array_verify (EV_A_ (W *)forks, forkcnt);
1543#endif 1634#endif
1635
1544#if EV_ASYNC_ENABLE 1636#if EV_ASYNC_ENABLE
1637 assert (asyncmax >= asynccnt);
1545 array_check ((W **)asyncs, asynccnt); 1638 array_verify (EV_A_ (W *)asyncs, asynccnt);
1639#endif
1640
1641 assert (preparemax >= preparecnt);
1642 array_verify (EV_A_ (W *)prepares, preparecnt);
1643
1644 assert (checkmax >= checkcnt);
1645 array_verify (EV_A_ (W *)checks, checkcnt);
1646
1647# if 0
1648 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1649 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1546#endif 1650# endif
1547 array_check ((W **)prepares, preparecnt);
1548 array_check ((W **)checks, checkcnt);
1549#endif 1651#endif
1550} 1652}
1551 1653
1552#endif /* multiplicity */ 1654#endif /* multiplicity */
1553 1655
… …
1590{ 1692{
1591#if EV_MULTIPLICITY 1693#if EV_MULTIPLICITY
1592 struct ev_loop *loop = ev_default_loop_ptr; 1694 struct ev_loop *loop = ev_default_loop_ptr;
1593#endif 1695#endif
1594 1696
1697 ev_default_loop_ptr = 0;
1698
1595#ifndef _WIN32 1699#ifndef _WIN32
1596 ev_ref (EV_A); /* child watcher */ 1700 ev_ref (EV_A); /* child watcher */
1597 ev_signal_stop (EV_A_ &childev); 1701 ev_signal_stop (EV_A_ &childev);
1598#endif 1702#endif
1599 1703
… …
1605{ 1709{
1606#if EV_MULTIPLICITY 1710#if EV_MULTIPLICITY
1607 struct ev_loop *loop = ev_default_loop_ptr; 1711 struct ev_loop *loop = ev_default_loop_ptr;
1608#endif 1712#endif
1609 1713
1610 if (backend)
1611 postfork = 1; /* must be in line with ev_loop_fork */ 1714 postfork = 1; /* must be in line with ev_loop_fork */
1612} 1715}
1613 1716
1614/*****************************************************************************/ 1717/*****************************************************************************/
1615 1718
1616void 1719void
… …
1629 { 1732 {
1630 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1631 1734
1632 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1633 { 1736 {
1634 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1635 1738
1636 p->w->pending = 0; 1739 p->w->pending = 0;
1637 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1638 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1639 } 1742 }
… …
1670 1773
1671 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1672 { 1775 {
1673 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1674 1777
1675 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1676 1779
1677 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1678 if (w->repeat) 1781 if (w->repeat)
1679 { 1782 {
1680 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1681 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1682 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1683 1786
1684 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.));
1685 1788
1686 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1687 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1688 } 1791 }
1689 else 1792 else
… …
1702 1805
1703 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1704 { 1807 {
1705 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1706 1809
1707 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1708 1811
1709 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1710 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1711 { 1814 {
1712 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1713 1816
1714 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));
1715 1818
1716 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1717 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1718 } 1821 }
1719 else if (w->interval) 1822 else if (w->interval)
… …
1847ev_unref (EV_P) 1950ev_unref (EV_P)
1848{ 1951{
1849 --activecnt; 1952 --activecnt;
1850} 1953}
1851 1954
1955void
1956ev_now_update (EV_P)
1957{
1958 time_update (EV_A_ 1e100);
1959}
1960
1852static int loop_done; 1961static int loop_done;
1853 1962
1854void 1963void
1855ev_loop (EV_P_ int flags) 1964ev_loop (EV_P_ int flags)
1856{ 1965{
… …
2064 int fd = w->fd; 2173 int fd = w->fd;
2065 2174
2066 if (expect_false (ev_is_active (w))) 2175 if (expect_false (ev_is_active (w)))
2067 return; 2176 return;
2068 2177
2069 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))));
2070 2180
2071 EV_FREQUENT_CHECK; 2181 EV_FREQUENT_CHECK;
2072 2182
2073 ev_start (EV_A_ (W)w, 1); 2183 ev_start (EV_A_ (W)w, 1);
2074 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2075 wlist_add (&anfds[fd].head, (WL)w); 2185 wlist_add (&anfds[fd].head, (WL)w);
2076 2186
2077 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2187 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2078 w->events &= ~EV_IOFDSET; 2188 w->events &= ~EV_IOFDSET;
2079 2189
… …
2085{ 2195{
2086 clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2087 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2088 return; 2198 return;
2089 2199
2090 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));
2091 2201
2092 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2093 2203
2094 wlist_del (&anfds[w->fd].head, (WL)w); 2204 wlist_del (&anfds[w->fd].head, (WL)w);
2095 ev_stop (EV_A_ (W)w); 2205 ev_stop (EV_A_ (W)w);
… …
2105 if (expect_false (ev_is_active (w))) 2215 if (expect_false (ev_is_active (w)))
2106 return; 2216 return;
2107 2217
2108 ev_at (w) += mn_now; 2218 ev_at (w) += mn_now;
2109 2219
2110 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.));
2111 2221
2112 EV_FREQUENT_CHECK; 2222 EV_FREQUENT_CHECK;
2113 2223
2114 ++timercnt; 2224 ++timercnt;
2115 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2225 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2118 ANHE_at_cache (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2119 upheap (timers, ev_active (w)); 2229 upheap (timers, ev_active (w));
2120 2230
2121 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2122 2232
2123 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2233 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2124} 2234}
2125 2235
2126void noinline 2236void noinline
2127ev_timer_stop (EV_P_ ev_timer *w) 2237ev_timer_stop (EV_P_ ev_timer *w)
2128{ 2238{
… …
2133 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2134 2244
2135 { 2245 {
2136 int active = ev_active (w); 2246 int active = ev_active (w);
2137 2247
2138 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2248 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2139 2249
2140 --timercnt; 2250 --timercnt;
2141 2251
2142 if (expect_true (active < timercnt + HEAP0)) 2252 if (expect_true (active < timercnt + HEAP0))
2143 { 2253 {
… …
2187 2297
2188 if (w->reschedule_cb) 2298 if (w->reschedule_cb)
2189 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2190 else if (w->interval) 2300 else if (w->interval)
2191 { 2301 {
2192 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.));
2193 /* 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 */
2194 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;
2195 } 2305 }
2196 else 2306 else
2197 ev_at (w) = w->offset; 2307 ev_at (w) = w->offset;
… …
2205 ANHE_at_cache (periodics [ev_active (w)]); 2315 ANHE_at_cache (periodics [ev_active (w)]);
2206 upheap (periodics, ev_active (w)); 2316 upheap (periodics, ev_active (w));
2207 2317
2208 EV_FREQUENT_CHECK; 2318 EV_FREQUENT_CHECK;
2209 2319
2210 /*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));*/
2211} 2321}
2212 2322
2213void noinline 2323void noinline
2214ev_periodic_stop (EV_P_ ev_periodic *w) 2324ev_periodic_stop (EV_P_ ev_periodic *w)
2215{ 2325{
… …
2220 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2221 2331
2222 { 2332 {
2223 int active = ev_active (w); 2333 int active = ev_active (w);
2224 2334
2225 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2335 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2226 2336
2227 --periodiccnt; 2337 --periodiccnt;
2228 2338
2229 if (expect_true (active < periodiccnt + HEAP0)) 2339 if (expect_true (active < periodiccnt + HEAP0))
2230 { 2340 {
… …
2253 2363
2254void noinline 2364void noinline
2255ev_signal_start (EV_P_ ev_signal *w) 2365ev_signal_start (EV_P_ ev_signal *w)
2256{ 2366{
2257#if EV_MULTIPLICITY 2367#if EV_MULTIPLICITY
2258 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));
2259#endif 2369#endif
2260 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2261 return; 2371 return;
2262 2372
2263 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));
2264 2374
2265 evpipe_init (EV_A); 2375 evpipe_init (EV_A);
2266 2376
2267 EV_FREQUENT_CHECK; 2377 EV_FREQUENT_CHECK;
2268 2378
… …
2271 sigset_t full, prev; 2381 sigset_t full, prev;
2272 sigfillset (&full); 2382 sigfillset (&full);
2273 sigprocmask (SIG_SETMASK, &full, &prev); 2383 sigprocmask (SIG_SETMASK, &full, &prev);
2274#endif 2384#endif
2275 2385
2276 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2386 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2277 2387
2278#ifndef _WIN32 2388#ifndef _WIN32
2279 sigprocmask (SIG_SETMASK, &prev, 0); 2389 sigprocmask (SIG_SETMASK, &prev, 0);
2280#endif 2390#endif
2281 } 2391 }
… …
2319 2429
2320void 2430void
2321ev_child_start (EV_P_ ev_child *w) 2431ev_child_start (EV_P_ ev_child *w)
2322{ 2432{
2323#if EV_MULTIPLICITY 2433#if EV_MULTIPLICITY
2324 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));
2325#endif 2435#endif
2326 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
2327 return; 2437 return;
2328 2438
2329 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
… …
2354# ifdef _WIN32 2464# ifdef _WIN32
2355# undef lstat 2465# undef lstat
2356# define lstat(a,b) _stati64 (a,b) 2466# define lstat(a,b) _stati64 (a,b)
2357# endif 2467# endif
2358 2468
2359#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 */
2360#define MIN_STAT_INTERVAL 0.1074891 2471#define MIN_STAT_INTERVAL 0.1074891
2361 2472
2362static 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);
2363 2474
2364#if EV_USE_INOTIFY 2475#if EV_USE_INOTIFY
2365# define EV_INOTIFY_BUFSIZE 8192 2476# define EV_INOTIFY_BUFSIZE 8192
… …
2369{ 2480{
2370 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);
2371 2482
2372 if (w->wd < 0) 2483 if (w->wd < 0)
2373 { 2484 {
2485 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2374 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 */
2375 2487
2376 /* monitor some parent directory for speedup hints */ 2488 /* monitor some parent directory for speedup hints */
2377 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2489 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2378 /* but an efficiency issue only */ 2490 /* but an efficiency issue only */
2379 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2491 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2380 { 2492 {
2381 char path [4096]; 2493 char path [4096];
2382 strcpy (path, w->path); 2494 strcpy (path, w->path);
… …
2386 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2498 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2387 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2499 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2388 2500
2389 char *pend = strrchr (path, '/'); 2501 char *pend = strrchr (path, '/');
2390 2502
2391 if (!pend) 2503 if (!pend || pend == path)
2392 break; /* whoops, no '/', complain to your admin */ 2504 break;
2393 2505
2394 *pend = 0; 2506 *pend = 0;
2395 w->wd = inotify_add_watch (fs_fd, path, mask); 2507 w->wd = inotify_add_watch (fs_fd, path, mask);
2396 } 2508 }
2397 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2509 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2398 } 2510 }
2399 } 2511 }
2400 else
2401 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2402 2512
2403 if (w->wd >= 0) 2513 if (w->wd >= 0)
2514 {
2404 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 }
2405} 2534}
2406 2535
2407static void noinline 2536static void noinline
2408infy_del (EV_P_ ev_stat *w) 2537infy_del (EV_P_ ev_stat *w)
2409{ 2538{
… …
2423 2552
2424static void noinline 2553static void noinline
2425infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2554infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2426{ 2555{
2427 if (slot < 0) 2556 if (slot < 0)
2428 /* overflow, need to check for all hahs slots */ 2557 /* overflow, need to check for all hash slots */
2429 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2558 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2430 infy_wd (EV_A_ slot, wd, ev); 2559 infy_wd (EV_A_ slot, wd, ev);
2431 else 2560 else
2432 { 2561 {
2433 WL w_; 2562 WL w_;
… …
2439 2568
2440 if (w->wd == wd || wd == -1) 2569 if (w->wd == wd || wd == -1)
2441 { 2570 {
2442 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2571 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2443 { 2572 {
2573 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2444 w->wd = -1; 2574 w->wd = -1;
2445 infy_add (EV_A_ w); /* re-add, no matter what */ 2575 infy_add (EV_A_ w); /* re-add, no matter what */
2446 } 2576 }
2447 2577
2448 stat_timer_cb (EV_A_ &w->timer, 0); 2578 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2462 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)
2463 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2593 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2464} 2594}
2465 2595
2466void 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
2467infy_init (EV_P) 2620infy_init (EV_P)
2468{ 2621{
2469 if (fs_fd != -2) 2622 if (fs_fd != -2)
2470 return; 2623 return;
2624
2625 fs_fd = -1;
2626
2627 check_2625 (EV_A);
2471 2628
2472 fs_fd = inotify_init (); 2629 fs_fd = inotify_init ();
2473 2630
2474 if (fs_fd >= 0) 2631 if (fs_fd >= 0)
2475 { 2632 {
… …
2503 w->wd = -1; 2660 w->wd = -1;
2504 2661
2505 if (fs_fd >= 0) 2662 if (fs_fd >= 0)
2506 infy_add (EV_A_ w); /* re-add, no matter what */ 2663 infy_add (EV_A_ w); /* re-add, no matter what */
2507 else 2664 else
2508 ev_timer_start (EV_A_ &w->timer); 2665 ev_timer_again (EV_A_ &w->timer);
2509 } 2666 }
2510
2511 } 2667 }
2512} 2668}
2513 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)
2514#endif 2676#endif
2515 2677
2516void 2678void
2517ev_stat_stat (EV_P_ ev_stat *w) 2679ev_stat_stat (EV_P_ ev_stat *w)
2518{ 2680{
… …
2545 || w->prev.st_atime != w->attr.st_atime 2707 || w->prev.st_atime != w->attr.st_atime
2546 || w->prev.st_mtime != w->attr.st_mtime 2708 || w->prev.st_mtime != w->attr.st_mtime
2547 || w->prev.st_ctime != w->attr.st_ctime 2709 || w->prev.st_ctime != w->attr.st_ctime
2548 ) { 2710 ) {
2549 #if EV_USE_INOTIFY 2711 #if EV_USE_INOTIFY
2712 if (fs_fd >= 0)
2713 {
2550 infy_del (EV_A_ w); 2714 infy_del (EV_A_ w);
2551 infy_add (EV_A_ w); 2715 infy_add (EV_A_ w);
2552 ev_stat_stat (EV_A_ w); /* avoid race... */ 2716 ev_stat_stat (EV_A_ w); /* avoid race... */
2717 }
2553 #endif 2718 #endif
2554 2719
2555 ev_feed_event (EV_A_ w, EV_STAT); 2720 ev_feed_event (EV_A_ w, EV_STAT);
2556 } 2721 }
2557} 2722}
… …
2560ev_stat_start (EV_P_ ev_stat *w) 2725ev_stat_start (EV_P_ ev_stat *w)
2561{ 2726{
2562 if (expect_false (ev_is_active (w))) 2727 if (expect_false (ev_is_active (w)))
2563 return; 2728 return;
2564 2729
2565 /* since we use memcmp, we need to clear any padding data etc. */
2566 memset (&w->prev, 0, sizeof (ev_statdata));
2567 memset (&w->attr, 0, sizeof (ev_statdata));
2568
2569 ev_stat_stat (EV_A_ w); 2730 ev_stat_stat (EV_A_ w);
2570 2731
2732 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2571 if (w->interval < MIN_STAT_INTERVAL) 2733 w->interval = MIN_STAT_INTERVAL;
2572 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2573 2734
2574 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);
2575 ev_set_priority (&w->timer, ev_priority (w)); 2736 ev_set_priority (&w->timer, ev_priority (w));
2576 2737
2577#if EV_USE_INOTIFY 2738#if EV_USE_INOTIFY
2578 infy_init (EV_A); 2739 infy_init (EV_A);
2579 2740
2580 if (fs_fd >= 0) 2741 if (fs_fd >= 0)
2581 infy_add (EV_A_ w); 2742 infy_add (EV_A_ w);
2582 else 2743 else
2583#endif 2744#endif
2584 ev_timer_start (EV_A_ &w->timer); 2745 ev_timer_again (EV_A_ &w->timer);
2585 2746
2586 ev_start (EV_A_ (W)w, 1); 2747 ev_start (EV_A_ (W)w, 1);
2587 2748
2588 EV_FREQUENT_CHECK; 2749 EV_FREQUENT_CHECK;
2589} 2750}
… …
2759 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2920 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2760 } 2921 }
2761 } 2922 }
2762} 2923}
2763 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
2764#if 0 2942#if 0
2765static void 2943static void
2766embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2944embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2767{ 2945{
2768 ev_idle_stop (EV_A_ idle); 2946 ev_idle_stop (EV_A_ idle);
… …
2775 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2776 return; 2954 return;
2777 2955
2778 { 2956 {
2779 struct ev_loop *loop = w->other; 2957 struct ev_loop *loop = w->other;
2780 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 ()));
2781 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);
2782 } 2960 }
2783 2961
2784 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2785 2963
… …
2788 2966
2789 ev_prepare_init (&w->prepare, embed_prepare_cb); 2967 ev_prepare_init (&w->prepare, embed_prepare_cb);
2790 ev_set_priority (&w->prepare, EV_MINPRI); 2968 ev_set_priority (&w->prepare, EV_MINPRI);
2791 ev_prepare_start (EV_A_ &w->prepare); 2969 ev_prepare_start (EV_A_ &w->prepare);
2792 2970
2971 ev_fork_init (&w->fork, embed_fork_cb);
2972 ev_fork_start (EV_A_ &w->fork);
2973
2793 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2974 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2794 2975
2795 ev_start (EV_A_ (W)w, 1); 2976 ev_start (EV_A_ (W)w, 1);
2796 2977
2797 EV_FREQUENT_CHECK; 2978 EV_FREQUENT_CHECK;
… …
2804 if (expect_false (!ev_is_active (w))) 2985 if (expect_false (!ev_is_active (w)))
2805 return; 2986 return;
2806 2987
2807 EV_FREQUENT_CHECK; 2988 EV_FREQUENT_CHECK;
2808 2989
2809 ev_io_stop (EV_A_ &w->io); 2990 ev_io_stop (EV_A_ &w->io);
2810 ev_prepare_stop (EV_A_ &w->prepare); 2991 ev_prepare_stop (EV_A_ &w->prepare);
2811 2992 ev_fork_stop (EV_A_ &w->fork);
2812 ev_stop (EV_A_ (W)w);
2813 2993
2814 EV_FREQUENT_CHECK; 2994 EV_FREQUENT_CHECK;
2815} 2995}
2816#endif 2996#endif
2817 2997
… …
2914once_cb (EV_P_ struct ev_once *once, int revents) 3094once_cb (EV_P_ struct ev_once *once, int revents)
2915{ 3095{
2916 void (*cb)(int revents, void *arg) = once->cb; 3096 void (*cb)(int revents, void *arg) = once->cb;
2917 void *arg = once->arg; 3097 void *arg = once->arg;
2918 3098
2919 ev_io_stop (EV_A_ &once->io); 3099 ev_io_stop (EV_A_ &once->io);
2920 ev_timer_stop (EV_A_ &once->to); 3100 ev_timer_stop (EV_A_ &once->to);
2921 ev_free (once); 3101 ev_free (once);
2922 3102
2923 cb (revents, arg); 3103 cb (revents, arg);
2924} 3104}
2925 3105
2926static void 3106static void
2927once_cb_io (EV_P_ ev_io *w, int revents) 3107once_cb_io (EV_P_ ev_io *w, int revents)
2928{ 3108{
2929 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));
2930} 3112}
2931 3113
2932static void 3114static void
2933once_cb_to (EV_P_ ev_timer *w, int revents) 3115once_cb_to (EV_P_ ev_timer *w, int revents)
2934{ 3116{
2935 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));
2936} 3120}
2937 3121
2938void 3122void
2939ev_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)
2940{ 3124{

Diff Legend

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