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

Comparing libev/ev.c (file contents):
Revision 1.254 by root, Wed Jun 4 20:26:55 2008 UTC vs.
Revision 1.271 by root, Mon Nov 3 12:13:15 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
… …
285# include <sys/select.h> 286# include <sys/select.h>
286# endif 287# endif
287#endif 288#endif
288 289
289#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
292# include <sys/statfs.h>
290# 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
291#endif 299#endif
292 300
293#if EV_SELECT_IS_WINSOCKET 301#if EV_SELECT_IS_WINSOCKET
294# include <winsock.h> 302# include <winsock.h>
295#endif 303#endif
… …
381{ 389{
382 syserr_cb = cb; 390 syserr_cb = cb;
383} 391}
384 392
385static void noinline 393static void noinline
386syserr (const char *msg) 394ev_syserr (const char *msg)
387{ 395{
388 if (!msg) 396 if (!msg)
389 msg = "(libev) system error"; 397 msg = "(libev) system error";
390 398
391 if (syserr_cb) 399 if (syserr_cb)
… …
442typedef struct 450typedef struct
443{ 451{
444 WL head; 452 WL head;
445 unsigned char events; 453 unsigned char events;
446 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
447#if EV_SELECT_IS_WINSOCKET 460#if EV_SELECT_IS_WINSOCKET
448 SOCKET handle; 461 SOCKET handle;
449#endif 462#endif
450} ANFD; 463} ANFD;
451 464
… …
564 struct timeval tv; 577 struct timeval tv;
565 578
566 tv.tv_sec = (time_t)delay; 579 tv.tv_sec = (time_t)delay;
567 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568 581
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */
569 select (0, 0, 0, 0, &tv); 585 select (0, 0, 0, 0, &tv);
570#endif 586#endif
571 } 587 }
572} 588}
573 589
… …
600array_realloc (int elem, void *base, int *cur, int cnt) 616array_realloc (int elem, void *base, int *cur, int cnt)
601{ 617{
602 *cur = array_nextsize (elem, *cur, cnt); 618 *cur = array_nextsize (elem, *cur, cnt);
603 return ev_realloc (base, elem * *cur); 619 return ev_realloc (base, elem * *cur);
604} 620}
621
622#define array_init_zero(base,count) \
623 memset ((void *)(base), 0, sizeof (*(base)) * (count))
605 624
606#define array_needsize(type,base,cur,cnt,init) \ 625#define array_needsize(type,base,cur,cnt,init) \
607 if (expect_false ((cnt) > (cur))) \ 626 if (expect_false ((cnt) > (cur))) \
608 { \ 627 { \
609 int ocur_ = (cur); \ 628 int ocur_ = (cur); \
… …
652 for (i = 0; i < eventcnt; ++i) 671 for (i = 0; i < eventcnt; ++i)
653 ev_feed_event (EV_A_ events [i], type); 672 ev_feed_event (EV_A_ events [i], type);
654} 673}
655 674
656/*****************************************************************************/ 675/*****************************************************************************/
657
658void inline_size
659anfds_init (ANFD *base, int count)
660{
661 while (count--)
662 {
663 base->head = 0;
664 base->events = EV_NONE;
665 base->reify = 0;
666
667 ++base;
668 }
669}
670 676
671void inline_speed 677void inline_speed
672fd_event (EV_P_ int fd, int revents) 678fd_event (EV_P_ int fd, int revents)
673{ 679{
674 ANFD *anfd = anfds + fd; 680 ANFD *anfd = anfds + fd;
… …
804 810
805 for (fd = 0; fd < anfdmax; ++fd) 811 for (fd = 0; fd < anfdmax; ++fd)
806 if (anfds [fd].events) 812 if (anfds [fd].events)
807 { 813 {
808 anfds [fd].events = 0; 814 anfds [fd].events = 0;
815 anfds [fd].emask = 0;
809 fd_change (EV_A_ fd, EV_IOFDSET | 1); 816 fd_change (EV_A_ fd, EV_IOFDSET | 1);
810 } 817 }
811} 818}
812 819
813/*****************************************************************************/ 820/*****************************************************************************/
… …
965static ANSIG *signals; 972static ANSIG *signals;
966static int signalmax; 973static int signalmax;
967 974
968static EV_ATOMIC_T gotsig; 975static EV_ATOMIC_T gotsig;
969 976
970void inline_size
971signals_init (ANSIG *base, int count)
972{
973 while (count--)
974 {
975 base->head = 0;
976 base->gotsig = 0;
977
978 ++base;
979 }
980}
981
982/*****************************************************************************/ 977/*****************************************************************************/
983 978
984void inline_speed 979void inline_speed
985fd_intern (int fd) 980fd_intern (int fd)
986{ 981{
… …
1007 } 1002 }
1008 else 1003 else
1009#endif 1004#endif
1010 { 1005 {
1011 while (pipe (evpipe)) 1006 while (pipe (evpipe))
1012 syserr ("(libev) error creating signal/async pipe"); 1007 ev_syserr ("(libev) error creating signal/async pipe");
1013 1008
1014 fd_intern (evpipe [0]); 1009 fd_intern (evpipe [0]);
1015 fd_intern (evpipe [1]); 1010 fd_intern (evpipe [1]);
1016 ev_io_set (&pipeev, evpipe [0], EV_READ); 1011 ev_io_set (&pipeev, evpipe [0], EV_READ);
1017 } 1012 }
… …
1507{ 1502{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1503 postfork = 1; /* must be in line with ev_default_fork */
1509} 1504}
1510 1505
1511#if EV_VERIFY 1506#if EV_VERIFY
1512void noinline 1507static void noinline
1513verify_watcher (EV_P_ W w) 1508verify_watcher (EV_P_ W w)
1514{ 1509{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516 1511
1517 if (w->pending) 1512 if (w->pending)
… …
1648{ 1643{
1649#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1650 struct ev_loop *loop = ev_default_loop_ptr; 1645 struct ev_loop *loop = ev_default_loop_ptr;
1651#endif 1646#endif
1652 1647
1648 ev_default_loop_ptr = 0;
1649
1653#ifndef _WIN32 1650#ifndef _WIN32
1654 ev_ref (EV_A); /* child watcher */ 1651 ev_ref (EV_A); /* child watcher */
1655 ev_signal_stop (EV_A_ &childev); 1652 ev_signal_stop (EV_A_ &childev);
1656#endif 1653#endif
1657 1654
… …
1663{ 1660{
1664#if EV_MULTIPLICITY 1661#if EV_MULTIPLICITY
1665 struct ev_loop *loop = ev_default_loop_ptr; 1662 struct ev_loop *loop = ev_default_loop_ptr;
1666#endif 1663#endif
1667 1664
1668 if (backend)
1669 postfork = 1; /* must be in line with ev_loop_fork */ 1665 postfork = 1; /* must be in line with ev_loop_fork */
1670} 1666}
1671 1667
1672/*****************************************************************************/ 1668/*****************************************************************************/
1673 1669
1674void 1670void
… …
1905ev_unref (EV_P) 1901ev_unref (EV_P)
1906{ 1902{
1907 --activecnt; 1903 --activecnt;
1908} 1904}
1909 1905
1906void
1907ev_now_update (EV_P)
1908{
1909 time_update (EV_A_ 1e100);
1910}
1911
1910static int loop_done; 1912static int loop_done;
1911 1913
1912void 1914void
1913ev_loop (EV_P_ int flags) 1915ev_loop (EV_P_ int flags)
1914{ 1916{
… …
2123 2125
2124 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
2125 return; 2127 return;
2126 2128
2127 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))));
2128 2131
2129 EV_FREQUENT_CHECK; 2132 EV_FREQUENT_CHECK;
2130 2133
2131 ev_start (EV_A_ (W)w, 1); 2134 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2136 wlist_add (&anfds[fd].head, (WL)w);
2134 2137
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2136 w->events &= ~EV_IOFDSET; 2139 w->events &= ~EV_IOFDSET;
2137 2140
… …
2329 sigset_t full, prev; 2332 sigset_t full, prev;
2330 sigfillset (&full); 2333 sigfillset (&full);
2331 sigprocmask (SIG_SETMASK, &full, &prev); 2334 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif 2335#endif
2333 2336
2334 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335 2338
2336#ifndef _WIN32 2339#ifndef _WIN32
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2340 sigprocmask (SIG_SETMASK, &prev, 0);
2338#endif 2341#endif
2339 } 2342 }
… …
2430 if (w->wd < 0) 2433 if (w->wd < 0)
2431 { 2434 {
2432 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 */
2433 2436
2434 /* monitor some parent directory for speedup hints */ 2437 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2438 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2439 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2440 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2441 {
2439 char path [4096]; 2442 char path [4096];
2440 strcpy (path, w->path); 2443 strcpy (path, w->path);
… …
2454 } 2457 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2458 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2459 }
2457 } 2460 }
2458 else 2461 else
2462 todo, on nfs etc., we need to poll every 60s or so
2459 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 */
2460 2464
2461 if (w->wd >= 0) 2465 if (w->wd >= 0)
2462 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);
2463} 2467}
… …
2481 2485
2482static void noinline 2486static void noinline
2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2487infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484{ 2488{
2485 if (slot < 0) 2489 if (slot < 0)
2486 /* overflow, need to check for all hahs slots */ 2490 /* overflow, need to check for all hash slots */
2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2491 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488 infy_wd (EV_A_ slot, wd, ev); 2492 infy_wd (EV_A_ slot, wd, ev);
2489 else 2493 else
2490 { 2494 {
2491 WL w_; 2495 WL w_;
… …
2525infy_init (EV_P) 2529infy_init (EV_P)
2526{ 2530{
2527 if (fs_fd != -2) 2531 if (fs_fd != -2)
2528 return; 2532 return;
2529 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
2530 fs_fd = inotify_init (); 2555 fs_fd = inotify_init ();
2531 2556
2532 if (fs_fd >= 0) 2557 if (fs_fd >= 0)
2533 { 2558 {
2534 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2559 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2563 if (fs_fd >= 0) 2588 if (fs_fd >= 0)
2564 infy_add (EV_A_ w); /* re-add, no matter what */ 2589 infy_add (EV_A_ w); /* re-add, no matter what */
2565 else 2590 else
2566 ev_timer_start (EV_A_ &w->timer); 2591 ev_timer_start (EV_A_ &w->timer);
2567 } 2592 }
2568
2569 } 2593 }
2570} 2594}
2571 2595
2596#endif
2597
2598#ifdef _WIN32
2599# define EV_LSTAT(p,b) _stati64 (p, b)
2600#else
2601# define EV_LSTAT(p,b) lstat (p, b)
2572#endif 2602#endif
2573 2603
2574void 2604void
2575ev_stat_stat (EV_P_ ev_stat *w) 2605ev_stat_stat (EV_P_ ev_stat *w)
2576{ 2606{
… …
2603 || w->prev.st_atime != w->attr.st_atime 2633 || w->prev.st_atime != w->attr.st_atime
2604 || w->prev.st_mtime != w->attr.st_mtime 2634 || w->prev.st_mtime != w->attr.st_mtime
2605 || w->prev.st_ctime != w->attr.st_ctime 2635 || w->prev.st_ctime != w->attr.st_ctime
2606 ) { 2636 ) {
2607 #if EV_USE_INOTIFY 2637 #if EV_USE_INOTIFY
2638 if (fs_fd >= 0)
2639 {
2608 infy_del (EV_A_ w); 2640 infy_del (EV_A_ w);
2609 infy_add (EV_A_ w); 2641 infy_add (EV_A_ w);
2610 ev_stat_stat (EV_A_ w); /* avoid race... */ 2642 ev_stat_stat (EV_A_ w); /* avoid race... */
2643 }
2611 #endif 2644 #endif
2612 2645
2613 ev_feed_event (EV_A_ w, EV_STAT); 2646 ev_feed_event (EV_A_ w, EV_STAT);
2614 } 2647 }
2615} 2648}
… …
2817 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2850 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2818 } 2851 }
2819 } 2852 }
2820} 2853}
2821 2854
2855static void
2856embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2857{
2858 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2859
2860 {
2861 struct ev_loop *loop = w->other;
2862
2863 ev_loop_fork (EV_A);
2864 }
2865}
2866
2822#if 0 2867#if 0
2823static void 2868static void
2824embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2869embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2825{ 2870{
2826 ev_idle_stop (EV_A_ idle); 2871 ev_idle_stop (EV_A_ idle);
… …
2846 2891
2847 ev_prepare_init (&w->prepare, embed_prepare_cb); 2892 ev_prepare_init (&w->prepare, embed_prepare_cb);
2848 ev_set_priority (&w->prepare, EV_MINPRI); 2893 ev_set_priority (&w->prepare, EV_MINPRI);
2849 ev_prepare_start (EV_A_ &w->prepare); 2894 ev_prepare_start (EV_A_ &w->prepare);
2850 2895
2896 ev_fork_init (&w->fork, embed_fork_cb);
2897 ev_fork_start (EV_A_ &w->fork);
2898
2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2899 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2852 2900
2853 ev_start (EV_A_ (W)w, 1); 2901 ev_start (EV_A_ (W)w, 1);
2854 2902
2855 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
… …
2862 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2863 return; 2911 return;
2864 2912
2865 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2866 2914
2867 ev_io_stop (EV_A_ &w->io); 2915 ev_io_stop (EV_A_ &w->io);
2868 ev_prepare_stop (EV_A_ &w->prepare); 2916 ev_prepare_stop (EV_A_ &w->prepare);
2869 2917 ev_fork_stop (EV_A_ &w->fork);
2870 ev_stop (EV_A_ (W)w);
2871 2918
2872 EV_FREQUENT_CHECK; 2919 EV_FREQUENT_CHECK;
2873} 2920}
2874#endif 2921#endif
2875 2922
… …
2972once_cb (EV_P_ struct ev_once *once, int revents) 3019once_cb (EV_P_ struct ev_once *once, int revents)
2973{ 3020{
2974 void (*cb)(int revents, void *arg) = once->cb; 3021 void (*cb)(int revents, void *arg) = once->cb;
2975 void *arg = once->arg; 3022 void *arg = once->arg;
2976 3023
2977 ev_io_stop (EV_A_ &once->io); 3024 ev_io_stop (EV_A_ &once->io);
2978 ev_timer_stop (EV_A_ &once->to); 3025 ev_timer_stop (EV_A_ &once->to);
2979 ev_free (once); 3026 ev_free (once);
2980 3027
2981 cb (revents, arg); 3028 cb (revents, arg);
2982} 3029}
2983 3030
2984static void 3031static void
2985once_cb_io (EV_P_ ev_io *w, int revents) 3032once_cb_io (EV_P_ ev_io *w, int revents)
2986{ 3033{
2987 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3034 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3035
3036 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2988} 3037}
2989 3038
2990static void 3039static void
2991once_cb_to (EV_P_ ev_timer *w, int revents) 3040once_cb_to (EV_P_ ev_timer *w, int revents)
2992{ 3041{
2993 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3042 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3043
3044 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2994} 3045}
2995 3046
2996void 3047void
2997ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3048ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2998{ 3049{

Diff Legend

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