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

Comparing libev/ev.c (file contents):
Revision 1.261 by root, Mon Sep 29 03:31:14 2008 UTC vs.
Revision 1.266 by root, Fri Oct 24 08:15:33 2008 UTC

… …
286# include <sys/select.h> 286# include <sys/select.h>
287# endif 287# endif
288#endif 288#endif
289 289
290#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
291# 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
292#endif 298#endif
293 299
294#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
295# include <winsock.h> 301# include <winsock.h>
296#endif 302#endif
… …
443typedef struct 449typedef struct
444{ 450{
445 WL head; 451 WL head;
446 unsigned char events; 452 unsigned char events;
447 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 */
448#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 457 SOCKET handle;
450#endif 458#endif
451} ANFD; 459} ANFD;
452 460
… …
605{ 613{
606 *cur = array_nextsize (elem, *cur, cnt); 614 *cur = array_nextsize (elem, *cur, cnt);
607 return ev_realloc (base, elem * *cur); 615 return ev_realloc (base, elem * *cur);
608} 616}
609 617
618#define array_init_zero(base,count) \
619 memset ((void *)(base), 0, sizeof (*(base)) * (count))
620
610#define array_needsize(type,base,cur,cnt,init) \ 621#define array_needsize(type,base,cur,cnt,init) \
611 if (expect_false ((cnt) > (cur))) \ 622 if (expect_false ((cnt) > (cur))) \
612 { \ 623 { \
613 int ocur_ = (cur); \ 624 int ocur_ = (cur); \
614 (base) = (type *)array_realloc \ 625 (base) = (type *)array_realloc \
… …
656 for (i = 0; i < eventcnt; ++i) 667 for (i = 0; i < eventcnt; ++i)
657 ev_feed_event (EV_A_ events [i], type); 668 ev_feed_event (EV_A_ events [i], type);
658} 669}
659 670
660/*****************************************************************************/ 671/*****************************************************************************/
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 672
675void inline_speed 673void inline_speed
676fd_event (EV_P_ int fd, int revents) 674fd_event (EV_P_ int fd, int revents)
677{ 675{
678 ANFD *anfd = anfds + fd; 676 ANFD *anfd = anfds + fd;
… …
969static ANSIG *signals; 967static ANSIG *signals;
970static int signalmax; 968static int signalmax;
971 969
972static EV_ATOMIC_T gotsig; 970static EV_ATOMIC_T gotsig;
973 971
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/*****************************************************************************/ 972/*****************************************************************************/
987 973
988void inline_speed 974void inline_speed
989fd_intern (int fd) 975fd_intern (int fd)
990{ 976{
… …
1651ev_default_destroy (void) 1637ev_default_destroy (void)
1652{ 1638{
1653#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1654 struct ev_loop *loop = ev_default_loop_ptr; 1640 struct ev_loop *loop = ev_default_loop_ptr;
1655#endif 1641#endif
1642
1643 ev_default_loop_ptr = 0;
1656 1644
1657#ifndef _WIN32 1645#ifndef _WIN32
1658 ev_ref (EV_A); /* child watcher */ 1646 ev_ref (EV_A); /* child watcher */
1659 ev_signal_stop (EV_A_ &childev); 1647 ev_signal_stop (EV_A_ &childev);
1660#endif 1648#endif
… …
2133 2121
2134 if (expect_false (ev_is_active (w))) 2122 if (expect_false (ev_is_active (w)))
2135 return; 2123 return;
2136 2124
2137 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))));
2138 2127
2139 EV_FREQUENT_CHECK; 2128 EV_FREQUENT_CHECK;
2140 2129
2141 ev_start (EV_A_ (W)w, 1); 2130 ev_start (EV_A_ (W)w, 1);
2142 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2131 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2143 wlist_add (&anfds[fd].head, (WL)w); 2132 wlist_add (&anfds[fd].head, (WL)w);
2144 2133
2145 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2134 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2146 w->events &= ~EV_IOFDSET; 2135 w->events &= ~EV_IOFDSET;
2147 2136
… …
2339 sigset_t full, prev; 2328 sigset_t full, prev;
2340 sigfillset (&full); 2329 sigfillset (&full);
2341 sigprocmask (SIG_SETMASK, &full, &prev); 2330 sigprocmask (SIG_SETMASK, &full, &prev);
2342#endif 2331#endif
2343 2332
2344 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2333 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2345 2334
2346#ifndef _WIN32 2335#ifndef _WIN32
2347 sigprocmask (SIG_SETMASK, &prev, 0); 2336 sigprocmask (SIG_SETMASK, &prev, 0);
2348#endif 2337#endif
2349 } 2338 }
… …
2491 2480
2492static void noinline 2481static void noinline
2493infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2482infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2494{ 2483{
2495 if (slot < 0) 2484 if (slot < 0)
2496 /* overflow, need to check for all hahs slots */ 2485 /* overflow, need to check for all hash slots */
2497 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2486 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2498 infy_wd (EV_A_ slot, wd, ev); 2487 infy_wd (EV_A_ slot, wd, ev);
2499 else 2488 else
2500 { 2489 {
2501 WL w_; 2490 WL w_;
… …
2535infy_init (EV_P) 2524infy_init (EV_P)
2536{ 2525{
2537 if (fs_fd != -2) 2526 if (fs_fd != -2)
2538 return; 2527 return;
2539 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
2540 fs_fd = inotify_init (); 2550 fs_fd = inotify_init ();
2541 2551
2542 if (fs_fd >= 0) 2552 if (fs_fd >= 0)
2543 { 2553 {
2544 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2554 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2573 if (fs_fd >= 0) 2583 if (fs_fd >= 0)
2574 infy_add (EV_A_ w); /* re-add, no matter what */ 2584 infy_add (EV_A_ w); /* re-add, no matter what */
2575 else 2585 else
2576 ev_timer_start (EV_A_ &w->timer); 2586 ev_timer_start (EV_A_ &w->timer);
2577 } 2587 }
2578
2579 } 2588 }
2580} 2589}
2581 2590
2582#endif 2591#endif
2583 2592
… …
2619 || w->prev.st_atime != w->attr.st_atime 2628 || w->prev.st_atime != w->attr.st_atime
2620 || w->prev.st_mtime != w->attr.st_mtime 2629 || w->prev.st_mtime != w->attr.st_mtime
2621 || w->prev.st_ctime != w->attr.st_ctime 2630 || w->prev.st_ctime != w->attr.st_ctime
2622 ) { 2631 ) {
2623 #if EV_USE_INOTIFY 2632 #if EV_USE_INOTIFY
2633 if (fs_fd >= 0)
2634 {
2624 infy_del (EV_A_ w); 2635 infy_del (EV_A_ w);
2625 infy_add (EV_A_ w); 2636 infy_add (EV_A_ w);
2626 ev_stat_stat (EV_A_ w); /* avoid race... */ 2637 ev_stat_stat (EV_A_ w); /* avoid race... */
2638 }
2627 #endif 2639 #endif
2628 2640
2629 ev_feed_event (EV_A_ w, EV_STAT); 2641 ev_feed_event (EV_A_ w, EV_STAT);
2630 } 2642 }
2631} 2643}
… …
3012} 3024}
3013 3025
3014static void 3026static void
3015once_cb_io (EV_P_ ev_io *w, int revents) 3027once_cb_io (EV_P_ ev_io *w, int revents)
3016{ 3028{
3017 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));
3018} 3032}
3019 3033
3020static void 3034static void
3021once_cb_to (EV_P_ ev_timer *w, int revents) 3035once_cb_to (EV_P_ ev_timer *w, int revents)
3022{ 3036{
3023 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));
3024} 3040}
3025 3041
3026void 3042void
3027ev_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)
3028{ 3044{

Diff Legend

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