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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.268 by root, Mon Oct 27 13:39:18 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>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW 294# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 295# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 296# define EV_USE_INOTIFY 0
… …
448typedef struct 449typedef struct
449{ 450{
450 WL head; 451 WL head;
451 unsigned char events; 452 unsigned char events;
452 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 */
453#if EV_SELECT_IS_WINSOCKET 456#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 457 SOCKET handle;
455#endif 458#endif
456} ANFD; 459} ANFD;
457 460
… …
610{ 613{
611 *cur = array_nextsize (elem, *cur, cnt); 614 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 615 return ev_realloc (base, elem * *cur);
613} 616}
614 617
618#define array_init_zero(base,count) \
619 memset ((void *)(base), 0, sizeof (*(base)) * (count))
620
615#define array_needsize(type,base,cur,cnt,init) \ 621#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 622 if (expect_false ((cnt) > (cur))) \
617 { \ 623 { \
618 int ocur_ = (cur); \ 624 int ocur_ = (cur); \
619 (base) = (type *)array_realloc \ 625 (base) = (type *)array_realloc \
… …
661 for (i = 0; i < eventcnt; ++i) 667 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 668 ev_feed_event (EV_A_ events [i], type);
663} 669}
664 670
665/*****************************************************************************/ 671/*****************************************************************************/
666
667void inline_size
668anfds_init (ANFD *base, int count)
669{
670 while (count--)
671 {
672 base->head = 0;
673 base->events = EV_NONE;
674 base->reify = 0;
675
676 ++base;
677 }
678}
679 672
680void inline_speed 673void inline_speed
681fd_event (EV_P_ int fd, int revents) 674fd_event (EV_P_ int fd, int revents)
682{ 675{
683 ANFD *anfd = anfds + fd; 676 ANFD *anfd = anfds + fd;
… …
813 806
814 for (fd = 0; fd < anfdmax; ++fd) 807 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 808 if (anfds [fd].events)
816 { 809 {
817 anfds [fd].events = 0; 810 anfds [fd].events = 0;
811 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 812 fd_change (EV_A_ fd, EV_IOFDSET | 1);
819 } 813 }
820} 814}
821 815
822/*****************************************************************************/ 816/*****************************************************************************/
… …
974static ANSIG *signals; 968static ANSIG *signals;
975static int signalmax; 969static int signalmax;
976 970
977static EV_ATOMIC_T gotsig; 971static EV_ATOMIC_T gotsig;
978 972
979void inline_size
980signals_init (ANSIG *base, int count)
981{
982 while (count--)
983 {
984 base->head = 0;
985 base->gotsig = 0;
986
987 ++base;
988 }
989}
990
991/*****************************************************************************/ 973/*****************************************************************************/
992 974
993void inline_speed 975void inline_speed
994fd_intern (int fd) 976fd_intern (int fd)
995{ 977{
… …
1656ev_default_destroy (void) 1638ev_default_destroy (void)
1657{ 1639{
1658#if EV_MULTIPLICITY 1640#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1641 struct ev_loop *loop = ev_default_loop_ptr;
1660#endif 1642#endif
1643
1644 ev_default_loop_ptr = 0;
1661 1645
1662#ifndef _WIN32 1646#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1647 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1648 ev_signal_stop (EV_A_ &childev);
1665#endif 1649#endif
… …
2138 2122
2139 if (expect_false (ev_is_active (w))) 2123 if (expect_false (ev_is_active (w)))
2140 return; 2124 return;
2141 2125
2142 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))));
2143 2128
2144 EV_FREQUENT_CHECK; 2129 EV_FREQUENT_CHECK;
2145 2130
2146 ev_start (EV_A_ (W)w, 1); 2131 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2133 wlist_add (&anfds[fd].head, (WL)w);
2149 2134
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2151 w->events &= ~EV_IOFDSET; 2136 w->events &= ~EV_IOFDSET;
2152 2137
… …
2344 sigset_t full, prev; 2329 sigset_t full, prev;
2345 sigfillset (&full); 2330 sigfillset (&full);
2346 sigprocmask (SIG_SETMASK, &full, &prev); 2331 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif 2332#endif
2348 2333
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2334 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2350 2335
2351#ifndef _WIN32 2336#ifndef _WIN32
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2337 sigprocmask (SIG_SETMASK, &prev, 0);
2353#endif 2338#endif
2354 } 2339 }
… …
2496 2481
2497static void noinline 2482static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2484{
2500 if (slot < 0) 2485 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2486 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2488 infy_wd (EV_A_ slot, wd, ev);
2504 else 2489 else
2505 { 2490 {
2506 WL w_; 2491 WL w_;
… …
2540infy_init (EV_P) 2525infy_init (EV_P)
2541{ 2526{
2542 if (fs_fd != -2) 2527 if (fs_fd != -2)
2543 return; 2528 return;
2544 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
2545 fs_fd = inotify_init (); 2551 fs_fd = inotify_init ();
2546 2552
2547 if (fs_fd >= 0) 2553 if (fs_fd >= 0)
2548 { 2554 {
2549 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2555 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2578 if (fs_fd >= 0) 2584 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 2585 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 2586 else
2581 ev_timer_start (EV_A_ &w->timer); 2587 ev_timer_start (EV_A_ &w->timer);
2582 } 2588 }
2583
2584 } 2589 }
2585} 2590}
2586 2591
2587#endif 2592#endif
2588 2593
… …
2624 || w->prev.st_atime != w->attr.st_atime 2629 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 2630 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 2631 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 2632 ) {
2628 #if EV_USE_INOTIFY 2633 #if EV_USE_INOTIFY
2634 if (fs_fd >= 0)
2635 {
2629 infy_del (EV_A_ w); 2636 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 2637 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 2638 ev_stat_stat (EV_A_ w); /* avoid race... */
2639 }
2632 #endif 2640 #endif
2633 2641
2634 ev_feed_event (EV_A_ w, EV_STAT); 2642 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 2643 }
2636} 2644}

Diff Legend

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