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

Comparing libev/ev.c (file contents):
Revision 1.260 by root, Mon Sep 8 17:24:39 2008 UTC vs.
Revision 1.274 by root, Thu Nov 20 00:35:10 2008 UTC

… …
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
… …
164# endif 176# endif
165#endif 177#endif
166 178
167/* 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 */
168 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
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 306# include <sys/select.h>
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
291# 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
292#endif 319#endif
293 320
294#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
295# 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
296#endif 332#endif
297 333
298#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
299/* 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 */
300# include <stdint.h> 336# include <stdint.h>
… …
382{ 418{
383 syserr_cb = cb; 419 syserr_cb = cb;
384} 420}
385 421
386static void noinline 422static void noinline
387syserr (const char *msg) 423ev_syserr (const char *msg)
388{ 424{
389 if (!msg) 425 if (!msg)
390 msg = "(libev) system error"; 426 msg = "(libev) system error";
391 427
392 if (syserr_cb) 428 if (syserr_cb)
… …
443typedef struct 479typedef struct
444{ 480{
445 WL head; 481 WL head;
446 unsigned char events; 482 unsigned char events;
447 unsigned char reify; 483 unsigned char reify;
484 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
485 unsigned char unused;
486#if EV_USE_EPOLL
487 unsigned int egen; /* generation counter to counter epoll bugs */
488#endif
448#if EV_SELECT_IS_WINSOCKET 489#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 490 SOCKET handle;
450#endif 491#endif
451} ANFD; 492} ANFD;
452 493
… …
605{ 646{
606 *cur = array_nextsize (elem, *cur, cnt); 647 *cur = array_nextsize (elem, *cur, cnt);
607 return ev_realloc (base, elem * *cur); 648 return ev_realloc (base, elem * *cur);
608} 649}
609 650
651#define array_init_zero(base,count) \
652 memset ((void *)(base), 0, sizeof (*(base)) * (count))
653
610#define array_needsize(type,base,cur,cnt,init) \ 654#define array_needsize(type,base,cur,cnt,init) \
611 if (expect_false ((cnt) > (cur))) \ 655 if (expect_false ((cnt) > (cur))) \
612 { \ 656 { \
613 int ocur_ = (cur); \ 657 int ocur_ = (cur); \
614 (base) = (type *)array_realloc \ 658 (base) = (type *)array_realloc \
… …
656 for (i = 0; i < eventcnt; ++i) 700 for (i = 0; i < eventcnt; ++i)
657 ev_feed_event (EV_A_ events [i], type); 701 ev_feed_event (EV_A_ events [i], type);
658} 702}
659 703
660/*****************************************************************************/ 704/*****************************************************************************/
661
662void inline_size
663anfds_init (ANFD *base, int count)
664{
665 while (count--)
666 {
667 base->head = 0;
668 base->events = EV_NONE;
669 base->reify = 0;
670
671 ++base;
672 }
673}
674 705
675void inline_speed 706void inline_speed
676fd_event (EV_P_ int fd, int revents) 707fd_event (EV_P_ int fd, int revents)
677{ 708{
678 ANFD *anfd = anfds + fd; 709 ANFD *anfd = anfds + fd;
… …
808 839
809 for (fd = 0; fd < anfdmax; ++fd) 840 for (fd = 0; fd < anfdmax; ++fd)
810 if (anfds [fd].events) 841 if (anfds [fd].events)
811 { 842 {
812 anfds [fd].events = 0; 843 anfds [fd].events = 0;
844 anfds [fd].emask = 0;
813 fd_change (EV_A_ fd, EV_IOFDSET | 1); 845 fd_change (EV_A_ fd, EV_IOFDSET | 1);
814 } 846 }
815} 847}
816 848
817/*****************************************************************************/ 849/*****************************************************************************/
… …
969static ANSIG *signals; 1001static ANSIG *signals;
970static int signalmax; 1002static int signalmax;
971 1003
972static EV_ATOMIC_T gotsig; 1004static EV_ATOMIC_T gotsig;
973 1005
974void inline_size
975signals_init (ANSIG *base, int count)
976{
977 while (count--)
978 {
979 base->head = 0;
980 base->gotsig = 0;
981
982 ++base;
983 }
984}
985
986/*****************************************************************************/ 1006/*****************************************************************************/
987 1007
988void inline_speed 1008void inline_speed
989fd_intern (int fd) 1009fd_intern (int fd)
990{ 1010{
… …
1011 } 1031 }
1012 else 1032 else
1013#endif 1033#endif
1014 { 1034 {
1015 while (pipe (evpipe)) 1035 while (pipe (evpipe))
1016 syserr ("(libev) error creating signal/async pipe"); 1036 ev_syserr ("(libev) error creating signal/async pipe");
1017 1037
1018 fd_intern (evpipe [0]); 1038 fd_intern (evpipe [0]);
1019 fd_intern (evpipe [1]); 1039 fd_intern (evpipe [1]);
1020 ev_io_set (&pipeev, evpipe [0], EV_READ); 1040 ev_io_set (&pipeev, evpipe [0], EV_READ);
1021 } 1041 }
… …
1652{ 1672{
1653#if EV_MULTIPLICITY 1673#if EV_MULTIPLICITY
1654 struct ev_loop *loop = ev_default_loop_ptr; 1674 struct ev_loop *loop = ev_default_loop_ptr;
1655#endif 1675#endif
1656 1676
1677 ev_default_loop_ptr = 0;
1678
1657#ifndef _WIN32 1679#ifndef _WIN32
1658 ev_ref (EV_A); /* child watcher */ 1680 ev_ref (EV_A); /* child watcher */
1659 ev_signal_stop (EV_A_ &childev); 1681 ev_signal_stop (EV_A_ &childev);
1660#endif 1682#endif
1661 1683
… …
1667{ 1689{
1668#if EV_MULTIPLICITY 1690#if EV_MULTIPLICITY
1669 struct ev_loop *loop = ev_default_loop_ptr; 1691 struct ev_loop *loop = ev_default_loop_ptr;
1670#endif 1692#endif
1671 1693
1672 if (backend)
1673 postfork = 1; /* must be in line with ev_loop_fork */ 1694 postfork = 1; /* must be in line with ev_loop_fork */
1674} 1695}
1675 1696
1676/*****************************************************************************/ 1697/*****************************************************************************/
1677 1698
1678void 1699void
… …
2133 2154
2134 if (expect_false (ev_is_active (w))) 2155 if (expect_false (ev_is_active (w)))
2135 return; 2156 return;
2136 2157
2137 assert (("ev_io_start called with negative fd", fd >= 0)); 2158 assert (("ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2138 2160
2139 EV_FREQUENT_CHECK; 2161 EV_FREQUENT_CHECK;
2140 2162
2141 ev_start (EV_A_ (W)w, 1); 2163 ev_start (EV_A_ (W)w, 1);
2142 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2143 wlist_add (&anfds[fd].head, (WL)w); 2165 wlist_add (&anfds[fd].head, (WL)w);
2144 2166
2145 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2167 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2146 w->events &= ~EV_IOFDSET; 2168 w->events &= ~EV_IOFDSET;
2147 2169
… …
2339 sigset_t full, prev; 2361 sigset_t full, prev;
2340 sigfillset (&full); 2362 sigfillset (&full);
2341 sigprocmask (SIG_SETMASK, &full, &prev); 2363 sigprocmask (SIG_SETMASK, &full, &prev);
2342#endif 2364#endif
2343 2365
2344 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2366 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2345 2367
2346#ifndef _WIN32 2368#ifndef _WIN32
2347 sigprocmask (SIG_SETMASK, &prev, 0); 2369 sigprocmask (SIG_SETMASK, &prev, 0);
2348#endif 2370#endif
2349 } 2371 }
… …
2422# ifdef _WIN32 2444# ifdef _WIN32
2423# undef lstat 2445# undef lstat
2424# define lstat(a,b) _stati64 (a,b) 2446# define lstat(a,b) _stati64 (a,b)
2425# endif 2447# endif
2426 2448
2427#define DEF_STAT_INTERVAL 5.0074891 2449#define DEF_STAT_INTERVAL 5.0074891
2450#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2428#define MIN_STAT_INTERVAL 0.1074891 2451#define MIN_STAT_INTERVAL 0.1074891
2429 2452
2430static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2453static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2431 2454
2432#if EV_USE_INOTIFY 2455#if EV_USE_INOTIFY
2433# define EV_INOTIFY_BUFSIZE 8192 2456# define EV_INOTIFY_BUFSIZE 8192
… …
2437{ 2460{
2438 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); 2461 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);
2439 2462
2440 if (w->wd < 0) 2463 if (w->wd < 0)
2441 { 2464 {
2465 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2442 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2466 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2443 2467
2444 /* monitor some parent directory for speedup hints */ 2468 /* monitor some parent directory for speedup hints */
2445 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2469 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2446 /* but an efficiency issue only */ 2470 /* but an efficiency issue only */
2447 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2471 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2448 { 2472 {
2449 char path [4096]; 2473 char path [4096];
2450 strcpy (path, w->path); 2474 strcpy (path, w->path);
… …
2464 } 2488 }
2465 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2489 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2466 } 2490 }
2467 } 2491 }
2468 else 2492 else
2469 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2493 {
2470
2471 if (w->wd >= 0)
2472 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2494 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2495
2496 /* now local changes will be tracked by inotify, but remote changes won't */
2497 /* unless the filesystem it known to be local, we therefore still poll */
2498 /* also do poll on <2.6.25, but with normal frequency */
2499 struct statfs sfs;
2500
2501 if (fs_2625 && !statfs (w->path, &sfs))
2502 if (sfs.f_type == 0x1373 /* devfs */
2503 || sfs.f_type == 0xEF53 /* ext2/3 */
2504 || sfs.f_type == 0x3153464a /* jfs */
2505 || sfs.f_type == 0x52654973 /* reiser3 */
2506 || sfs.f_type == 0x01021994 /* tempfs */
2507 || sfs.f_type == 0x58465342 /* xfs */)
2508 return;
2509
2510 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2511 ev_timer_again (EV_A_ &w->timer);
2512 }
2473} 2513}
2474 2514
2475static void noinline 2515static void noinline
2476infy_del (EV_P_ ev_stat *w) 2516infy_del (EV_P_ ev_stat *w)
2477{ 2517{
… …
2491 2531
2492static void noinline 2532static void noinline
2493infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2533infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2494{ 2534{
2495 if (slot < 0) 2535 if (slot < 0)
2496 /* overflow, need to check for all hahs slots */ 2536 /* overflow, need to check for all hash slots */
2497 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2537 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2498 infy_wd (EV_A_ slot, wd, ev); 2538 infy_wd (EV_A_ slot, wd, ev);
2499 else 2539 else
2500 { 2540 {
2501 WL w_; 2541 WL w_;
… …
2530 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2570 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2531 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2571 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2532} 2572}
2533 2573
2534void inline_size 2574void inline_size
2575check_2625 (EV_P)
2576{
2577 /* kernels < 2.6.25 are borked
2578 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2579 */
2580 struct utsname buf;
2581 int major, minor, micro;
2582
2583 if (uname (&buf))
2584 return;
2585
2586 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2587 return;
2588
2589 if (major < 2
2590 || (major == 2 && minor < 6)
2591 || (major == 2 && minor == 6 && micro < 25))
2592 return;
2593
2594 fs_2625 = 1;
2595}
2596
2597void inline_size
2535infy_init (EV_P) 2598infy_init (EV_P)
2536{ 2599{
2537 if (fs_fd != -2) 2600 if (fs_fd != -2)
2538 return; 2601 return;
2602
2603 fs_fd = -1;
2604
2605 check_2625 (EV_A);
2539 2606
2540 fs_fd = inotify_init (); 2607 fs_fd = inotify_init ();
2541 2608
2542 if (fs_fd >= 0) 2609 if (fs_fd >= 0)
2543 { 2610 {
… …
2571 w->wd = -1; 2638 w->wd = -1;
2572 2639
2573 if (fs_fd >= 0) 2640 if (fs_fd >= 0)
2574 infy_add (EV_A_ w); /* re-add, no matter what */ 2641 infy_add (EV_A_ w); /* re-add, no matter what */
2575 else 2642 else
2576 ev_timer_start (EV_A_ &w->timer); 2643 ev_timer_again (EV_A_ &w->timer);
2577 } 2644 }
2578
2579 } 2645 }
2580} 2646}
2581 2647
2582#endif 2648#endif
2583 2649
… …
2619 || w->prev.st_atime != w->attr.st_atime 2685 || w->prev.st_atime != w->attr.st_atime
2620 || w->prev.st_mtime != w->attr.st_mtime 2686 || w->prev.st_mtime != w->attr.st_mtime
2621 || w->prev.st_ctime != w->attr.st_ctime 2687 || w->prev.st_ctime != w->attr.st_ctime
2622 ) { 2688 ) {
2623 #if EV_USE_INOTIFY 2689 #if EV_USE_INOTIFY
2690 if (fs_fd >= 0)
2691 {
2624 infy_del (EV_A_ w); 2692 infy_del (EV_A_ w);
2625 infy_add (EV_A_ w); 2693 infy_add (EV_A_ w);
2626 ev_stat_stat (EV_A_ w); /* avoid race... */ 2694 ev_stat_stat (EV_A_ w); /* avoid race... */
2695 }
2627 #endif 2696 #endif
2628 2697
2629 ev_feed_event (EV_A_ w, EV_STAT); 2698 ev_feed_event (EV_A_ w, EV_STAT);
2630 } 2699 }
2631} 2700}
… …
2634ev_stat_start (EV_P_ ev_stat *w) 2703ev_stat_start (EV_P_ ev_stat *w)
2635{ 2704{
2636 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2637 return; 2706 return;
2638 2707
2639 /* since we use memcmp, we need to clear any padding data etc. */
2640 memset (&w->prev, 0, sizeof (ev_statdata));
2641 memset (&w->attr, 0, sizeof (ev_statdata));
2642
2643 ev_stat_stat (EV_A_ w); 2708 ev_stat_stat (EV_A_ w);
2644 2709
2710 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2645 if (w->interval < MIN_STAT_INTERVAL) 2711 w->interval = MIN_STAT_INTERVAL;
2646 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2647 2712
2648 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2713 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2649 ev_set_priority (&w->timer, ev_priority (w)); 2714 ev_set_priority (&w->timer, ev_priority (w));
2650 2715
2651#if EV_USE_INOTIFY 2716#if EV_USE_INOTIFY
2652 infy_init (EV_A); 2717 infy_init (EV_A);
2653 2718
2654 if (fs_fd >= 0) 2719 if (fs_fd >= 0)
2655 infy_add (EV_A_ w); 2720 infy_add (EV_A_ w);
2656 else 2721 else
2657#endif 2722#endif
2658 ev_timer_start (EV_A_ &w->timer); 2723 ev_timer_again (EV_A_ &w->timer);
2659 2724
2660 ev_start (EV_A_ (W)w, 1); 2725 ev_start (EV_A_ (W)w, 1);
2661 2726
2662 EV_FREQUENT_CHECK; 2727 EV_FREQUENT_CHECK;
2663} 2728}
… …
2833 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2898 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2834 } 2899 }
2835 } 2900 }
2836} 2901}
2837 2902
2903static void
2904embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2905{
2906 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2907
2908 {
2909 struct ev_loop *loop = w->other;
2910
2911 ev_loop_fork (EV_A);
2912 }
2913}
2914
2838#if 0 2915#if 0
2839static void 2916static void
2840embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2917embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2841{ 2918{
2842 ev_idle_stop (EV_A_ idle); 2919 ev_idle_stop (EV_A_ idle);
… …
2862 2939
2863 ev_prepare_init (&w->prepare, embed_prepare_cb); 2940 ev_prepare_init (&w->prepare, embed_prepare_cb);
2864 ev_set_priority (&w->prepare, EV_MINPRI); 2941 ev_set_priority (&w->prepare, EV_MINPRI);
2865 ev_prepare_start (EV_A_ &w->prepare); 2942 ev_prepare_start (EV_A_ &w->prepare);
2866 2943
2944 ev_fork_init (&w->fork, embed_fork_cb);
2945 ev_fork_start (EV_A_ &w->fork);
2946
2867 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2947 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2868 2948
2869 ev_start (EV_A_ (W)w, 1); 2949 ev_start (EV_A_ (W)w, 1);
2870 2950
2871 EV_FREQUENT_CHECK; 2951 EV_FREQUENT_CHECK;
… …
2878 if (expect_false (!ev_is_active (w))) 2958 if (expect_false (!ev_is_active (w)))
2879 return; 2959 return;
2880 2960
2881 EV_FREQUENT_CHECK; 2961 EV_FREQUENT_CHECK;
2882 2962
2883 ev_io_stop (EV_A_ &w->io); 2963 ev_io_stop (EV_A_ &w->io);
2884 ev_prepare_stop (EV_A_ &w->prepare); 2964 ev_prepare_stop (EV_A_ &w->prepare);
2885 2965 ev_fork_stop (EV_A_ &w->fork);
2886 ev_stop (EV_A_ (W)w);
2887 2966
2888 EV_FREQUENT_CHECK; 2967 EV_FREQUENT_CHECK;
2889} 2968}
2890#endif 2969#endif
2891 2970
… …
2998} 3077}
2999 3078
3000static void 3079static void
3001once_cb_io (EV_P_ ev_io *w, int revents) 3080once_cb_io (EV_P_ ev_io *w, int revents)
3002{ 3081{
3003 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3082 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3083
3084 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
3004} 3085}
3005 3086
3006static void 3087static void
3007once_cb_to (EV_P_ ev_timer *w, int revents) 3088once_cb_to (EV_P_ ev_timer *w, int revents)
3008{ 3089{
3009 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3090 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3091
3092 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3010} 3093}
3011 3094
3012void 3095void
3013ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3096ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3014{ 3097{

Diff Legend

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