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.271 by root, Mon Nov 3 12:13:15 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>
292# include <sys/statfs.h>
291# include <sys/inotify.h> 293# include <sys/inotify.h>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 294/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW 295# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 296# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
… …
387{ 389{
388 syserr_cb = cb; 390 syserr_cb = cb;
389} 391}
390 392
391static void noinline 393static void noinline
392syserr (const char *msg) 394ev_syserr (const char *msg)
393{ 395{
394 if (!msg) 396 if (!msg)
395 msg = "(libev) system error"; 397 msg = "(libev) system error";
396 398
397 if (syserr_cb) 399 if (syserr_cb)
… …
448typedef struct 450typedef struct
449{ 451{
450 WL head; 452 WL head;
451 unsigned char events; 453 unsigned char events;
452 unsigned char reify; 454 unsigned char reify;
455 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused;
457#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif
453#if EV_SELECT_IS_WINSOCKET 460#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 461 SOCKET handle;
455#endif 462#endif
456} ANFD; 463} ANFD;
457 464
… …
610{ 617{
611 *cur = array_nextsize (elem, *cur, cnt); 618 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 619 return ev_realloc (base, elem * *cur);
613} 620}
614 621
622#define array_init_zero(base,count) \
623 memset ((void *)(base), 0, sizeof (*(base)) * (count))
624
615#define array_needsize(type,base,cur,cnt,init) \ 625#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 626 if (expect_false ((cnt) > (cur))) \
617 { \ 627 { \
618 int ocur_ = (cur); \ 628 int ocur_ = (cur); \
619 (base) = (type *)array_realloc \ 629 (base) = (type *)array_realloc \
… …
661 for (i = 0; i < eventcnt; ++i) 671 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 672 ev_feed_event (EV_A_ events [i], type);
663} 673}
664 674
665/*****************************************************************************/ 675/*****************************************************************************/
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 676
680void inline_speed 677void inline_speed
681fd_event (EV_P_ int fd, int revents) 678fd_event (EV_P_ int fd, int revents)
682{ 679{
683 ANFD *anfd = anfds + fd; 680 ANFD *anfd = anfds + fd;
… …
813 810
814 for (fd = 0; fd < anfdmax; ++fd) 811 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 812 if (anfds [fd].events)
816 { 813 {
817 anfds [fd].events = 0; 814 anfds [fd].events = 0;
815 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 816 fd_change (EV_A_ fd, EV_IOFDSET | 1);
819 } 817 }
820} 818}
821 819
822/*****************************************************************************/ 820/*****************************************************************************/
… …
974static ANSIG *signals; 972static ANSIG *signals;
975static int signalmax; 973static int signalmax;
976 974
977static EV_ATOMIC_T gotsig; 975static EV_ATOMIC_T gotsig;
978 976
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/*****************************************************************************/ 977/*****************************************************************************/
992 978
993void inline_speed 979void inline_speed
994fd_intern (int fd) 980fd_intern (int fd)
995{ 981{
… …
1016 } 1002 }
1017 else 1003 else
1018#endif 1004#endif
1019 { 1005 {
1020 while (pipe (evpipe)) 1006 while (pipe (evpipe))
1021 syserr ("(libev) error creating signal/async pipe"); 1007 ev_syserr ("(libev) error creating signal/async pipe");
1022 1008
1023 fd_intern (evpipe [0]); 1009 fd_intern (evpipe [0]);
1024 fd_intern (evpipe [1]); 1010 fd_intern (evpipe [1]);
1025 ev_io_set (&pipeev, evpipe [0], EV_READ); 1011 ev_io_set (&pipeev, evpipe [0], EV_READ);
1026 } 1012 }
… …
1657{ 1643{
1658#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1645 struct ev_loop *loop = ev_default_loop_ptr;
1660#endif 1646#endif
1661 1647
1648 ev_default_loop_ptr = 0;
1649
1662#ifndef _WIN32 1650#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1651 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1652 ev_signal_stop (EV_A_ &childev);
1665#endif 1653#endif
1666 1654
… …
1672{ 1660{
1673#if EV_MULTIPLICITY 1661#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1662 struct ev_loop *loop = ev_default_loop_ptr;
1675#endif 1663#endif
1676 1664
1677 if (backend)
1678 postfork = 1; /* must be in line with ev_loop_fork */ 1665 postfork = 1; /* must be in line with ev_loop_fork */
1679} 1666}
1680 1667
1681/*****************************************************************************/ 1668/*****************************************************************************/
1682 1669
1683void 1670void
… …
2138 2125
2139 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
2140 return; 2127 return;
2141 2128
2142 assert (("ev_io_start called with negative fd", fd >= 0)); 2129 assert (("ev_io_start called with negative fd", fd >= 0));
2130 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2143 2131
2144 EV_FREQUENT_CHECK; 2132 EV_FREQUENT_CHECK;
2145 2133
2146 ev_start (EV_A_ (W)w, 1); 2134 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2136 wlist_add (&anfds[fd].head, (WL)w);
2149 2137
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2151 w->events &= ~EV_IOFDSET; 2139 w->events &= ~EV_IOFDSET;
2152 2140
… …
2344 sigset_t full, prev; 2332 sigset_t full, prev;
2345 sigfillset (&full); 2333 sigfillset (&full);
2346 sigprocmask (SIG_SETMASK, &full, &prev); 2334 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif 2335#endif
2348 2336
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2350 2338
2351#ifndef _WIN32 2339#ifndef _WIN32
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2340 sigprocmask (SIG_SETMASK, &prev, 0);
2353#endif 2341#endif
2354 } 2342 }
… …
2445 if (w->wd < 0) 2433 if (w->wd < 0)
2446 { 2434 {
2447 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2435 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2448 2436
2449 /* monitor some parent directory for speedup hints */ 2437 /* monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2438 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2439 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2440 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2441 {
2454 char path [4096]; 2442 char path [4096];
2455 strcpy (path, w->path); 2443 strcpy (path, w->path);
… …
2469 } 2457 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2458 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2459 }
2472 } 2460 }
2473 else 2461 else
2462 todo, on nfs etc., we need to poll every 60s or so
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2463 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2464
2476 if (w->wd >= 0) 2465 if (w->wd >= 0)
2477 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2466 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2478} 2467}
… …
2496 2485
2497static void noinline 2486static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2487infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2488{
2500 if (slot < 0) 2489 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2490 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2491 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2492 infy_wd (EV_A_ slot, wd, ev);
2504 else 2493 else
2505 { 2494 {
2506 WL w_; 2495 WL w_;
… …
2540infy_init (EV_P) 2529infy_init (EV_P)
2541{ 2530{
2542 if (fs_fd != -2) 2531 if (fs_fd != -2)
2543 return; 2532 return;
2544 2533
2534 /* kernels < 2.6.25 are borked
2535 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2536 */
2537 {
2538 struct utsname buf;
2539 int major, minor, micro;
2540
2541 fs_fd = -1;
2542
2543 if (uname (&buf))
2544 return;
2545
2546 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2547 return;
2548
2549 if (major < 2
2550 || (major == 2 && minor < 6)
2551 || (major == 2 && minor == 6 && micro < 25))
2552 return;
2553 }
2554
2545 fs_fd = inotify_init (); 2555 fs_fd = inotify_init ();
2546 2556
2547 if (fs_fd >= 0) 2557 if (fs_fd >= 0)
2548 { 2558 {
2549 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2559 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2578 if (fs_fd >= 0) 2588 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 2589 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 2590 else
2581 ev_timer_start (EV_A_ &w->timer); 2591 ev_timer_start (EV_A_ &w->timer);
2582 } 2592 }
2583
2584 } 2593 }
2585} 2594}
2586 2595
2587#endif 2596#endif
2588 2597
… …
2624 || w->prev.st_atime != w->attr.st_atime 2633 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 2634 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 2635 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 2636 ) {
2628 #if EV_USE_INOTIFY 2637 #if EV_USE_INOTIFY
2638 if (fs_fd >= 0)
2639 {
2629 infy_del (EV_A_ w); 2640 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 2641 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 2642 ev_stat_stat (EV_A_ w); /* avoid race... */
2643 }
2632 #endif 2644 #endif
2633 2645
2634 ev_feed_event (EV_A_ w, EV_STAT); 2646 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 2647 }
2636} 2648}

Diff Legend

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