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.265 by root, Thu Oct 23 04:56:49 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 unused; /* currently unused padding */
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
… …
937/* rebuild the heap: this function is used only once and executed rarely */ 947/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 948void inline_size
939reheap (ANHE *heap, int N) 949reheap (ANHE *heap, int N)
940{ 950{
941 int i; 951 int i;
952
942 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 953 /* 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 */ 954 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
944 for (i = 0; i < N; ++i) 955 for (i = 0; i < N; ++i)
945 upheap (heap, i + HEAP0); 956 upheap (heap, i + HEAP0);
946} 957}
947 958
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/*****************************************************************************/ 959/*****************************************************************************/
964 960
965typedef struct 961typedef struct
966{ 962{
967 WL head; 963 WL head;
… …
971static ANSIG *signals; 967static ANSIG *signals;
972static int signalmax; 968static int signalmax;
973 969
974static EV_ATOMIC_T gotsig; 970static EV_ATOMIC_T gotsig;
975 971
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/*****************************************************************************/ 972/*****************************************************************************/
989 973
990void inline_speed 974void inline_speed
991fd_intern (int fd) 975fd_intern (int fd)
992{ 976{
993#ifdef _WIN32 977#ifdef _WIN32
994 int arg = 1; 978 unsigned long arg = 1;
995 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 979 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
996#else 980#else
997 fcntl (fd, F_SETFD, FD_CLOEXEC); 981 fcntl (fd, F_SETFD, FD_CLOEXEC);
998 fcntl (fd, F_SETFL, O_NONBLOCK); 982 fcntl (fd, F_SETFL, O_NONBLOCK);
999#endif 983#endif
… …
1513{ 1497{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1498 postfork = 1; /* must be in line with ev_default_fork */
1515} 1499}
1516 1500
1517#if EV_VERIFY 1501#if EV_VERIFY
1518static void 1502static void noinline
1503verify_watcher (EV_P_ W w)
1504{
1505 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1506
1507 if (w->pending)
1508 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1509}
1510
1511static void noinline
1512verify_heap (EV_P_ ANHE *heap, int N)
1513{
1514 int i;
1515
1516 for (i = HEAP0; i < N + HEAP0; ++i)
1517 {
1518 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1519 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1520 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1521
1522 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1523 }
1524}
1525
1526static void noinline
1519array_check (W **ws, int cnt) 1527array_verify (EV_P_ W *ws, int cnt)
1520{ 1528{
1521 while (cnt--) 1529 while (cnt--)
1530 {
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1531 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1532 verify_watcher (EV_A_ ws [cnt]);
1533 }
1523} 1534}
1524#endif 1535#endif
1525 1536
1526void 1537void
1527ev_loop_verify (EV_P) 1538ev_loop_verify (EV_P)
1528{ 1539{
1529#if EV_VERIFY 1540#if EV_VERIFY
1530 int i; 1541 int i;
1542 WL w;
1531 1543
1544 assert (activecnt >= -1);
1545
1546 assert (fdchangemax >= fdchangecnt);
1547 for (i = 0; i < fdchangecnt; ++i)
1548 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1549
1550 assert (anfdmax >= 0);
1551 for (i = 0; i < anfdmax; ++i)
1552 for (w = anfds [i].head; w; w = w->next)
1553 {
1554 verify_watcher (EV_A_ (W)w);
1555 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1556 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1557 }
1558
1559 assert (timermax >= timercnt);
1532 checkheap (timers, timercnt); 1560 verify_heap (EV_A_ timers, timercnt);
1561
1533#if EV_PERIODIC_ENABLE 1562#if EV_PERIODIC_ENABLE
1563 assert (periodicmax >= periodiccnt);
1534 checkheap (periodics, periodiccnt); 1564 verify_heap (EV_A_ periodics, periodiccnt);
1535#endif 1565#endif
1536 1566
1567 for (i = NUMPRI; i--; )
1568 {
1569 assert (pendingmax [i] >= pendingcnt [i]);
1537#if EV_IDLE_ENABLE 1570#if EV_IDLE_ENABLE
1538 for (i = NUMPRI; i--; ) 1571 assert (idleall >= 0);
1572 assert (idlemax [i] >= idlecnt [i]);
1539 array_check ((W **)idles [i], idlecnt [i]); 1573 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1540#endif 1574#endif
1575 }
1576
1541#if EV_FORK_ENABLE 1577#if EV_FORK_ENABLE
1578 assert (forkmax >= forkcnt);
1542 array_check ((W **)forks, forkcnt); 1579 array_verify (EV_A_ (W *)forks, forkcnt);
1543#endif 1580#endif
1581
1544#if EV_ASYNC_ENABLE 1582#if EV_ASYNC_ENABLE
1583 assert (asyncmax >= asynccnt);
1545 array_check ((W **)asyncs, asynccnt); 1584 array_verify (EV_A_ (W *)asyncs, asynccnt);
1585#endif
1586
1587 assert (preparemax >= preparecnt);
1588 array_verify (EV_A_ (W *)prepares, preparecnt);
1589
1590 assert (checkmax >= checkcnt);
1591 array_verify (EV_A_ (W *)checks, checkcnt);
1592
1593# if 0
1594 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1595 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1546#endif 1596# endif
1547 array_check ((W **)prepares, preparecnt);
1548 array_check ((W **)checks, checkcnt);
1549#endif 1597#endif
1550} 1598}
1551 1599
1552#endif /* multiplicity */ 1600#endif /* multiplicity */
1553 1601
… …
1847ev_unref (EV_P) 1895ev_unref (EV_P)
1848{ 1896{
1849 --activecnt; 1897 --activecnt;
1850} 1898}
1851 1899
1900void
1901ev_now_update (EV_P)
1902{
1903 time_update (EV_A_ 1e100);
1904}
1905
1852static int loop_done; 1906static int loop_done;
1853 1907
1854void 1908void
1855ev_loop (EV_P_ int flags) 1909ev_loop (EV_P_ int flags)
1856{ 1910{
… …
2065 2119
2066 if (expect_false (ev_is_active (w))) 2120 if (expect_false (ev_is_active (w)))
2067 return; 2121 return;
2068 2122
2069 assert (("ev_io_start called with negative fd", fd >= 0)); 2123 assert (("ev_io_start called with negative fd", fd >= 0));
2124 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2070 2125
2071 EV_FREQUENT_CHECK; 2126 EV_FREQUENT_CHECK;
2072 2127
2073 ev_start (EV_A_ (W)w, 1); 2128 ev_start (EV_A_ (W)w, 1);
2074 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2129 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2075 wlist_add (&anfds[fd].head, (WL)w); 2130 wlist_add (&anfds[fd].head, (WL)w);
2076 2131
2077 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2132 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2078 w->events &= ~EV_IOFDSET; 2133 w->events &= ~EV_IOFDSET;
2079 2134
… …
2271 sigset_t full, prev; 2326 sigset_t full, prev;
2272 sigfillset (&full); 2327 sigfillset (&full);
2273 sigprocmask (SIG_SETMASK, &full, &prev); 2328 sigprocmask (SIG_SETMASK, &full, &prev);
2274#endif 2329#endif
2275 2330
2276 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2331 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2277 2332
2278#ifndef _WIN32 2333#ifndef _WIN32
2279 sigprocmask (SIG_SETMASK, &prev, 0); 2334 sigprocmask (SIG_SETMASK, &prev, 0);
2280#endif 2335#endif
2281 } 2336 }
… …
2423 2478
2424static void noinline 2479static void noinline
2425infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2480infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2426{ 2481{
2427 if (slot < 0) 2482 if (slot < 0)
2428 /* overflow, need to check for all hahs slots */ 2483 /* overflow, need to check for all hash slots */
2429 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2484 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2430 infy_wd (EV_A_ slot, wd, ev); 2485 infy_wd (EV_A_ slot, wd, ev);
2431 else 2486 else
2432 { 2487 {
2433 WL w_; 2488 WL w_;
… …
2467infy_init (EV_P) 2522infy_init (EV_P)
2468{ 2523{
2469 if (fs_fd != -2) 2524 if (fs_fd != -2)
2470 return; 2525 return;
2471 2526
2527 /* kernels < 2.6.25 are borked
2528 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2529 */
2530 {
2531 struct utsname buf;
2532 int major, minor, micro;
2533
2534 fs_fd = -1;
2535
2536 if (uname (&buf))
2537 return;
2538
2539 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2540 return;
2541
2542 if (major < 2
2543 || (major == 2 && minor < 6)
2544 || (major == 2 && minor == 6 && micro < 25))
2545 return;
2546 }
2547
2472 fs_fd = inotify_init (); 2548 fs_fd = inotify_init ();
2473 2549
2474 if (fs_fd >= 0) 2550 if (fs_fd >= 0)
2475 { 2551 {
2476 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2552 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2505 if (fs_fd >= 0) 2581 if (fs_fd >= 0)
2506 infy_add (EV_A_ w); /* re-add, no matter what */ 2582 infy_add (EV_A_ w); /* re-add, no matter what */
2507 else 2583 else
2508 ev_timer_start (EV_A_ &w->timer); 2584 ev_timer_start (EV_A_ &w->timer);
2509 } 2585 }
2510
2511 } 2586 }
2512} 2587}
2513 2588
2589#endif
2590
2591#ifdef _WIN32
2592# define EV_LSTAT(p,b) _stati64 (p, b)
2593#else
2594# define EV_LSTAT(p,b) lstat (p, b)
2514#endif 2595#endif
2515 2596
2516void 2597void
2517ev_stat_stat (EV_P_ ev_stat *w) 2598ev_stat_stat (EV_P_ ev_stat *w)
2518{ 2599{
… …
2545 || w->prev.st_atime != w->attr.st_atime 2626 || w->prev.st_atime != w->attr.st_atime
2546 || w->prev.st_mtime != w->attr.st_mtime 2627 || w->prev.st_mtime != w->attr.st_mtime
2547 || w->prev.st_ctime != w->attr.st_ctime 2628 || w->prev.st_ctime != w->attr.st_ctime
2548 ) { 2629 ) {
2549 #if EV_USE_INOTIFY 2630 #if EV_USE_INOTIFY
2631 if (fs_fd >= 0)
2632 {
2550 infy_del (EV_A_ w); 2633 infy_del (EV_A_ w);
2551 infy_add (EV_A_ w); 2634 infy_add (EV_A_ w);
2552 ev_stat_stat (EV_A_ w); /* avoid race... */ 2635 ev_stat_stat (EV_A_ w); /* avoid race... */
2636 }
2553 #endif 2637 #endif
2554 2638
2555 ev_feed_event (EV_A_ w, EV_STAT); 2639 ev_feed_event (EV_A_ w, EV_STAT);
2556 } 2640 }
2557} 2641}
… …
2759 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2843 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2760 } 2844 }
2761 } 2845 }
2762} 2846}
2763 2847
2848static void
2849embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2850{
2851 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2852
2853 {
2854 struct ev_loop *loop = w->other;
2855
2856 ev_loop_fork (EV_A);
2857 }
2858}
2859
2764#if 0 2860#if 0
2765static void 2861static void
2766embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2862embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2767{ 2863{
2768 ev_idle_stop (EV_A_ idle); 2864 ev_idle_stop (EV_A_ idle);
… …
2788 2884
2789 ev_prepare_init (&w->prepare, embed_prepare_cb); 2885 ev_prepare_init (&w->prepare, embed_prepare_cb);
2790 ev_set_priority (&w->prepare, EV_MINPRI); 2886 ev_set_priority (&w->prepare, EV_MINPRI);
2791 ev_prepare_start (EV_A_ &w->prepare); 2887 ev_prepare_start (EV_A_ &w->prepare);
2792 2888
2889 ev_fork_init (&w->fork, embed_fork_cb);
2890 ev_fork_start (EV_A_ &w->fork);
2891
2793 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2892 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2794 2893
2795 ev_start (EV_A_ (W)w, 1); 2894 ev_start (EV_A_ (W)w, 1);
2796 2895
2797 EV_FREQUENT_CHECK; 2896 EV_FREQUENT_CHECK;
… …
2804 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2805 return; 2904 return;
2806 2905
2807 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2808 2907
2809 ev_io_stop (EV_A_ &w->io); 2908 ev_io_stop (EV_A_ &w->io);
2810 ev_prepare_stop (EV_A_ &w->prepare); 2909 ev_prepare_stop (EV_A_ &w->prepare);
2811 2910 ev_fork_stop (EV_A_ &w->fork);
2812 ev_stop (EV_A_ (W)w);
2813 2911
2814 EV_FREQUENT_CHECK; 2912 EV_FREQUENT_CHECK;
2815} 2913}
2816#endif 2914#endif
2817 2915
… …
2914once_cb (EV_P_ struct ev_once *once, int revents) 3012once_cb (EV_P_ struct ev_once *once, int revents)
2915{ 3013{
2916 void (*cb)(int revents, void *arg) = once->cb; 3014 void (*cb)(int revents, void *arg) = once->cb;
2917 void *arg = once->arg; 3015 void *arg = once->arg;
2918 3016
2919 ev_io_stop (EV_A_ &once->io); 3017 ev_io_stop (EV_A_ &once->io);
2920 ev_timer_stop (EV_A_ &once->to); 3018 ev_timer_stop (EV_A_ &once->to);
2921 ev_free (once); 3019 ev_free (once);
2922 3020
2923 cb (revents, arg); 3021 cb (revents, arg);
2924} 3022}
2925 3023
2926static void 3024static void
2927once_cb_io (EV_P_ ev_io *w, int revents) 3025once_cb_io (EV_P_ ev_io *w, int revents)
2928{ 3026{
2929 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3027 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3028
3029 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2930} 3030}
2931 3031
2932static void 3032static void
2933once_cb_to (EV_P_ ev_timer *w, int revents) 3033once_cb_to (EV_P_ ev_timer *w, int revents)
2934{ 3034{
2935 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3035 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3036
3037 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2936} 3038}
2937 3039
2938void 3040void
2939ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3041ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2940{ 3042{

Diff Legend

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