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

Comparing libev/ev.c (file contents):
Revision 1.250 by root, Thu May 22 02:44:57 2008 UTC vs.
Revision 1.263 by root, Wed Oct 1 18:50:03 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
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
278# endif 287# endif
279#endif 288#endif
280 289
281#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
282# include <sys/inotify.h> 291# include <sys/inotify.h>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0
296# endif
283#endif 297#endif
284 298
285#if EV_SELECT_IS_WINSOCKET 299#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 300# include <winsock.h>
287#endif 301#endif
… …
556 struct timeval tv; 570 struct timeval tv;
557 571
558 tv.tv_sec = (time_t)delay; 572 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 573 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 574
575 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
576 /* somehting nto guaranteed by newer posix versions, but guaranteed */
577 /* by older ones */
561 select (0, 0, 0, 0, &tv); 578 select (0, 0, 0, 0, &tv);
562#endif 579#endif
563 } 580 }
564} 581}
565 582
… …
699 events |= (unsigned char)w->events; 716 events |= (unsigned char)w->events;
700 717
701#if EV_SELECT_IS_WINSOCKET 718#if EV_SELECT_IS_WINSOCKET
702 if (events) 719 if (events)
703 { 720 {
704 unsigned long argp; 721 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 722 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 724 #else
708 anfd->handle = _get_osfhandle (fd); 725 anfd->handle = _get_osfhandle (fd);
709 #endif 726 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 727 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 728 }
712#endif 729#endif
713 730
714 { 731 {
715 unsigned char o_events = anfd->events; 732 unsigned char o_events = anfd->events;
… …
768{ 785{
769 int fd; 786 int fd;
770 787
771 for (fd = 0; fd < anfdmax; ++fd) 788 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 789 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 790 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 791 fd_kill (EV_A_ fd);
775} 792}
776 793
777/* called on ENOMEM in select/poll to kill some fds and retry */ 794/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 795static void noinline
… …
937/* rebuild the heap: this function is used only once and executed rarely */ 954/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 955void inline_size
939reheap (ANHE *heap, int N) 956reheap (ANHE *heap, int N)
940{ 957{
941 int i; 958 int i;
959
942 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 960 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
943 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */ 961 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
944 for (i = 0; i < N; ++i) 962 for (i = 0; i < N; ++i)
945 upheap (heap, i + HEAP0); 963 upheap (heap, i + HEAP0);
946} 964}
947 965
948#if EV_VERIFY
949static void
950checkheap (ANHE *heap, int N)
951{
952 int i;
953
954 for (i = HEAP0; i < N + HEAP0; ++i)
955 {
956 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
957 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
958 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
959 }
960}
961#endif
962
963/*****************************************************************************/ 966/*****************************************************************************/
964 967
965typedef struct 968typedef struct
966{ 969{
967 WL head; 970 WL head;
… …
989 992
990void inline_speed 993void inline_speed
991fd_intern (int fd) 994fd_intern (int fd)
992{ 995{
993#ifdef _WIN32 996#ifdef _WIN32
994 int arg = 1; 997 unsigned long arg = 1;
995 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 998 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
996#else 999#else
997 fcntl (fd, F_SETFD, FD_CLOEXEC); 1000 fcntl (fd, F_SETFD, FD_CLOEXEC);
998 fcntl (fd, F_SETFL, O_NONBLOCK); 1001 fcntl (fd, F_SETFL, O_NONBLOCK);
999#endif 1002#endif
… …
1513{ 1516{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1517 postfork = 1; /* must be in line with ev_default_fork */
1515} 1518}
1516 1519
1517#if EV_VERIFY 1520#if EV_VERIFY
1518static void 1521static void noinline
1522verify_watcher (EV_P_ W w)
1523{
1524 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1525
1526 if (w->pending)
1527 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1528}
1529
1530static void noinline
1531verify_heap (EV_P_ ANHE *heap, int N)
1532{
1533 int i;
1534
1535 for (i = HEAP0; i < N + HEAP0; ++i)
1536 {
1537 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1538 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1539 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1540
1541 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1542 }
1543}
1544
1545static void noinline
1519array_check (W **ws, int cnt) 1546array_verify (EV_P_ W *ws, int cnt)
1520{ 1547{
1521 while (cnt--) 1548 while (cnt--)
1549 {
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1550 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1551 verify_watcher (EV_A_ ws [cnt]);
1552 }
1523} 1553}
1524#endif 1554#endif
1525 1555
1526void 1556void
1527ev_loop_verify (EV_P) 1557ev_loop_verify (EV_P)
1528{ 1558{
1529#if EV_VERIFY 1559#if EV_VERIFY
1530 int i; 1560 int i;
1561 WL w;
1531 1562
1563 assert (activecnt >= -1);
1564
1565 assert (fdchangemax >= fdchangecnt);
1566 for (i = 0; i < fdchangecnt; ++i)
1567 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1568
1569 assert (anfdmax >= 0);
1570 for (i = 0; i < anfdmax; ++i)
1571 for (w = anfds [i].head; w; w = w->next)
1572 {
1573 verify_watcher (EV_A_ (W)w);
1574 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1575 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1576 }
1577
1578 assert (timermax >= timercnt);
1532 checkheap (timers, timercnt); 1579 verify_heap (EV_A_ timers, timercnt);
1580
1533#if EV_PERIODIC_ENABLE 1581#if EV_PERIODIC_ENABLE
1582 assert (periodicmax >= periodiccnt);
1534 checkheap (periodics, periodiccnt); 1583 verify_heap (EV_A_ periodics, periodiccnt);
1535#endif 1584#endif
1536 1585
1586 for (i = NUMPRI; i--; )
1587 {
1588 assert (pendingmax [i] >= pendingcnt [i]);
1537#if EV_IDLE_ENABLE 1589#if EV_IDLE_ENABLE
1538 for (i = NUMPRI; i--; ) 1590 assert (idleall >= 0);
1591 assert (idlemax [i] >= idlecnt [i]);
1539 array_check ((W **)idles [i], idlecnt [i]); 1592 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1540#endif 1593#endif
1594 }
1595
1541#if EV_FORK_ENABLE 1596#if EV_FORK_ENABLE
1597 assert (forkmax >= forkcnt);
1542 array_check ((W **)forks, forkcnt); 1598 array_verify (EV_A_ (W *)forks, forkcnt);
1543#endif 1599#endif
1600
1544#if EV_ASYNC_ENABLE 1601#if EV_ASYNC_ENABLE
1602 assert (asyncmax >= asynccnt);
1545 array_check ((W **)asyncs, asynccnt); 1603 array_verify (EV_A_ (W *)asyncs, asynccnt);
1604#endif
1605
1606 assert (preparemax >= preparecnt);
1607 array_verify (EV_A_ (W *)prepares, preparecnt);
1608
1609 assert (checkmax >= checkcnt);
1610 array_verify (EV_A_ (W *)checks, checkcnt);
1611
1612# if 0
1613 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1614 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1546#endif 1615# endif
1547 array_check ((W **)prepares, preparecnt);
1548 array_check ((W **)checks, checkcnt);
1549#endif 1616#endif
1550} 1617}
1551 1618
1552#endif /* multiplicity */ 1619#endif /* multiplicity */
1553 1620
… …
1847ev_unref (EV_P) 1914ev_unref (EV_P)
1848{ 1915{
1849 --activecnt; 1916 --activecnt;
1850} 1917}
1851 1918
1919void
1920ev_now_update (EV_P)
1921{
1922 time_update (EV_A_ 1e100);
1923}
1924
1852static int loop_done; 1925static int loop_done;
1853 1926
1854void 1927void
1855ev_loop (EV_P_ int flags) 1928ev_loop (EV_P_ int flags)
1856{ 1929{
… …
2509 } 2582 }
2510 2583
2511 } 2584 }
2512} 2585}
2513 2586
2587#endif
2588
2589#ifdef _WIN32
2590# define EV_LSTAT(p,b) _stati64 (p, b)
2591#else
2592# define EV_LSTAT(p,b) lstat (p, b)
2514#endif 2593#endif
2515 2594
2516void 2595void
2517ev_stat_stat (EV_P_ ev_stat *w) 2596ev_stat_stat (EV_P_ ev_stat *w)
2518{ 2597{
… …
2759 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2838 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2760 } 2839 }
2761 } 2840 }
2762} 2841}
2763 2842
2843static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847
2848 {
2849 struct ev_loop *loop = w->other;
2850
2851 ev_loop_fork (EV_A);
2852 }
2853}
2854
2764#if 0 2855#if 0
2765static void 2856static void
2766embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2857embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2767{ 2858{
2768 ev_idle_stop (EV_A_ idle); 2859 ev_idle_stop (EV_A_ idle);
… …
2788 2879
2789 ev_prepare_init (&w->prepare, embed_prepare_cb); 2880 ev_prepare_init (&w->prepare, embed_prepare_cb);
2790 ev_set_priority (&w->prepare, EV_MINPRI); 2881 ev_set_priority (&w->prepare, EV_MINPRI);
2791 ev_prepare_start (EV_A_ &w->prepare); 2882 ev_prepare_start (EV_A_ &w->prepare);
2792 2883
2884 ev_fork_init (&w->fork, embed_fork_cb);
2885 ev_fork_start (EV_A_ &w->fork);
2886
2793 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2887 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2794 2888
2795 ev_start (EV_A_ (W)w, 1); 2889 ev_start (EV_A_ (W)w, 1);
2796 2890
2797 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
… …
2804 if (expect_false (!ev_is_active (w))) 2898 if (expect_false (!ev_is_active (w)))
2805 return; 2899 return;
2806 2900
2807 EV_FREQUENT_CHECK; 2901 EV_FREQUENT_CHECK;
2808 2902
2809 ev_io_stop (EV_A_ &w->io); 2903 ev_io_stop (EV_A_ &w->io);
2810 ev_prepare_stop (EV_A_ &w->prepare); 2904 ev_prepare_stop (EV_A_ &w->prepare);
2811 2905 ev_fork_stop (EV_A_ &w->fork);
2812 ev_stop (EV_A_ (W)w);
2813 2906
2814 EV_FREQUENT_CHECK; 2907 EV_FREQUENT_CHECK;
2815} 2908}
2816#endif 2909#endif
2817 2910
… …
2914once_cb (EV_P_ struct ev_once *once, int revents) 3007once_cb (EV_P_ struct ev_once *once, int revents)
2915{ 3008{
2916 void (*cb)(int revents, void *arg) = once->cb; 3009 void (*cb)(int revents, void *arg) = once->cb;
2917 void *arg = once->arg; 3010 void *arg = once->arg;
2918 3011
2919 ev_io_stop (EV_A_ &once->io); 3012 ev_io_stop (EV_A_ &once->io);
2920 ev_timer_stop (EV_A_ &once->to); 3013 ev_timer_stop (EV_A_ &once->to);
2921 ev_free (once); 3014 ev_free (once);
2922 3015
2923 cb (revents, arg); 3016 cb (revents, arg);
2924} 3017}
2925 3018
2926static void 3019static void
2927once_cb_io (EV_P_ ev_io *w, int revents) 3020once_cb_io (EV_P_ ev_io *w, int revents)
2928{ 3021{
2929 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3022 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3023
3024 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2930} 3025}
2931 3026
2932static void 3027static void
2933once_cb_to (EV_P_ ev_timer *w, int revents) 3028once_cb_to (EV_P_ ev_timer *w, int revents)
2934{ 3029{
2935 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3030 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3031
3032 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2936} 3033}
2937 3034
2938void 3035void
2939ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3036ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2940{ 3037{

Diff Legend

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