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.268 by root, Mon Oct 27 13:39:18 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
… …
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 egen; /* generation counter to counter epoll bugs */
439#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 457 SOCKET handle;
441#endif 458#endif
442} ANFD; 459} ANFD;
443 460
… …
556 struct timeval tv; 573 struct timeval tv;
557 574
558 tv.tv_sec = (time_t)delay; 575 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 576 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 577
578 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
579 /* somehting nto guaranteed by newer posix versions, but guaranteed */
580 /* by older ones */
561 select (0, 0, 0, 0, &tv); 581 select (0, 0, 0, 0, &tv);
562#endif 582#endif
563 } 583 }
564} 584}
565 585
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 612array_realloc (int elem, void *base, int *cur, int cnt)
593{ 613{
594 *cur = array_nextsize (elem, *cur, cnt); 614 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 615 return ev_realloc (base, elem * *cur);
596} 616}
617
618#define array_init_zero(base,count) \
619 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 620
598#define array_needsize(type,base,cur,cnt,init) \ 621#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 622 if (expect_false ((cnt) > (cur))) \
600 { \ 623 { \
601 int ocur_ = (cur); \ 624 int ocur_ = (cur); \
… …
645 ev_feed_event (EV_A_ events [i], type); 668 ev_feed_event (EV_A_ events [i], type);
646} 669}
647 670
648/*****************************************************************************/ 671/*****************************************************************************/
649 672
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 673void inline_speed
664fd_event (EV_P_ int fd, int revents) 674fd_event (EV_P_ int fd, int revents)
665{ 675{
666 ANFD *anfd = anfds + fd; 676 ANFD *anfd = anfds + fd;
667 ev_io *w; 677 ev_io *w;
… …
699 events |= (unsigned char)w->events; 709 events |= (unsigned char)w->events;
700 710
701#if EV_SELECT_IS_WINSOCKET 711#if EV_SELECT_IS_WINSOCKET
702 if (events) 712 if (events)
703 { 713 {
704 unsigned long argp; 714 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 715 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 717 #else
708 anfd->handle = _get_osfhandle (fd); 718 anfd->handle = _get_osfhandle (fd);
709 #endif 719 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 720 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 721 }
712#endif 722#endif
713 723
714 { 724 {
715 unsigned char o_events = anfd->events; 725 unsigned char o_events = anfd->events;
… …
768{ 778{
769 int fd; 779 int fd;
770 780
771 for (fd = 0; fd < anfdmax; ++fd) 781 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 782 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 783 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 784 fd_kill (EV_A_ fd);
775} 785}
776 786
777/* called on ENOMEM in select/poll to kill some fds and retry */ 787/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 788static void noinline
… …
796 806
797 for (fd = 0; fd < anfdmax; ++fd) 807 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 808 if (anfds [fd].events)
799 { 809 {
800 anfds [fd].events = 0; 810 anfds [fd].events = 0;
811 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 812 fd_change (EV_A_ fd, EV_IOFDSET | 1);
802 } 813 }
803} 814}
804 815
805/*****************************************************************************/ 816/*****************************************************************************/
… …
937/* rebuild the heap: this function is used only once and executed rarely */ 948/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 949void inline_size
939reheap (ANHE *heap, int N) 950reheap (ANHE *heap, int N)
940{ 951{
941 int i; 952 int i;
953
942 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 954 /* 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 */ 955 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
944 for (i = 0; i < N; ++i) 956 for (i = 0; i < N; ++i)
945 upheap (heap, i + HEAP0); 957 upheap (heap, i + HEAP0);
946} 958}
947 959
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/*****************************************************************************/ 960/*****************************************************************************/
964 961
965typedef struct 962typedef struct
966{ 963{
967 WL head; 964 WL head;
… …
971static ANSIG *signals; 968static ANSIG *signals;
972static int signalmax; 969static int signalmax;
973 970
974static EV_ATOMIC_T gotsig; 971static EV_ATOMIC_T gotsig;
975 972
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/*****************************************************************************/ 973/*****************************************************************************/
989 974
990void inline_speed 975void inline_speed
991fd_intern (int fd) 976fd_intern (int fd)
992{ 977{
993#ifdef _WIN32 978#ifdef _WIN32
994 int arg = 1; 979 unsigned long arg = 1;
995 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 980 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
996#else 981#else
997 fcntl (fd, F_SETFD, FD_CLOEXEC); 982 fcntl (fd, F_SETFD, FD_CLOEXEC);
998 fcntl (fd, F_SETFL, O_NONBLOCK); 983 fcntl (fd, F_SETFL, O_NONBLOCK);
999#endif 984#endif
… …
1513{ 1498{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1499 postfork = 1; /* must be in line with ev_default_fork */
1515} 1500}
1516 1501
1517#if EV_VERIFY 1502#if EV_VERIFY
1518static void 1503static void noinline
1504verify_watcher (EV_P_ W w)
1505{
1506 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1507
1508 if (w->pending)
1509 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1510}
1511
1512static void noinline
1513verify_heap (EV_P_ ANHE *heap, int N)
1514{
1515 int i;
1516
1517 for (i = HEAP0; i < N + HEAP0; ++i)
1518 {
1519 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1520 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1521 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1522
1523 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1524 }
1525}
1526
1527static void noinline
1519array_check (W **ws, int cnt) 1528array_verify (EV_P_ W *ws, int cnt)
1520{ 1529{
1521 while (cnt--) 1530 while (cnt--)
1531 {
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1532 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1533 verify_watcher (EV_A_ ws [cnt]);
1534 }
1523} 1535}
1524#endif 1536#endif
1525 1537
1526void 1538void
1527ev_loop_verify (EV_P) 1539ev_loop_verify (EV_P)
1528{ 1540{
1529#if EV_VERIFY 1541#if EV_VERIFY
1530 int i; 1542 int i;
1543 WL w;
1531 1544
1545 assert (activecnt >= -1);
1546
1547 assert (fdchangemax >= fdchangecnt);
1548 for (i = 0; i < fdchangecnt; ++i)
1549 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1550
1551 assert (anfdmax >= 0);
1552 for (i = 0; i < anfdmax; ++i)
1553 for (w = anfds [i].head; w; w = w->next)
1554 {
1555 verify_watcher (EV_A_ (W)w);
1556 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1557 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1558 }
1559
1560 assert (timermax >= timercnt);
1532 checkheap (timers, timercnt); 1561 verify_heap (EV_A_ timers, timercnt);
1562
1533#if EV_PERIODIC_ENABLE 1563#if EV_PERIODIC_ENABLE
1564 assert (periodicmax >= periodiccnt);
1534 checkheap (periodics, periodiccnt); 1565 verify_heap (EV_A_ periodics, periodiccnt);
1535#endif 1566#endif
1536 1567
1568 for (i = NUMPRI; i--; )
1569 {
1570 assert (pendingmax [i] >= pendingcnt [i]);
1537#if EV_IDLE_ENABLE 1571#if EV_IDLE_ENABLE
1538 for (i = NUMPRI; i--; ) 1572 assert (idleall >= 0);
1573 assert (idlemax [i] >= idlecnt [i]);
1539 array_check ((W **)idles [i], idlecnt [i]); 1574 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1540#endif 1575#endif
1576 }
1577
1541#if EV_FORK_ENABLE 1578#if EV_FORK_ENABLE
1579 assert (forkmax >= forkcnt);
1542 array_check ((W **)forks, forkcnt); 1580 array_verify (EV_A_ (W *)forks, forkcnt);
1543#endif 1581#endif
1582
1544#if EV_ASYNC_ENABLE 1583#if EV_ASYNC_ENABLE
1584 assert (asyncmax >= asynccnt);
1545 array_check ((W **)asyncs, asynccnt); 1585 array_verify (EV_A_ (W *)asyncs, asynccnt);
1586#endif
1587
1588 assert (preparemax >= preparecnt);
1589 array_verify (EV_A_ (W *)prepares, preparecnt);
1590
1591 assert (checkmax >= checkcnt);
1592 array_verify (EV_A_ (W *)checks, checkcnt);
1593
1594# if 0
1595 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1596 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1546#endif 1597# endif
1547 array_check ((W **)prepares, preparecnt);
1548 array_check ((W **)checks, checkcnt);
1549#endif 1598#endif
1550} 1599}
1551 1600
1552#endif /* multiplicity */ 1601#endif /* multiplicity */
1553 1602
… …
1589ev_default_destroy (void) 1638ev_default_destroy (void)
1590{ 1639{
1591#if EV_MULTIPLICITY 1640#if EV_MULTIPLICITY
1592 struct ev_loop *loop = ev_default_loop_ptr; 1641 struct ev_loop *loop = ev_default_loop_ptr;
1593#endif 1642#endif
1643
1644 ev_default_loop_ptr = 0;
1594 1645
1595#ifndef _WIN32 1646#ifndef _WIN32
1596 ev_ref (EV_A); /* child watcher */ 1647 ev_ref (EV_A); /* child watcher */
1597 ev_signal_stop (EV_A_ &childev); 1648 ev_signal_stop (EV_A_ &childev);
1598#endif 1649#endif
… …
1847ev_unref (EV_P) 1898ev_unref (EV_P)
1848{ 1899{
1849 --activecnt; 1900 --activecnt;
1850} 1901}
1851 1902
1903void
1904ev_now_update (EV_P)
1905{
1906 time_update (EV_A_ 1e100);
1907}
1908
1852static int loop_done; 1909static int loop_done;
1853 1910
1854void 1911void
1855ev_loop (EV_P_ int flags) 1912ev_loop (EV_P_ int flags)
1856{ 1913{
… …
2065 2122
2066 if (expect_false (ev_is_active (w))) 2123 if (expect_false (ev_is_active (w)))
2067 return; 2124 return;
2068 2125
2069 assert (("ev_io_start called with negative fd", fd >= 0)); 2126 assert (("ev_io_start called with negative fd", fd >= 0));
2127 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2070 2128
2071 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
2072 2130
2073 ev_start (EV_A_ (W)w, 1); 2131 ev_start (EV_A_ (W)w, 1);
2074 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2075 wlist_add (&anfds[fd].head, (WL)w); 2133 wlist_add (&anfds[fd].head, (WL)w);
2076 2134
2077 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2078 w->events &= ~EV_IOFDSET; 2136 w->events &= ~EV_IOFDSET;
2079 2137
… …
2271 sigset_t full, prev; 2329 sigset_t full, prev;
2272 sigfillset (&full); 2330 sigfillset (&full);
2273 sigprocmask (SIG_SETMASK, &full, &prev); 2331 sigprocmask (SIG_SETMASK, &full, &prev);
2274#endif 2332#endif
2275 2333
2276 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2334 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2277 2335
2278#ifndef _WIN32 2336#ifndef _WIN32
2279 sigprocmask (SIG_SETMASK, &prev, 0); 2337 sigprocmask (SIG_SETMASK, &prev, 0);
2280#endif 2338#endif
2281 } 2339 }
… …
2423 2481
2424static void noinline 2482static void noinline
2425infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2426{ 2484{
2427 if (slot < 0) 2485 if (slot < 0)
2428 /* overflow, need to check for all hahs slots */ 2486 /* overflow, need to check for all hash slots */
2429 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2430 infy_wd (EV_A_ slot, wd, ev); 2488 infy_wd (EV_A_ slot, wd, ev);
2431 else 2489 else
2432 { 2490 {
2433 WL w_; 2491 WL w_;
… …
2467infy_init (EV_P) 2525infy_init (EV_P)
2468{ 2526{
2469 if (fs_fd != -2) 2527 if (fs_fd != -2)
2470 return; 2528 return;
2471 2529
2530 /* kernels < 2.6.25 are borked
2531 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2532 */
2533 {
2534 struct utsname buf;
2535 int major, minor, micro;
2536
2537 fs_fd = -1;
2538
2539 if (uname (&buf))
2540 return;
2541
2542 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2543 return;
2544
2545 if (major < 2
2546 || (major == 2 && minor < 6)
2547 || (major == 2 && minor == 6 && micro < 25))
2548 return;
2549 }
2550
2472 fs_fd = inotify_init (); 2551 fs_fd = inotify_init ();
2473 2552
2474 if (fs_fd >= 0) 2553 if (fs_fd >= 0)
2475 { 2554 {
2476 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2555 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2505 if (fs_fd >= 0) 2584 if (fs_fd >= 0)
2506 infy_add (EV_A_ w); /* re-add, no matter what */ 2585 infy_add (EV_A_ w); /* re-add, no matter what */
2507 else 2586 else
2508 ev_timer_start (EV_A_ &w->timer); 2587 ev_timer_start (EV_A_ &w->timer);
2509 } 2588 }
2510
2511 } 2589 }
2512} 2590}
2513 2591
2592#endif
2593
2594#ifdef _WIN32
2595# define EV_LSTAT(p,b) _stati64 (p, b)
2596#else
2597# define EV_LSTAT(p,b) lstat (p, b)
2514#endif 2598#endif
2515 2599
2516void 2600void
2517ev_stat_stat (EV_P_ ev_stat *w) 2601ev_stat_stat (EV_P_ ev_stat *w)
2518{ 2602{
… …
2545 || w->prev.st_atime != w->attr.st_atime 2629 || w->prev.st_atime != w->attr.st_atime
2546 || w->prev.st_mtime != w->attr.st_mtime 2630 || w->prev.st_mtime != w->attr.st_mtime
2547 || w->prev.st_ctime != w->attr.st_ctime 2631 || w->prev.st_ctime != w->attr.st_ctime
2548 ) { 2632 ) {
2549 #if EV_USE_INOTIFY 2633 #if EV_USE_INOTIFY
2634 if (fs_fd >= 0)
2635 {
2550 infy_del (EV_A_ w); 2636 infy_del (EV_A_ w);
2551 infy_add (EV_A_ w); 2637 infy_add (EV_A_ w);
2552 ev_stat_stat (EV_A_ w); /* avoid race... */ 2638 ev_stat_stat (EV_A_ w); /* avoid race... */
2639 }
2553 #endif 2640 #endif
2554 2641
2555 ev_feed_event (EV_A_ w, EV_STAT); 2642 ev_feed_event (EV_A_ w, EV_STAT);
2556 } 2643 }
2557} 2644}
… …
2759 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2846 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2760 } 2847 }
2761 } 2848 }
2762} 2849}
2763 2850
2851static void
2852embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2853{
2854 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2855
2856 {
2857 struct ev_loop *loop = w->other;
2858
2859 ev_loop_fork (EV_A);
2860 }
2861}
2862
2764#if 0 2863#if 0
2765static void 2864static void
2766embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2865embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2767{ 2866{
2768 ev_idle_stop (EV_A_ idle); 2867 ev_idle_stop (EV_A_ idle);
… …
2788 2887
2789 ev_prepare_init (&w->prepare, embed_prepare_cb); 2888 ev_prepare_init (&w->prepare, embed_prepare_cb);
2790 ev_set_priority (&w->prepare, EV_MINPRI); 2889 ev_set_priority (&w->prepare, EV_MINPRI);
2791 ev_prepare_start (EV_A_ &w->prepare); 2890 ev_prepare_start (EV_A_ &w->prepare);
2792 2891
2892 ev_fork_init (&w->fork, embed_fork_cb);
2893 ev_fork_start (EV_A_ &w->fork);
2894
2793 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2895 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2794 2896
2795 ev_start (EV_A_ (W)w, 1); 2897 ev_start (EV_A_ (W)w, 1);
2796 2898
2797 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
… …
2804 if (expect_false (!ev_is_active (w))) 2906 if (expect_false (!ev_is_active (w)))
2805 return; 2907 return;
2806 2908
2807 EV_FREQUENT_CHECK; 2909 EV_FREQUENT_CHECK;
2808 2910
2809 ev_io_stop (EV_A_ &w->io); 2911 ev_io_stop (EV_A_ &w->io);
2810 ev_prepare_stop (EV_A_ &w->prepare); 2912 ev_prepare_stop (EV_A_ &w->prepare);
2811 2913 ev_fork_stop (EV_A_ &w->fork);
2812 ev_stop (EV_A_ (W)w);
2813 2914
2814 EV_FREQUENT_CHECK; 2915 EV_FREQUENT_CHECK;
2815} 2916}
2816#endif 2917#endif
2817 2918
… …
2914once_cb (EV_P_ struct ev_once *once, int revents) 3015once_cb (EV_P_ struct ev_once *once, int revents)
2915{ 3016{
2916 void (*cb)(int revents, void *arg) = once->cb; 3017 void (*cb)(int revents, void *arg) = once->cb;
2917 void *arg = once->arg; 3018 void *arg = once->arg;
2918 3019
2919 ev_io_stop (EV_A_ &once->io); 3020 ev_io_stop (EV_A_ &once->io);
2920 ev_timer_stop (EV_A_ &once->to); 3021 ev_timer_stop (EV_A_ &once->to);
2921 ev_free (once); 3022 ev_free (once);
2922 3023
2923 cb (revents, arg); 3024 cb (revents, arg);
2924} 3025}
2925 3026
2926static void 3027static void
2927once_cb_io (EV_P_ ev_io *w, int revents) 3028once_cb_io (EV_P_ ev_io *w, int revents)
2928{ 3029{
2929 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3030 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3031
3032 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2930} 3033}
2931 3034
2932static void 3035static void
2933once_cb_to (EV_P_ ev_timer *w, int revents) 3036once_cb_to (EV_P_ ev_timer *w, int revents)
2934{ 3037{
2935 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3038 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3039
3040 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2936} 3041}
2937 3042
2938void 3043void
2939ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3044ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2940{ 3045{

Diff Legend

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