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

Comparing libev/ev.c (file contents):
Revision 1.255 by root, Mon Jun 9 14:11:30 2008 UTC vs.
Revision 1.272 by root, Mon Nov 3 12:17:40 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>
290# 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
291#endif 298#endif
292 299
293#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
294# include <winsock.h> 301# include <winsock.h>
295#endif 302#endif
… …
381{ 388{
382 syserr_cb = cb; 389 syserr_cb = cb;
383} 390}
384 391
385static void noinline 392static void noinline
386syserr (const char *msg) 393ev_syserr (const char *msg)
387{ 394{
388 if (!msg) 395 if (!msg)
389 msg = "(libev) system error"; 396 msg = "(libev) system error";
390 397
391 if (syserr_cb) 398 if (syserr_cb)
… …
442typedef struct 449typedef struct
443{ 450{
444 WL head; 451 WL head;
445 unsigned char events; 452 unsigned char events;
446 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;
456#if EV_USE_EPOLL
457 unsigned int egen; /* generation counter to counter epoll bugs */
458#endif
447#if EV_SELECT_IS_WINSOCKET 459#if EV_SELECT_IS_WINSOCKET
448 SOCKET handle; 460 SOCKET handle;
449#endif 461#endif
450} ANFD; 462} ANFD;
451 463
… …
564 struct timeval tv; 576 struct timeval tv;
565 577
566 tv.tv_sec = (time_t)delay; 578 tv.tv_sec = (time_t)delay;
567 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 579 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568 580
581 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
582 /* somehting nto guaranteed by newer posix versions, but guaranteed */
583 /* by older ones */
569 select (0, 0, 0, 0, &tv); 584 select (0, 0, 0, 0, &tv);
570#endif 585#endif
571 } 586 }
572} 587}
573 588
… …
600array_realloc (int elem, void *base, int *cur, int cnt) 615array_realloc (int elem, void *base, int *cur, int cnt)
601{ 616{
602 *cur = array_nextsize (elem, *cur, cnt); 617 *cur = array_nextsize (elem, *cur, cnt);
603 return ev_realloc (base, elem * *cur); 618 return ev_realloc (base, elem * *cur);
604} 619}
620
621#define array_init_zero(base,count) \
622 memset ((void *)(base), 0, sizeof (*(base)) * (count))
605 623
606#define array_needsize(type,base,cur,cnt,init) \ 624#define array_needsize(type,base,cur,cnt,init) \
607 if (expect_false ((cnt) > (cur))) \ 625 if (expect_false ((cnt) > (cur))) \
608 { \ 626 { \
609 int ocur_ = (cur); \ 627 int ocur_ = (cur); \
… …
652 for (i = 0; i < eventcnt; ++i) 670 for (i = 0; i < eventcnt; ++i)
653 ev_feed_event (EV_A_ events [i], type); 671 ev_feed_event (EV_A_ events [i], type);
654} 672}
655 673
656/*****************************************************************************/ 674/*****************************************************************************/
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 675
671void inline_speed 676void inline_speed
672fd_event (EV_P_ int fd, int revents) 677fd_event (EV_P_ int fd, int revents)
673{ 678{
674 ANFD *anfd = anfds + fd; 679 ANFD *anfd = anfds + fd;
… …
804 809
805 for (fd = 0; fd < anfdmax; ++fd) 810 for (fd = 0; fd < anfdmax; ++fd)
806 if (anfds [fd].events) 811 if (anfds [fd].events)
807 { 812 {
808 anfds [fd].events = 0; 813 anfds [fd].events = 0;
814 anfds [fd].emask = 0;
809 fd_change (EV_A_ fd, EV_IOFDSET | 1); 815 fd_change (EV_A_ fd, EV_IOFDSET | 1);
810 } 816 }
811} 817}
812 818
813/*****************************************************************************/ 819/*****************************************************************************/
… …
965static ANSIG *signals; 971static ANSIG *signals;
966static int signalmax; 972static int signalmax;
967 973
968static EV_ATOMIC_T gotsig; 974static EV_ATOMIC_T gotsig;
969 975
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/*****************************************************************************/ 976/*****************************************************************************/
983 977
984void inline_speed 978void inline_speed
985fd_intern (int fd) 979fd_intern (int fd)
986{ 980{
… …
1007 } 1001 }
1008 else 1002 else
1009#endif 1003#endif
1010 { 1004 {
1011 while (pipe (evpipe)) 1005 while (pipe (evpipe))
1012 syserr ("(libev) error creating signal/async pipe"); 1006 ev_syserr ("(libev) error creating signal/async pipe");
1013 1007
1014 fd_intern (evpipe [0]); 1008 fd_intern (evpipe [0]);
1015 fd_intern (evpipe [1]); 1009 fd_intern (evpipe [1]);
1016 ev_io_set (&pipeev, evpipe [0], EV_READ); 1010 ev_io_set (&pipeev, evpipe [0], EV_READ);
1017 } 1011 }
… …
1507{ 1501{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1502 postfork = 1; /* must be in line with ev_default_fork */
1509} 1503}
1510 1504
1511#if EV_VERIFY 1505#if EV_VERIFY
1512void noinline 1506static void noinline
1513verify_watcher (EV_P_ W w) 1507verify_watcher (EV_P_ W w)
1514{ 1508{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1509 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516 1510
1517 if (w->pending) 1511 if (w->pending)
… …
1648{ 1642{
1649#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1650 struct ev_loop *loop = ev_default_loop_ptr; 1644 struct ev_loop *loop = ev_default_loop_ptr;
1651#endif 1645#endif
1652 1646
1647 ev_default_loop_ptr = 0;
1648
1653#ifndef _WIN32 1649#ifndef _WIN32
1654 ev_ref (EV_A); /* child watcher */ 1650 ev_ref (EV_A); /* child watcher */
1655 ev_signal_stop (EV_A_ &childev); 1651 ev_signal_stop (EV_A_ &childev);
1656#endif 1652#endif
1657 1653
… …
1663{ 1659{
1664#if EV_MULTIPLICITY 1660#if EV_MULTIPLICITY
1665 struct ev_loop *loop = ev_default_loop_ptr; 1661 struct ev_loop *loop = ev_default_loop_ptr;
1666#endif 1662#endif
1667 1663
1668 if (backend)
1669 postfork = 1; /* must be in line with ev_loop_fork */ 1664 postfork = 1; /* must be in line with ev_loop_fork */
1670} 1665}
1671 1666
1672/*****************************************************************************/ 1667/*****************************************************************************/
1673 1668
1674void 1669void
… …
1905ev_unref (EV_P) 1900ev_unref (EV_P)
1906{ 1901{
1907 --activecnt; 1902 --activecnt;
1908} 1903}
1909 1904
1905void
1906ev_now_update (EV_P)
1907{
1908 time_update (EV_A_ 1e100);
1909}
1910
1910static int loop_done; 1911static int loop_done;
1911 1912
1912void 1913void
1913ev_loop (EV_P_ int flags) 1914ev_loop (EV_P_ int flags)
1914{ 1915{
… …
2123 2124
2124 if (expect_false (ev_is_active (w))) 2125 if (expect_false (ev_is_active (w)))
2125 return; 2126 return;
2126 2127
2127 assert (("ev_io_start called with negative fd", fd >= 0)); 2128 assert (("ev_io_start called with negative fd", fd >= 0));
2129 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2128 2130
2129 EV_FREQUENT_CHECK; 2131 EV_FREQUENT_CHECK;
2130 2132
2131 ev_start (EV_A_ (W)w, 1); 2133 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2134 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2135 wlist_add (&anfds[fd].head, (WL)w);
2134 2136
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2137 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
2136 w->events &= ~EV_IOFDSET; 2138 w->events &= ~EV_IOFDSET;
2137 2139
… …
2329 sigset_t full, prev; 2331 sigset_t full, prev;
2330 sigfillset (&full); 2332 sigfillset (&full);
2331 sigprocmask (SIG_SETMASK, &full, &prev); 2333 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif 2334#endif
2333 2335
2334 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2336 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335 2337
2336#ifndef _WIN32 2338#ifndef _WIN32
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2339 sigprocmask (SIG_SETMASK, &prev, 0);
2338#endif 2340#endif
2339 } 2341 }
… …
2430 if (w->wd < 0) 2432 if (w->wd < 0)
2431 { 2433 {
2432 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2434 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2433 2435
2434 /* monitor some parent directory for speedup hints */ 2436 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2437 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2438 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2439 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2440 {
2439 char path [4096]; 2441 char path [4096];
2440 strcpy (path, w->path); 2442 strcpy (path, w->path);
… …
2481 2483
2482static void noinline 2484static void noinline
2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2485infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484{ 2486{
2485 if (slot < 0) 2487 if (slot < 0)
2486 /* overflow, need to check for all hahs slots */ 2488 /* overflow, need to check for all hash slots */
2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2489 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488 infy_wd (EV_A_ slot, wd, ev); 2490 infy_wd (EV_A_ slot, wd, ev);
2489 else 2491 else
2490 { 2492 {
2491 WL w_; 2493 WL w_;
… …
2525infy_init (EV_P) 2527infy_init (EV_P)
2526{ 2528{
2527 if (fs_fd != -2) 2529 if (fs_fd != -2)
2528 return; 2530 return;
2529 2531
2532 /* kernels < 2.6.25 are borked
2533 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2534 */
2535 {
2536 struct utsname buf;
2537 int major, minor, micro;
2538
2539 fs_fd = -1;
2540
2541 if (uname (&buf))
2542 return;
2543
2544 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2545 return;
2546
2547 if (major < 2
2548 || (major == 2 && minor < 6)
2549 || (major == 2 && minor == 6 && micro < 25))
2550 return;
2551 }
2552
2530 fs_fd = inotify_init (); 2553 fs_fd = inotify_init ();
2531 2554
2532 if (fs_fd >= 0) 2555 if (fs_fd >= 0)
2533 { 2556 {
2534 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2557 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2563 if (fs_fd >= 0) 2586 if (fs_fd >= 0)
2564 infy_add (EV_A_ w); /* re-add, no matter what */ 2587 infy_add (EV_A_ w); /* re-add, no matter what */
2565 else 2588 else
2566 ev_timer_start (EV_A_ &w->timer); 2589 ev_timer_start (EV_A_ &w->timer);
2567 } 2590 }
2568
2569 } 2591 }
2570} 2592}
2571 2593
2572#endif 2594#endif
2573 2595
… …
2609 || w->prev.st_atime != w->attr.st_atime 2631 || w->prev.st_atime != w->attr.st_atime
2610 || w->prev.st_mtime != w->attr.st_mtime 2632 || w->prev.st_mtime != w->attr.st_mtime
2611 || w->prev.st_ctime != w->attr.st_ctime 2633 || w->prev.st_ctime != w->attr.st_ctime
2612 ) { 2634 ) {
2613 #if EV_USE_INOTIFY 2635 #if EV_USE_INOTIFY
2636 if (fs_fd >= 0)
2637 {
2614 infy_del (EV_A_ w); 2638 infy_del (EV_A_ w);
2615 infy_add (EV_A_ w); 2639 infy_add (EV_A_ w);
2616 ev_stat_stat (EV_A_ w); /* avoid race... */ 2640 ev_stat_stat (EV_A_ w); /* avoid race... */
2641 }
2617 #endif 2642 #endif
2618 2643
2619 ev_feed_event (EV_A_ w, EV_STAT); 2644 ev_feed_event (EV_A_ w, EV_STAT);
2620 } 2645 }
2621} 2646}
… …
2823 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2848 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2824 } 2849 }
2825 } 2850 }
2826} 2851}
2827 2852
2853static void
2854embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2855{
2856 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2857
2858 {
2859 struct ev_loop *loop = w->other;
2860
2861 ev_loop_fork (EV_A);
2862 }
2863}
2864
2828#if 0 2865#if 0
2829static void 2866static void
2830embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2867embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2831{ 2868{
2832 ev_idle_stop (EV_A_ idle); 2869 ev_idle_stop (EV_A_ idle);
… …
2852 2889
2853 ev_prepare_init (&w->prepare, embed_prepare_cb); 2890 ev_prepare_init (&w->prepare, embed_prepare_cb);
2854 ev_set_priority (&w->prepare, EV_MINPRI); 2891 ev_set_priority (&w->prepare, EV_MINPRI);
2855 ev_prepare_start (EV_A_ &w->prepare); 2892 ev_prepare_start (EV_A_ &w->prepare);
2856 2893
2894 ev_fork_init (&w->fork, embed_fork_cb);
2895 ev_fork_start (EV_A_ &w->fork);
2896
2857 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2897 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2858 2898
2859 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2860 2900
2861 EV_FREQUENT_CHECK; 2901 EV_FREQUENT_CHECK;
… …
2868 if (expect_false (!ev_is_active (w))) 2908 if (expect_false (!ev_is_active (w)))
2869 return; 2909 return;
2870 2910
2871 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2872 2912
2873 ev_io_stop (EV_A_ &w->io); 2913 ev_io_stop (EV_A_ &w->io);
2874 ev_prepare_stop (EV_A_ &w->prepare); 2914 ev_prepare_stop (EV_A_ &w->prepare);
2875 2915 ev_fork_stop (EV_A_ &w->fork);
2876 ev_stop (EV_A_ (W)w);
2877 2916
2878 EV_FREQUENT_CHECK; 2917 EV_FREQUENT_CHECK;
2879} 2918}
2880#endif 2919#endif
2881 2920
… …
2978once_cb (EV_P_ struct ev_once *once, int revents) 3017once_cb (EV_P_ struct ev_once *once, int revents)
2979{ 3018{
2980 void (*cb)(int revents, void *arg) = once->cb; 3019 void (*cb)(int revents, void *arg) = once->cb;
2981 void *arg = once->arg; 3020 void *arg = once->arg;
2982 3021
2983 ev_io_stop (EV_A_ &once->io); 3022 ev_io_stop (EV_A_ &once->io);
2984 ev_timer_stop (EV_A_ &once->to); 3023 ev_timer_stop (EV_A_ &once->to);
2985 ev_free (once); 3024 ev_free (once);
2986 3025
2987 cb (revents, arg); 3026 cb (revents, arg);
2988} 3027}
2989 3028
2990static void 3029static void
2991once_cb_io (EV_P_ ev_io *w, int revents) 3030once_cb_io (EV_P_ ev_io *w, int revents)
2992{ 3031{
2993 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3032 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3033
3034 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2994} 3035}
2995 3036
2996static void 3037static void
2997once_cb_to (EV_P_ ev_timer *w, int revents) 3038once_cb_to (EV_P_ ev_timer *w, int revents)
2998{ 3039{
2999 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3040 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3041
3042 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3000} 3043}
3001 3044
3002void 3045void
3003ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3046ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3004{ 3047{

Diff Legend

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