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.272 by root, Mon Nov 3 12:17:40 2008 UTC

154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
277# include <sys/select.h> 286# include <sys/select.h>
278# endif 287# endif
279#endif 288#endif
280 289
281#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
282# include <sys/inotify.h> 292# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0
297# endif
283#endif 298#endif
284 299
285#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 301# include <winsock.h>
287#endif 302#endif
373{ 388{
374 syserr_cb = cb; 389 syserr_cb = cb;
375} 390}
376 391
377static void noinline 392static void noinline
378syserr (const char *msg) 393ev_syserr (const char *msg)
379{ 394{
380 if (!msg) 395 if (!msg)
381 msg = "(libev) system error"; 396 msg = "(libev) system error";
382 397
383 if (syserr_cb) 398 if (syserr_cb)
434typedef struct 449typedef struct
435{ 450{
436 WL head; 451 WL head;
437 unsigned char events; 452 unsigned char events;
438 unsigned char reify; 453 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused;
456#if EV_USE_EPOLL
457 unsigned int egen; /* generation counter to counter epoll bugs */
458#endif
439#if EV_SELECT_IS_WINSOCKET 459#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 460 SOCKET handle;
441#endif 461#endif
442} ANFD; 462} ANFD;
443 463
556 struct timeval tv; 576 struct timeval tv;
557 577
558 tv.tv_sec = (time_t)delay; 578 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 579 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 580
581 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
582 /* somehting nto guaranteed by newer posix versions, but guaranteed */
583 /* by older ones */
561 select (0, 0, 0, 0, &tv); 584 select (0, 0, 0, 0, &tv);
562#endif 585#endif
563 } 586 }
564} 587}
565 588
592array_realloc (int elem, void *base, int *cur, int cnt) 615array_realloc (int elem, void *base, int *cur, int cnt)
593{ 616{
594 *cur = array_nextsize (elem, *cur, cnt); 617 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 618 return ev_realloc (base, elem * *cur);
596} 619}
620
621#define array_init_zero(base,count) \
622 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 623
598#define array_needsize(type,base,cur,cnt,init) \ 624#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 625 if (expect_false ((cnt) > (cur))) \
600 { \ 626 { \
601 int ocur_ = (cur); \ 627 int ocur_ = (cur); \
645 ev_feed_event (EV_A_ events [i], type); 671 ev_feed_event (EV_A_ events [i], type);
646} 672}
647 673
648/*****************************************************************************/ 674/*****************************************************************************/
649 675
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 676void inline_speed
664fd_event (EV_P_ int fd, int revents) 677fd_event (EV_P_ int fd, int revents)
665{ 678{
666 ANFD *anfd = anfds + fd; 679 ANFD *anfd = anfds + fd;
667 ev_io *w; 680 ev_io *w;
699 events |= (unsigned char)w->events; 712 events |= (unsigned char)w->events;
700 713
701#if EV_SELECT_IS_WINSOCKET 714#if EV_SELECT_IS_WINSOCKET
702 if (events) 715 if (events)
703 { 716 {
704 unsigned long argp; 717 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 718 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 719 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 720 #else
708 anfd->handle = _get_osfhandle (fd); 721 anfd->handle = _get_osfhandle (fd);
709 #endif 722 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 723 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 724 }
712#endif 725#endif
713 726
714 { 727 {
715 unsigned char o_events = anfd->events; 728 unsigned char o_events = anfd->events;
768{ 781{
769 int fd; 782 int fd;
770 783
771 for (fd = 0; fd < anfdmax; ++fd) 784 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 785 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 786 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 787 fd_kill (EV_A_ fd);
775} 788}
776 789
777/* called on ENOMEM in select/poll to kill some fds and retry */ 790/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 791static void noinline
796 809
797 for (fd = 0; fd < anfdmax; ++fd) 810 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 811 if (anfds [fd].events)
799 { 812 {
800 anfds [fd].events = 0; 813 anfds [fd].events = 0;
814 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 815 fd_change (EV_A_ fd, EV_IOFDSET | 1);
802 } 816 }
803} 817}
804 818
805/*****************************************************************************/ 819/*****************************************************************************/
937/* rebuild the heap: this function is used only once and executed rarely */ 951/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 952void inline_size
939reheap (ANHE *heap, int N) 953reheap (ANHE *heap, int N)
940{ 954{
941 int i; 955 int i;
956
942 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 957 /* 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 */ 958 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
944 for (i = 0; i < N; ++i) 959 for (i = 0; i < N; ++i)
945 upheap (heap, i + HEAP0); 960 upheap (heap, i + HEAP0);
946} 961}
947 962
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/*****************************************************************************/ 963/*****************************************************************************/
964 964
965typedef struct 965typedef struct
966{ 966{
967 WL head; 967 WL head;
971static ANSIG *signals; 971static ANSIG *signals;
972static int signalmax; 972static int signalmax;
973 973
974static EV_ATOMIC_T gotsig; 974static EV_ATOMIC_T gotsig;
975 975
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/*****************************************************************************/ 976/*****************************************************************************/
989 977
990void inline_speed 978void inline_speed
991fd_intern (int fd) 979fd_intern (int fd)
992{ 980{
993#ifdef _WIN32 981#ifdef _WIN32
994 int arg = 1; 982 unsigned long arg = 1;
995 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 983 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
996#else 984#else
997 fcntl (fd, F_SETFD, FD_CLOEXEC); 985 fcntl (fd, F_SETFD, FD_CLOEXEC);
998 fcntl (fd, F_SETFL, O_NONBLOCK); 986 fcntl (fd, F_SETFL, O_NONBLOCK);
999#endif 987#endif
1013 } 1001 }
1014 else 1002 else
1015#endif 1003#endif
1016 { 1004 {
1017 while (pipe (evpipe)) 1005 while (pipe (evpipe))
1018 syserr ("(libev) error creating signal/async pipe"); 1006 ev_syserr ("(libev) error creating signal/async pipe");
1019 1007
1020 fd_intern (evpipe [0]); 1008 fd_intern (evpipe [0]);
1021 fd_intern (evpipe [1]); 1009 fd_intern (evpipe [1]);
1022 ev_io_set (&pipeev, evpipe [0], EV_READ); 1010 ev_io_set (&pipeev, evpipe [0], EV_READ);
1023 } 1011 }
1513{ 1501{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1502 postfork = 1; /* must be in line with ev_default_fork */
1515} 1503}
1516 1504
1517#if EV_VERIFY 1505#if EV_VERIFY
1518static void 1506static void noinline
1507verify_watcher (EV_P_ W w)
1508{
1509 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1510
1511 if (w->pending)
1512 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1513}
1514
1515static void noinline
1516verify_heap (EV_P_ ANHE *heap, int N)
1517{
1518 int i;
1519
1520 for (i = HEAP0; i < N + HEAP0; ++i)
1521 {
1522 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1523 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1524 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1525
1526 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1527 }
1528}
1529
1530static void noinline
1519array_check (W **ws, int cnt) 1531array_verify (EV_P_ W *ws, int cnt)
1520{ 1532{
1521 while (cnt--) 1533 while (cnt--)
1534 {
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1535 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1536 verify_watcher (EV_A_ ws [cnt]);
1537 }
1523} 1538}
1524#endif 1539#endif
1525 1540
1526void 1541void
1527ev_loop_verify (EV_P) 1542ev_loop_verify (EV_P)
1528{ 1543{
1529#if EV_VERIFY 1544#if EV_VERIFY
1530 int i; 1545 int i;
1546 WL w;
1531 1547
1548 assert (activecnt >= -1);
1549
1550 assert (fdchangemax >= fdchangecnt);
1551 for (i = 0; i < fdchangecnt; ++i)
1552 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1553
1554 assert (anfdmax >= 0);
1555 for (i = 0; i < anfdmax; ++i)
1556 for (w = anfds [i].head; w; w = w->next)
1557 {
1558 verify_watcher (EV_A_ (W)w);
1559 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1560 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1561 }
1562
1563 assert (timermax >= timercnt);
1532 checkheap (timers, timercnt); 1564 verify_heap (EV_A_ timers, timercnt);
1565
1533#if EV_PERIODIC_ENABLE 1566#if EV_PERIODIC_ENABLE
1567 assert (periodicmax >= periodiccnt);
1534 checkheap (periodics, periodiccnt); 1568 verify_heap (EV_A_ periodics, periodiccnt);
1535#endif 1569#endif
1536 1570
1571 for (i = NUMPRI; i--; )
1572 {
1573 assert (pendingmax [i] >= pendingcnt [i]);
1537#if EV_IDLE_ENABLE 1574#if EV_IDLE_ENABLE
1538 for (i = NUMPRI; i--; ) 1575 assert (idleall >= 0);
1576 assert (idlemax [i] >= idlecnt [i]);
1539 array_check ((W **)idles [i], idlecnt [i]); 1577 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1540#endif 1578#endif
1579 }
1580
1541#if EV_FORK_ENABLE 1581#if EV_FORK_ENABLE
1582 assert (forkmax >= forkcnt);
1542 array_check ((W **)forks, forkcnt); 1583 array_verify (EV_A_ (W *)forks, forkcnt);
1543#endif 1584#endif
1585
1544#if EV_ASYNC_ENABLE 1586#if EV_ASYNC_ENABLE
1587 assert (asyncmax >= asynccnt);
1545 array_check ((W **)asyncs, asynccnt); 1588 array_verify (EV_A_ (W *)asyncs, asynccnt);
1589#endif
1590
1591 assert (preparemax >= preparecnt);
1592 array_verify (EV_A_ (W *)prepares, preparecnt);
1593
1594 assert (checkmax >= checkcnt);
1595 array_verify (EV_A_ (W *)checks, checkcnt);
1596
1597# if 0
1598 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1599 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1546#endif 1600# endif
1547 array_check ((W **)prepares, preparecnt);
1548 array_check ((W **)checks, checkcnt);
1549#endif 1601#endif
1550} 1602}
1551 1603
1552#endif /* multiplicity */ 1604#endif /* multiplicity */
1553 1605
1590{ 1642{
1591#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1592 struct ev_loop *loop = ev_default_loop_ptr; 1644 struct ev_loop *loop = ev_default_loop_ptr;
1593#endif 1645#endif
1594 1646
1647 ev_default_loop_ptr = 0;
1648
1595#ifndef _WIN32 1649#ifndef _WIN32
1596 ev_ref (EV_A); /* child watcher */ 1650 ev_ref (EV_A); /* child watcher */
1597 ev_signal_stop (EV_A_ &childev); 1651 ev_signal_stop (EV_A_ &childev);
1598#endif 1652#endif
1599 1653
1605{ 1659{
1606#if EV_MULTIPLICITY 1660#if EV_MULTIPLICITY
1607 struct ev_loop *loop = ev_default_loop_ptr; 1661 struct ev_loop *loop = ev_default_loop_ptr;
1608#endif 1662#endif
1609 1663
1610 if (backend)
1611 postfork = 1; /* must be in line with ev_loop_fork */ 1664 postfork = 1; /* must be in line with ev_loop_fork */
1612} 1665}
1613 1666
1614/*****************************************************************************/ 1667/*****************************************************************************/
1615 1668
1616void 1669void
1847ev_unref (EV_P) 1900ev_unref (EV_P)
1848{ 1901{
1849 --activecnt; 1902 --activecnt;
1850} 1903}
1851 1904
1905void
1906ev_now_update (EV_P)
1907{
1908 time_update (EV_A_ 1e100);
1909}
1910
1852static int loop_done; 1911static int loop_done;
1853 1912
1854void 1913void
1855ev_loop (EV_P_ int flags) 1914ev_loop (EV_P_ int flags)
1856{ 1915{
2065 2124
2066 if (expect_false (ev_is_active (w))) 2125 if (expect_false (ev_is_active (w)))
2067 return; 2126 return;
2068 2127
2069 assert (("ev_io_start called with negative fd", fd >= 0)); 2128 assert (("ev_io_start called with negative fd", fd >= 0));
2129 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2070 2130
2071 EV_FREQUENT_CHECK; 2131 EV_FREQUENT_CHECK;
2072 2132
2073 ev_start (EV_A_ (W)w, 1); 2133 ev_start (EV_A_ (W)w, 1);
2074 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2134 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2075 wlist_add (&anfds[fd].head, (WL)w); 2135 wlist_add (&anfds[fd].head, (WL)w);
2076 2136
2077 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2137 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2078 w->events &= ~EV_IOFDSET; 2138 w->events &= ~EV_IOFDSET;
2079 2139
2271 sigset_t full, prev; 2331 sigset_t full, prev;
2272 sigfillset (&full); 2332 sigfillset (&full);
2273 sigprocmask (SIG_SETMASK, &full, &prev); 2333 sigprocmask (SIG_SETMASK, &full, &prev);
2274#endif 2334#endif
2275 2335
2276 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2336 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2277 2337
2278#ifndef _WIN32 2338#ifndef _WIN32
2279 sigprocmask (SIG_SETMASK, &prev, 0); 2339 sigprocmask (SIG_SETMASK, &prev, 0);
2280#endif 2340#endif
2281 } 2341 }
2372 if (w->wd < 0) 2432 if (w->wd < 0)
2373 { 2433 {
2374 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2434 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2375 2435
2376 /* monitor some parent directory for speedup hints */ 2436 /* monitor some parent directory for speedup hints */
2377 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2437 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2378 /* but an efficiency issue only */ 2438 /* but an efficiency issue only */
2379 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2439 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2380 { 2440 {
2381 char path [4096]; 2441 char path [4096];
2382 strcpy (path, w->path); 2442 strcpy (path, w->path);
2423 2483
2424static void noinline 2484static void noinline
2425infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2485infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2426{ 2486{
2427 if (slot < 0) 2487 if (slot < 0)
2428 /* overflow, need to check for all hahs slots */ 2488 /* overflow, need to check for all hash slots */
2429 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2489 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2430 infy_wd (EV_A_ slot, wd, ev); 2490 infy_wd (EV_A_ slot, wd, ev);
2431 else 2491 else
2432 { 2492 {
2433 WL w_; 2493 WL w_;
2467infy_init (EV_P) 2527infy_init (EV_P)
2468{ 2528{
2469 if (fs_fd != -2) 2529 if (fs_fd != -2)
2470 return; 2530 return;
2471 2531
2532 /* kernels < 2.6.25 are borked
2533 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2534 */
2535 {
2536 struct utsname buf;
2537 int major, minor, micro;
2538
2539 fs_fd = -1;
2540
2541 if (uname (&buf))
2542 return;
2543
2544 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2545 return;
2546
2547 if (major < 2
2548 || (major == 2 && minor < 6)
2549 || (major == 2 && minor == 6 && micro < 25))
2550 return;
2551 }
2552
2472 fs_fd = inotify_init (); 2553 fs_fd = inotify_init ();
2473 2554
2474 if (fs_fd >= 0) 2555 if (fs_fd >= 0)
2475 { 2556 {
2476 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2557 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2505 if (fs_fd >= 0) 2586 if (fs_fd >= 0)
2506 infy_add (EV_A_ w); /* re-add, no matter what */ 2587 infy_add (EV_A_ w); /* re-add, no matter what */
2507 else 2588 else
2508 ev_timer_start (EV_A_ &w->timer); 2589 ev_timer_start (EV_A_ &w->timer);
2509 } 2590 }
2510
2511 } 2591 }
2512} 2592}
2513 2593
2594#endif
2595
2596#ifdef _WIN32
2597# define EV_LSTAT(p,b) _stati64 (p, b)
2598#else
2599# define EV_LSTAT(p,b) lstat (p, b)
2514#endif 2600#endif
2515 2601
2516void 2602void
2517ev_stat_stat (EV_P_ ev_stat *w) 2603ev_stat_stat (EV_P_ ev_stat *w)
2518{ 2604{
2545 || w->prev.st_atime != w->attr.st_atime 2631 || w->prev.st_atime != w->attr.st_atime
2546 || w->prev.st_mtime != w->attr.st_mtime 2632 || w->prev.st_mtime != w->attr.st_mtime
2547 || w->prev.st_ctime != w->attr.st_ctime 2633 || w->prev.st_ctime != w->attr.st_ctime
2548 ) { 2634 ) {
2549 #if EV_USE_INOTIFY 2635 #if EV_USE_INOTIFY
2636 if (fs_fd >= 0)
2637 {
2550 infy_del (EV_A_ w); 2638 infy_del (EV_A_ w);
2551 infy_add (EV_A_ w); 2639 infy_add (EV_A_ w);
2552 ev_stat_stat (EV_A_ w); /* avoid race... */ 2640 ev_stat_stat (EV_A_ w); /* avoid race... */
2641 }
2553 #endif 2642 #endif
2554 2643
2555 ev_feed_event (EV_A_ w, EV_STAT); 2644 ev_feed_event (EV_A_ w, EV_STAT);
2556 } 2645 }
2557} 2646}
2759 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2848 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2760 } 2849 }
2761 } 2850 }
2762} 2851}
2763 2852
2853static void
2854embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2855{
2856 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2857
2858 {
2859 struct ev_loop *loop = w->other;
2860
2861 ev_loop_fork (EV_A);
2862 }
2863}
2864
2764#if 0 2865#if 0
2765static void 2866static void
2766embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2867embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2767{ 2868{
2768 ev_idle_stop (EV_A_ idle); 2869 ev_idle_stop (EV_A_ idle);
2788 2889
2789 ev_prepare_init (&w->prepare, embed_prepare_cb); 2890 ev_prepare_init (&w->prepare, embed_prepare_cb);
2790 ev_set_priority (&w->prepare, EV_MINPRI); 2891 ev_set_priority (&w->prepare, EV_MINPRI);
2791 ev_prepare_start (EV_A_ &w->prepare); 2892 ev_prepare_start (EV_A_ &w->prepare);
2792 2893
2894 ev_fork_init (&w->fork, embed_fork_cb);
2895 ev_fork_start (EV_A_ &w->fork);
2896
2793 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2897 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2794 2898
2795 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2796 2900
2797 EV_FREQUENT_CHECK; 2901 EV_FREQUENT_CHECK;
2804 if (expect_false (!ev_is_active (w))) 2908 if (expect_false (!ev_is_active (w)))
2805 return; 2909 return;
2806 2910
2807 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2808 2912
2809 ev_io_stop (EV_A_ &w->io); 2913 ev_io_stop (EV_A_ &w->io);
2810 ev_prepare_stop (EV_A_ &w->prepare); 2914 ev_prepare_stop (EV_A_ &w->prepare);
2811 2915 ev_fork_stop (EV_A_ &w->fork);
2812 ev_stop (EV_A_ (W)w);
2813 2916
2814 EV_FREQUENT_CHECK; 2917 EV_FREQUENT_CHECK;
2815} 2918}
2816#endif 2919#endif
2817 2920
2914once_cb (EV_P_ struct ev_once *once, int revents) 3017once_cb (EV_P_ struct ev_once *once, int revents)
2915{ 3018{
2916 void (*cb)(int revents, void *arg) = once->cb; 3019 void (*cb)(int revents, void *arg) = once->cb;
2917 void *arg = once->arg; 3020 void *arg = once->arg;
2918 3021
2919 ev_io_stop (EV_A_ &once->io); 3022 ev_io_stop (EV_A_ &once->io);
2920 ev_timer_stop (EV_A_ &once->to); 3023 ev_timer_stop (EV_A_ &once->to);
2921 ev_free (once); 3024 ev_free (once);
2922 3025
2923 cb (revents, arg); 3026 cb (revents, arg);
2924} 3027}
2925 3028
2926static void 3029static void
2927once_cb_io (EV_P_ ev_io *w, int revents) 3030once_cb_io (EV_P_ ev_io *w, int revents)
2928{ 3031{
2929 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3032 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3033
3034 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2930} 3035}
2931 3036
2932static void 3037static void
2933once_cb_to (EV_P_ ev_timer *w, int revents) 3038once_cb_to (EV_P_ ev_timer *w, int revents)
2934{ 3039{
2935 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3040 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3041
3042 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2936} 3043}
2937 3044
2938void 3045void
2939ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3046ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2940{ 3047{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines