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.273 by root, Mon Nov 3 14:27:06 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>
294/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
295# ifndef IN_DONT_FOLLOW
296# undef EV_USE_INOTIFY
297# define EV_USE_INOTIFY 0
298# endif
292#endif 299#endif
293 300
294#if EV_SELECT_IS_WINSOCKET 301#if EV_SELECT_IS_WINSOCKET
295# include <winsock.h> 302# include <winsock.h>
296#endif 303#endif
382{ 389{
383 syserr_cb = cb; 390 syserr_cb = cb;
384} 391}
385 392
386static void noinline 393static void noinline
387syserr (const char *msg) 394ev_syserr (const char *msg)
388{ 395{
389 if (!msg) 396 if (!msg)
390 msg = "(libev) system error"; 397 msg = "(libev) system error";
391 398
392 if (syserr_cb) 399 if (syserr_cb)
443typedef struct 450typedef struct
444{ 451{
445 WL head; 452 WL head;
446 unsigned char events; 453 unsigned char events;
447 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
448#if EV_SELECT_IS_WINSOCKET 460#if EV_SELECT_IS_WINSOCKET
449 SOCKET handle; 461 SOCKET handle;
450#endif 462#endif
451} ANFD; 463} ANFD;
452 464
605{ 617{
606 *cur = array_nextsize (elem, *cur, cnt); 618 *cur = array_nextsize (elem, *cur, cnt);
607 return ev_realloc (base, elem * *cur); 619 return ev_realloc (base, elem * *cur);
608} 620}
609 621
622#define array_init_zero(base,count) \
623 memset ((void *)(base), 0, sizeof (*(base)) * (count))
624
610#define array_needsize(type,base,cur,cnt,init) \ 625#define array_needsize(type,base,cur,cnt,init) \
611 if (expect_false ((cnt) > (cur))) \ 626 if (expect_false ((cnt) > (cur))) \
612 { \ 627 { \
613 int ocur_ = (cur); \ 628 int ocur_ = (cur); \
614 (base) = (type *)array_realloc \ 629 (base) = (type *)array_realloc \
656 for (i = 0; i < eventcnt; ++i) 671 for (i = 0; i < eventcnt; ++i)
657 ev_feed_event (EV_A_ events [i], type); 672 ev_feed_event (EV_A_ events [i], type);
658} 673}
659 674
660/*****************************************************************************/ 675/*****************************************************************************/
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 676
675void inline_speed 677void inline_speed
676fd_event (EV_P_ int fd, int revents) 678fd_event (EV_P_ int fd, int revents)
677{ 679{
678 ANFD *anfd = anfds + fd; 680 ANFD *anfd = anfds + fd;
808 810
809 for (fd = 0; fd < anfdmax; ++fd) 811 for (fd = 0; fd < anfdmax; ++fd)
810 if (anfds [fd].events) 812 if (anfds [fd].events)
811 { 813 {
812 anfds [fd].events = 0; 814 anfds [fd].events = 0;
815 anfds [fd].emask = 0;
813 fd_change (EV_A_ fd, EV_IOFDSET | 1); 816 fd_change (EV_A_ fd, EV_IOFDSET | 1);
814 } 817 }
815} 818}
816 819
817/*****************************************************************************/ 820/*****************************************************************************/
969static ANSIG *signals; 972static ANSIG *signals;
970static int signalmax; 973static int signalmax;
971 974
972static EV_ATOMIC_T gotsig; 975static EV_ATOMIC_T gotsig;
973 976
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/*****************************************************************************/ 977/*****************************************************************************/
987 978
988void inline_speed 979void inline_speed
989fd_intern (int fd) 980fd_intern (int fd)
990{ 981{
1011 } 1002 }
1012 else 1003 else
1013#endif 1004#endif
1014 { 1005 {
1015 while (pipe (evpipe)) 1006 while (pipe (evpipe))
1016 syserr ("(libev) error creating signal/async pipe"); 1007 ev_syserr ("(libev) error creating signal/async pipe");
1017 1008
1018 fd_intern (evpipe [0]); 1009 fd_intern (evpipe [0]);
1019 fd_intern (evpipe [1]); 1010 fd_intern (evpipe [1]);
1020 ev_io_set (&pipeev, evpipe [0], EV_READ); 1011 ev_io_set (&pipeev, evpipe [0], EV_READ);
1021 } 1012 }
1652{ 1643{
1653#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1654 struct ev_loop *loop = ev_default_loop_ptr; 1645 struct ev_loop *loop = ev_default_loop_ptr;
1655#endif 1646#endif
1656 1647
1648 ev_default_loop_ptr = 0;
1649
1657#ifndef _WIN32 1650#ifndef _WIN32
1658 ev_ref (EV_A); /* child watcher */ 1651 ev_ref (EV_A); /* child watcher */
1659 ev_signal_stop (EV_A_ &childev); 1652 ev_signal_stop (EV_A_ &childev);
1660#endif 1653#endif
1661 1654
1667{ 1660{
1668#if EV_MULTIPLICITY 1661#if EV_MULTIPLICITY
1669 struct ev_loop *loop = ev_default_loop_ptr; 1662 struct ev_loop *loop = ev_default_loop_ptr;
1670#endif 1663#endif
1671 1664
1672 if (backend)
1673 postfork = 1; /* must be in line with ev_loop_fork */ 1665 postfork = 1; /* must be in line with ev_loop_fork */
1674} 1666}
1675 1667
1676/*****************************************************************************/ 1668/*****************************************************************************/
1677 1669
1678void 1670void
2133 2125
2134 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
2135 return; 2127 return;
2136 2128
2137 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))));
2138 2131
2139 EV_FREQUENT_CHECK; 2132 EV_FREQUENT_CHECK;
2140 2133
2141 ev_start (EV_A_ (W)w, 1); 2134 ev_start (EV_A_ (W)w, 1);
2142 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2143 wlist_add (&anfds[fd].head, (WL)w); 2136 wlist_add (&anfds[fd].head, (WL)w);
2144 2137
2145 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2146 w->events &= ~EV_IOFDSET; 2139 w->events &= ~EV_IOFDSET;
2147 2140
2339 sigset_t full, prev; 2332 sigset_t full, prev;
2340 sigfillset (&full); 2333 sigfillset (&full);
2341 sigprocmask (SIG_SETMASK, &full, &prev); 2334 sigprocmask (SIG_SETMASK, &full, &prev);
2342#endif 2335#endif
2343 2336
2344 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2345 2338
2346#ifndef _WIN32 2339#ifndef _WIN32
2347 sigprocmask (SIG_SETMASK, &prev, 0); 2340 sigprocmask (SIG_SETMASK, &prev, 0);
2348#endif 2341#endif
2349 } 2342 }
2422# ifdef _WIN32 2415# ifdef _WIN32
2423# undef lstat 2416# undef lstat
2424# define lstat(a,b) _stati64 (a,b) 2417# define lstat(a,b) _stati64 (a,b)
2425# endif 2418# endif
2426 2419
2427#define DEF_STAT_INTERVAL 5.0074891 2420#define DEF_STAT_INTERVAL 5.0074891
2421#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2428#define MIN_STAT_INTERVAL 0.1074891 2422#define MIN_STAT_INTERVAL 0.1074891
2429 2423
2430static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2424static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2431 2425
2432#if EV_USE_INOTIFY 2426#if EV_USE_INOTIFY
2433# define EV_INOTIFY_BUFSIZE 8192 2427# define EV_INOTIFY_BUFSIZE 8192
2437{ 2431{
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); 2432 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 2433
2440 if (w->wd < 0) 2434 if (w->wd < 0)
2441 { 2435 {
2436 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 */ 2437 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2443 2438
2444 /* monitor some parent directory for speedup hints */ 2439 /* monitor some parent directory for speedup hints */
2445 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2440 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2446 /* but an efficiency issue only */ 2441 /* but an efficiency issue only */
2447 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2442 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2448 { 2443 {
2449 char path [4096]; 2444 char path [4096];
2450 strcpy (path, w->path); 2445 strcpy (path, w->path);
2464 } 2459 }
2465 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2460 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2466 } 2461 }
2467 } 2462 }
2468 else 2463 else
2469 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */ 2464 {
2470
2471 if (w->wd >= 0)
2472 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2465 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2466
2467 /* now local changes will be tracked by inotify, but remote changes won't */
2468 /* unless the filesystem it known to be local, we therefore still poll */
2469 /* also do poll on <2.6.25, but with normal frequency */
2470 struct statfs sfs;
2471
2472 if (fs_2625 && !statfs (w->path, &sfs))
2473 if (sfs.f_type == 0x1373 /* devfs */
2474 || sfs.f_type == 0xEF53 /* ext2/3 */
2475 || sfs.f_type == 0x3153464a /* jfs */
2476 || sfs.f_type == 0x52654973 /* reiser3 */
2477 || sfs.f_type == 0x01021994 /* tempfs */
2478 || sfs.f_type == 0x58465342 /* xfs */)
2479 return;
2480
2481 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2482 ev_timer_again (EV_A_ &w->timer);
2483 }
2473} 2484}
2474 2485
2475static void noinline 2486static void noinline
2476infy_del (EV_P_ ev_stat *w) 2487infy_del (EV_P_ ev_stat *w)
2477{ 2488{
2491 2502
2492static void noinline 2503static void noinline
2493infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2504infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2494{ 2505{
2495 if (slot < 0) 2506 if (slot < 0)
2496 /* overflow, need to check for all hahs slots */ 2507 /* overflow, need to check for all hash slots */
2497 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2508 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2498 infy_wd (EV_A_ slot, wd, ev); 2509 infy_wd (EV_A_ slot, wd, ev);
2499 else 2510 else
2500 { 2511 {
2501 WL w_; 2512 WL w_;
2530 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2541 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2531 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2542 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2532} 2543}
2533 2544
2534void inline_size 2545void inline_size
2546check_2625 (EV_P)
2547{
2548 /* kernels < 2.6.25 are borked
2549 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2550 */
2551 struct utsname buf;
2552 int major, minor, micro;
2553
2554 if (uname (&buf))
2555 return;
2556
2557 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2558 return;
2559
2560 if (major < 2
2561 || (major == 2 && minor < 6)
2562 || (major == 2 && minor == 6 && micro < 25))
2563 return;
2564
2565 fs_2625 = 1;
2566}
2567
2568void inline_size
2535infy_init (EV_P) 2569infy_init (EV_P)
2536{ 2570{
2537 if (fs_fd != -2) 2571 if (fs_fd != -2)
2538 return; 2572 return;
2573
2574 fs_fd = -1;
2575
2576 check_2625 (EV_A);
2539 2577
2540 fs_fd = inotify_init (); 2578 fs_fd = inotify_init ();
2541 2579
2542 if (fs_fd >= 0) 2580 if (fs_fd >= 0)
2543 { 2581 {
2571 w->wd = -1; 2609 w->wd = -1;
2572 2610
2573 if (fs_fd >= 0) 2611 if (fs_fd >= 0)
2574 infy_add (EV_A_ w); /* re-add, no matter what */ 2612 infy_add (EV_A_ w); /* re-add, no matter what */
2575 else 2613 else
2576 ev_timer_start (EV_A_ &w->timer); 2614 ev_timer_again (EV_A_ &w->timer);
2577 } 2615 }
2578
2579 } 2616 }
2580} 2617}
2581 2618
2582#endif 2619#endif
2583 2620
2619 || w->prev.st_atime != w->attr.st_atime 2656 || w->prev.st_atime != w->attr.st_atime
2620 || w->prev.st_mtime != w->attr.st_mtime 2657 || w->prev.st_mtime != w->attr.st_mtime
2621 || w->prev.st_ctime != w->attr.st_ctime 2658 || w->prev.st_ctime != w->attr.st_ctime
2622 ) { 2659 ) {
2623 #if EV_USE_INOTIFY 2660 #if EV_USE_INOTIFY
2661 if (fs_fd >= 0)
2662 {
2624 infy_del (EV_A_ w); 2663 infy_del (EV_A_ w);
2625 infy_add (EV_A_ w); 2664 infy_add (EV_A_ w);
2626 ev_stat_stat (EV_A_ w); /* avoid race... */ 2665 ev_stat_stat (EV_A_ w); /* avoid race... */
2666 }
2627 #endif 2667 #endif
2628 2668
2629 ev_feed_event (EV_A_ w, EV_STAT); 2669 ev_feed_event (EV_A_ w, EV_STAT);
2630 } 2670 }
2631} 2671}
2634ev_stat_start (EV_P_ ev_stat *w) 2674ev_stat_start (EV_P_ ev_stat *w)
2635{ 2675{
2636 if (expect_false (ev_is_active (w))) 2676 if (expect_false (ev_is_active (w)))
2637 return; 2677 return;
2638 2678
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); 2679 ev_stat_stat (EV_A_ w);
2644 2680
2681 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2645 if (w->interval < MIN_STAT_INTERVAL) 2682 w->interval = MIN_STAT_INTERVAL;
2646 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2647 2683
2648 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2684 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)); 2685 ev_set_priority (&w->timer, ev_priority (w));
2650 2686
2651#if EV_USE_INOTIFY 2687#if EV_USE_INOTIFY
2652 infy_init (EV_A); 2688 infy_init (EV_A);
2653 2689
2654 if (fs_fd >= 0) 2690 if (fs_fd >= 0)
2655 infy_add (EV_A_ w); 2691 infy_add (EV_A_ w);
2656 else 2692 else
2657#endif 2693#endif
2658 ev_timer_start (EV_A_ &w->timer); 2694 ev_timer_again (EV_A_ &w->timer);
2659 2695
2660 ev_start (EV_A_ (W)w, 1); 2696 ev_start (EV_A_ (W)w, 1);
2661 2697
2662 EV_FREQUENT_CHECK; 2698 EV_FREQUENT_CHECK;
2663} 2699}
2833 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2869 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2834 } 2870 }
2835 } 2871 }
2836} 2872}
2837 2873
2874static void
2875embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2876{
2877 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2878
2879 {
2880 struct ev_loop *loop = w->other;
2881
2882 ev_loop_fork (EV_A);
2883 }
2884}
2885
2838#if 0 2886#if 0
2839static void 2887static void
2840embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2888embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2841{ 2889{
2842 ev_idle_stop (EV_A_ idle); 2890 ev_idle_stop (EV_A_ idle);
2862 2910
2863 ev_prepare_init (&w->prepare, embed_prepare_cb); 2911 ev_prepare_init (&w->prepare, embed_prepare_cb);
2864 ev_set_priority (&w->prepare, EV_MINPRI); 2912 ev_set_priority (&w->prepare, EV_MINPRI);
2865 ev_prepare_start (EV_A_ &w->prepare); 2913 ev_prepare_start (EV_A_ &w->prepare);
2866 2914
2915 ev_fork_init (&w->fork, embed_fork_cb);
2916 ev_fork_start (EV_A_ &w->fork);
2917
2867 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2918 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2868 2919
2869 ev_start (EV_A_ (W)w, 1); 2920 ev_start (EV_A_ (W)w, 1);
2870 2921
2871 EV_FREQUENT_CHECK; 2922 EV_FREQUENT_CHECK;
2878 if (expect_false (!ev_is_active (w))) 2929 if (expect_false (!ev_is_active (w)))
2879 return; 2930 return;
2880 2931
2881 EV_FREQUENT_CHECK; 2932 EV_FREQUENT_CHECK;
2882 2933
2883 ev_io_stop (EV_A_ &w->io); 2934 ev_io_stop (EV_A_ &w->io);
2884 ev_prepare_stop (EV_A_ &w->prepare); 2935 ev_prepare_stop (EV_A_ &w->prepare);
2885 2936 ev_fork_stop (EV_A_ &w->fork);
2886 ev_stop (EV_A_ (W)w);
2887 2937
2888 EV_FREQUENT_CHECK; 2938 EV_FREQUENT_CHECK;
2889} 2939}
2890#endif 2940#endif
2891 2941
2998} 3048}
2999 3049
3000static void 3050static void
3001once_cb_io (EV_P_ ev_io *w, int revents) 3051once_cb_io (EV_P_ ev_io *w, int revents)
3002{ 3052{
3003 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3053 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3054
3055 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
3004} 3056}
3005 3057
3006static void 3058static void
3007once_cb_to (EV_P_ ev_timer *w, int revents) 3059once_cb_to (EV_P_ ev_timer *w, int revents)
3008{ 3060{
3009 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3061 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3062
3063 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3010} 3064}
3011 3065
3012void 3066void
3013ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3067ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3014{ 3068{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines