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

Diff Legend

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