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

Comparing libev/ev.c (file contents):
Revision 1.252 by root, Thu May 22 03:43:32 2008 UTC vs.
Revision 1.267 by root, Mon Oct 27 11:08:29 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
… …
957static ANSIG *signals; 967static ANSIG *signals;
958static int signalmax; 968static int signalmax;
959 969
960static EV_ATOMIC_T gotsig; 970static EV_ATOMIC_T gotsig;
961 971
962void inline_size
963signals_init (ANSIG *base, int count)
964{
965 while (count--)
966 {
967 base->head = 0;
968 base->gotsig = 0;
969
970 ++base;
971 }
972}
973
974/*****************************************************************************/ 972/*****************************************************************************/
975 973
976void inline_speed 974void inline_speed
977fd_intern (int fd) 975fd_intern (int fd)
978{ 976{
979#ifdef _WIN32 977#ifdef _WIN32
980 int arg = 1; 978 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 979 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 980#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 981 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 982 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 983#endif
… …
1499{ 1497{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1498 postfork = 1; /* must be in line with ev_default_fork */
1501} 1499}
1502 1500
1503#if EV_VERIFY 1501#if EV_VERIFY
1504void noinline 1502static void noinline
1505verify_watcher (EV_P_ W w) 1503verify_watcher (EV_P_ W w)
1506{ 1504{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1505 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1506
1509 if (w->pending) 1507 if (w->pending)
… …
1639ev_default_destroy (void) 1637ev_default_destroy (void)
1640{ 1638{
1641#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1642 struct ev_loop *loop = ev_default_loop_ptr; 1640 struct ev_loop *loop = ev_default_loop_ptr;
1643#endif 1641#endif
1642
1643 ev_default_loop_ptr = 0;
1644 1644
1645#ifndef _WIN32 1645#ifndef _WIN32
1646 ev_ref (EV_A); /* child watcher */ 1646 ev_ref (EV_A); /* child watcher */
1647 ev_signal_stop (EV_A_ &childev); 1647 ev_signal_stop (EV_A_ &childev);
1648#endif 1648#endif
… …
1897ev_unref (EV_P) 1897ev_unref (EV_P)
1898{ 1898{
1899 --activecnt; 1899 --activecnt;
1900} 1900}
1901 1901
1902void
1903ev_now_update (EV_P)
1904{
1905 time_update (EV_A_ 1e100);
1906}
1907
1902static int loop_done; 1908static int loop_done;
1903 1909
1904void 1910void
1905ev_loop (EV_P_ int flags) 1911ev_loop (EV_P_ int flags)
1906{ 1912{
… …
2115 2121
2116 if (expect_false (ev_is_active (w))) 2122 if (expect_false (ev_is_active (w)))
2117 return; 2123 return;
2118 2124
2119 assert (("ev_io_start called with negative fd", fd >= 0)); 2125 assert (("ev_io_start called with negative fd", fd >= 0));
2126 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2120 2127
2121 EV_FREQUENT_CHECK; 2128 EV_FREQUENT_CHECK;
2122 2129
2123 ev_start (EV_A_ (W)w, 1); 2130 ev_start (EV_A_ (W)w, 1);
2124 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2131 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2125 wlist_add (&anfds[fd].head, (WL)w); 2132 wlist_add (&anfds[fd].head, (WL)w);
2126 2133
2127 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2134 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2128 w->events &= ~EV_IOFDSET; 2135 w->events &= ~EV_IOFDSET;
2129 2136
… …
2321 sigset_t full, prev; 2328 sigset_t full, prev;
2322 sigfillset (&full); 2329 sigfillset (&full);
2323 sigprocmask (SIG_SETMASK, &full, &prev); 2330 sigprocmask (SIG_SETMASK, &full, &prev);
2324#endif 2331#endif
2325 2332
2326 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2333 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2327 2334
2328#ifndef _WIN32 2335#ifndef _WIN32
2329 sigprocmask (SIG_SETMASK, &prev, 0); 2336 sigprocmask (SIG_SETMASK, &prev, 0);
2330#endif 2337#endif
2331 } 2338 }
… …
2473 2480
2474static void noinline 2481static void noinline
2475infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2482infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2476{ 2483{
2477 if (slot < 0) 2484 if (slot < 0)
2478 /* overflow, need to check for all hahs slots */ 2485 /* overflow, need to check for all hash slots */
2479 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2486 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2480 infy_wd (EV_A_ slot, wd, ev); 2487 infy_wd (EV_A_ slot, wd, ev);
2481 else 2488 else
2482 { 2489 {
2483 WL w_; 2490 WL w_;
… …
2517infy_init (EV_P) 2524infy_init (EV_P)
2518{ 2525{
2519 if (fs_fd != -2) 2526 if (fs_fd != -2)
2520 return; 2527 return;
2521 2528
2529 /* kernels < 2.6.25 are borked
2530 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2531 */
2532 {
2533 struct utsname buf;
2534 int major, minor, micro;
2535
2536 fs_fd = -1;
2537
2538 if (uname (&buf))
2539 return;
2540
2541 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2542 return;
2543
2544 if (major < 2
2545 || (major == 2 && minor < 6)
2546 || (major == 2 && minor == 6 && micro < 25))
2547 return;
2548 }
2549
2522 fs_fd = inotify_init (); 2550 fs_fd = inotify_init ();
2523 2551
2524 if (fs_fd >= 0) 2552 if (fs_fd >= 0)
2525 { 2553 {
2526 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2554 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2555 if (fs_fd >= 0) 2583 if (fs_fd >= 0)
2556 infy_add (EV_A_ w); /* re-add, no matter what */ 2584 infy_add (EV_A_ w); /* re-add, no matter what */
2557 else 2585 else
2558 ev_timer_start (EV_A_ &w->timer); 2586 ev_timer_start (EV_A_ &w->timer);
2559 } 2587 }
2560
2561 } 2588 }
2562} 2589}
2563 2590
2591#endif
2592
2593#ifdef _WIN32
2594# define EV_LSTAT(p,b) _stati64 (p, b)
2595#else
2596# define EV_LSTAT(p,b) lstat (p, b)
2564#endif 2597#endif
2565 2598
2566void 2599void
2567ev_stat_stat (EV_P_ ev_stat *w) 2600ev_stat_stat (EV_P_ ev_stat *w)
2568{ 2601{
… …
2595 || w->prev.st_atime != w->attr.st_atime 2628 || w->prev.st_atime != w->attr.st_atime
2596 || w->prev.st_mtime != w->attr.st_mtime 2629 || w->prev.st_mtime != w->attr.st_mtime
2597 || w->prev.st_ctime != w->attr.st_ctime 2630 || w->prev.st_ctime != w->attr.st_ctime
2598 ) { 2631 ) {
2599 #if EV_USE_INOTIFY 2632 #if EV_USE_INOTIFY
2633 if (fs_fd >= 0)
2634 {
2600 infy_del (EV_A_ w); 2635 infy_del (EV_A_ w);
2601 infy_add (EV_A_ w); 2636 infy_add (EV_A_ w);
2602 ev_stat_stat (EV_A_ w); /* avoid race... */ 2637 ev_stat_stat (EV_A_ w); /* avoid race... */
2638 }
2603 #endif 2639 #endif
2604 2640
2605 ev_feed_event (EV_A_ w, EV_STAT); 2641 ev_feed_event (EV_A_ w, EV_STAT);
2606 } 2642 }
2607} 2643}
… …
2809 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2845 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2810 } 2846 }
2811 } 2847 }
2812} 2848}
2813 2849
2850static void
2851embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2852{
2853 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2854
2855 {
2856 struct ev_loop *loop = w->other;
2857
2858 ev_loop_fork (EV_A);
2859 }
2860}
2861
2814#if 0 2862#if 0
2815static void 2863static void
2816embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2864embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2817{ 2865{
2818 ev_idle_stop (EV_A_ idle); 2866 ev_idle_stop (EV_A_ idle);
… …
2838 2886
2839 ev_prepare_init (&w->prepare, embed_prepare_cb); 2887 ev_prepare_init (&w->prepare, embed_prepare_cb);
2840 ev_set_priority (&w->prepare, EV_MINPRI); 2888 ev_set_priority (&w->prepare, EV_MINPRI);
2841 ev_prepare_start (EV_A_ &w->prepare); 2889 ev_prepare_start (EV_A_ &w->prepare);
2842 2890
2891 ev_fork_init (&w->fork, embed_fork_cb);
2892 ev_fork_start (EV_A_ &w->fork);
2893
2843 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2894 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2844 2895
2845 ev_start (EV_A_ (W)w, 1); 2896 ev_start (EV_A_ (W)w, 1);
2846 2897
2847 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
… …
2854 if (expect_false (!ev_is_active (w))) 2905 if (expect_false (!ev_is_active (w)))
2855 return; 2906 return;
2856 2907
2857 EV_FREQUENT_CHECK; 2908 EV_FREQUENT_CHECK;
2858 2909
2859 ev_io_stop (EV_A_ &w->io); 2910 ev_io_stop (EV_A_ &w->io);
2860 ev_prepare_stop (EV_A_ &w->prepare); 2911 ev_prepare_stop (EV_A_ &w->prepare);
2861 2912 ev_fork_stop (EV_A_ &w->fork);
2862 ev_stop (EV_A_ (W)w);
2863 2913
2864 EV_FREQUENT_CHECK; 2914 EV_FREQUENT_CHECK;
2865} 2915}
2866#endif 2916#endif
2867 2917
… …
2964once_cb (EV_P_ struct ev_once *once, int revents) 3014once_cb (EV_P_ struct ev_once *once, int revents)
2965{ 3015{
2966 void (*cb)(int revents, void *arg) = once->cb; 3016 void (*cb)(int revents, void *arg) = once->cb;
2967 void *arg = once->arg; 3017 void *arg = once->arg;
2968 3018
2969 ev_io_stop (EV_A_ &once->io); 3019 ev_io_stop (EV_A_ &once->io);
2970 ev_timer_stop (EV_A_ &once->to); 3020 ev_timer_stop (EV_A_ &once->to);
2971 ev_free (once); 3021 ev_free (once);
2972 3022
2973 cb (revents, arg); 3023 cb (revents, arg);
2974} 3024}
2975 3025
2976static void 3026static void
2977once_cb_io (EV_P_ ev_io *w, int revents) 3027once_cb_io (EV_P_ ev_io *w, int revents)
2978{ 3028{
2979 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3029 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3030
3031 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2980} 3032}
2981 3033
2982static void 3034static void
2983once_cb_to (EV_P_ ev_timer *w, int revents) 3035once_cb_to (EV_P_ ev_timer *w, int revents)
2984{ 3036{
2985 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3037 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3038
3039 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2986} 3040}
2987 3041
2988void 3042void
2989ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3043ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2990{ 3044{

Diff Legend

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