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

Comparing libev/ev.c (file contents):
Revision 1.249 by root, Wed May 21 23:30:52 2008 UTC vs.
Revision 1.260 by root, Mon Sep 8 17:24:39 2008 UTC

… …
126# define EV_USE_EVENTFD 1 126# define EV_USE_EVENTFD 1
127# else 127# else
128# define EV_USE_EVENTFD 0 128# define EV_USE_EVENTFD 0
129# endif 129# endif
130# endif 130# endif
131 131
132#endif 132#endif
133 133
134#include <math.h> 134#include <math.h>
135#include <stdlib.h> 135#include <stdlib.h>
136#include <fcntl.h> 136#include <fcntl.h>
… …
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
… …
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
238#endif 247#endif
239 248
240#if 0 /* debugging */ 249#if 0 /* debugging */
241# define EV_VERIFY 1 250# define EV_VERIFY 3
242# define EV_USE_4HEAP 1 251# define EV_USE_4HEAP 1
243# define EV_HEAP_CACHE_AT 1 252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
244#endif 257#endif
245 258
246#ifndef EV_USE_4HEAP 259#ifndef EV_USE_4HEAP
247# define EV_USE_4HEAP !EV_MINIMAL 260# define EV_USE_4HEAP !EV_MINIMAL
248#endif 261#endif
… …
294# endif 307# endif
295#endif 308#endif
296 309
297/**/ 310/**/
298 311
299/* EV_VERIFY: enable internal consistency checks
300 * undefined or zero: no verification done or available
301 * 1 or higher: ev_loop_verify function available
302 * 2 or higher: ev_loop_verify is called frequently
303 */
304#if EV_VERIFY >= 1 312#if EV_VERIFY >= 3
305# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 313# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
306#else 314#else
307# define EV_FREQUENT_CHECK do { } while (0) 315# define EV_FREQUENT_CHECK do { } while (0)
308#endif 316#endif
309 317
… …
557 struct timeval tv; 565 struct timeval tv;
558 566
559 tv.tv_sec = (time_t)delay; 567 tv.tv_sec = (time_t)delay;
560 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
561 569
570 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
571 /* somehting nto guaranteed by newer posix versions, but guaranteed */
572 /* by older ones */
562 select (0, 0, 0, 0, &tv); 573 select (0, 0, 0, 0, &tv);
563#endif 574#endif
564 } 575 }
565} 576}
566 577
… …
700 events |= (unsigned char)w->events; 711 events |= (unsigned char)w->events;
701 712
702#if EV_SELECT_IS_WINSOCKET 713#if EV_SELECT_IS_WINSOCKET
703 if (events) 714 if (events)
704 { 715 {
705 unsigned long argp; 716 unsigned long arg;
706 #ifdef EV_FD_TO_WIN32_HANDLE 717 #ifdef EV_FD_TO_WIN32_HANDLE
707 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
708 #else 719 #else
709 anfd->handle = _get_osfhandle (fd); 720 anfd->handle = _get_osfhandle (fd);
710 #endif 721 #endif
711 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
712 } 723 }
713#endif 724#endif
714 725
715 { 726 {
716 unsigned char o_events = anfd->events; 727 unsigned char o_events = anfd->events;
… …
769{ 780{
770 int fd; 781 int fd;
771 782
772 for (fd = 0; fd < anfdmax; ++fd) 783 for (fd = 0; fd < anfdmax; ++fd)
773 if (anfds [fd].events) 784 if (anfds [fd].events)
774 if (!fd_valid (fd) == -1 && errno == EBADF) 785 if (!fd_valid (fd) && errno == EBADF)
775 fd_kill (EV_A_ fd); 786 fd_kill (EV_A_ fd);
776} 787}
777 788
778/* called on ENOMEM in select/poll to kill some fds and retry */ 789/* called on ENOMEM in select/poll to kill some fds and retry */
779static void noinline 790static void noinline
… …
938/* rebuild the heap: this function is used only once and executed rarely */ 949/* rebuild the heap: this function is used only once and executed rarely */
939void inline_size 950void inline_size
940reheap (ANHE *heap, int N) 951reheap (ANHE *heap, int N)
941{ 952{
942 int i; 953 int i;
954
943 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 955 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
944 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */ 956 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
945 for (i = 0; i < N; ++i) 957 for (i = 0; i < N; ++i)
946 upheap (heap, i + HEAP0); 958 upheap (heap, i + HEAP0);
947} 959}
948 960
949#if EV_VERIFY
950static void
951checkheap (ANHE *heap, int N)
952{
953 int i;
954
955 for (i = HEAP0; i < N + HEAP0; ++i)
956 {
957 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
958 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
959 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
960 }
961}
962#endif
963
964/*****************************************************************************/ 961/*****************************************************************************/
965 962
966typedef struct 963typedef struct
967{ 964{
968 WL head; 965 WL head;
… …
990 987
991void inline_speed 988void inline_speed
992fd_intern (int fd) 989fd_intern (int fd)
993{ 990{
994#ifdef _WIN32 991#ifdef _WIN32
995 int arg = 1; 992 unsigned long arg = 1;
996 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 993 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
997#else 994#else
998 fcntl (fd, F_SETFD, FD_CLOEXEC); 995 fcntl (fd, F_SETFD, FD_CLOEXEC);
999 fcntl (fd, F_SETFL, O_NONBLOCK); 996 fcntl (fd, F_SETFL, O_NONBLOCK);
1000#endif 997#endif
… …
1484 1481
1485 postfork = 0; 1482 postfork = 0;
1486} 1483}
1487 1484
1488#if EV_MULTIPLICITY 1485#if EV_MULTIPLICITY
1486
1489struct ev_loop * 1487struct ev_loop *
1490ev_loop_new (unsigned int flags) 1488ev_loop_new (unsigned int flags)
1491{ 1489{
1492 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1490 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1493 1491
… …
1513{ 1511{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1512 postfork = 1; /* must be in line with ev_default_fork */
1515} 1513}
1516 1514
1517#if EV_VERIFY 1515#if EV_VERIFY
1518static void 1516static void noinline
1517verify_watcher (EV_P_ W w)
1518{
1519 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520
1521 if (w->pending)
1522 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1523}
1524
1525static void noinline
1526verify_heap (EV_P_ ANHE *heap, int N)
1527{
1528 int i;
1529
1530 for (i = HEAP0; i < N + HEAP0; ++i)
1531 {
1532 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1533 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1534 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1535
1536 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1537 }
1538}
1539
1540static void noinline
1519array_check (W **ws, int cnt) 1541array_verify (EV_P_ W *ws, int cnt)
1520{ 1542{
1521 while (cnt--) 1543 while (cnt--)
1544 {
1522 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1545 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1546 verify_watcher (EV_A_ ws [cnt]);
1547 }
1523} 1548}
1549#endif
1524 1550
1525static void 1551void
1526ev_loop_verify (EV_P) 1552ev_loop_verify (EV_P)
1527{ 1553{
1554#if EV_VERIFY
1528 int i; 1555 int i;
1556 WL w;
1529 1557
1558 assert (activecnt >= -1);
1559
1560 assert (fdchangemax >= fdchangecnt);
1561 for (i = 0; i < fdchangecnt; ++i)
1562 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1563
1564 assert (anfdmax >= 0);
1565 for (i = 0; i < anfdmax; ++i)
1566 for (w = anfds [i].head; w; w = w->next)
1567 {
1568 verify_watcher (EV_A_ (W)w);
1569 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1570 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1571 }
1572
1573 assert (timermax >= timercnt);
1530 checkheap (timers, timercnt); 1574 verify_heap (EV_A_ timers, timercnt);
1575
1531#if EV_PERIODIC_ENABLE 1576#if EV_PERIODIC_ENABLE
1577 assert (periodicmax >= periodiccnt);
1532 checkheap (periodics, periodiccnt); 1578 verify_heap (EV_A_ periodics, periodiccnt);
1533#endif 1579#endif
1534 1580
1581 for (i = NUMPRI; i--; )
1582 {
1583 assert (pendingmax [i] >= pendingcnt [i]);
1535#if EV_IDLE_ENABLE 1584#if EV_IDLE_ENABLE
1536 for (i = NUMPRI; i--; ) 1585 assert (idleall >= 0);
1586 assert (idlemax [i] >= idlecnt [i]);
1537 array_check ((W **)idles [i], idlecnt [i]); 1587 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1538#endif 1588#endif
1589 }
1590
1539#if EV_FORK_ENABLE 1591#if EV_FORK_ENABLE
1592 assert (forkmax >= forkcnt);
1540 array_check ((W **)forks, forkcnt); 1593 array_verify (EV_A_ (W *)forks, forkcnt);
1541#endif 1594#endif
1542 array_check ((W **)prepares, preparecnt); 1595
1543 array_check ((W **)checks, checkcnt);
1544#if EV_ASYNC_ENABLE 1596#if EV_ASYNC_ENABLE
1597 assert (asyncmax >= asynccnt);
1545 array_check ((W **)asyncs, asynccnt); 1598 array_verify (EV_A_ (W *)asyncs, asynccnt);
1599#endif
1600
1601 assert (preparemax >= preparecnt);
1602 array_verify (EV_A_ (W *)prepares, preparecnt);
1603
1604 assert (checkmax >= checkcnt);
1605 array_verify (EV_A_ (W *)checks, checkcnt);
1606
1607# if 0
1608 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1609 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1546#endif 1610# endif
1547}
1548#endif 1611#endif
1612}
1549 1613
1550#endif 1614#endif /* multiplicity */
1551 1615
1552#if EV_MULTIPLICITY 1616#if EV_MULTIPLICITY
1553struct ev_loop * 1617struct ev_loop *
1554ev_default_loop_init (unsigned int flags) 1618ev_default_loop_init (unsigned int flags)
1555#else 1619#else
… …
1620void inline_speed 1684void inline_speed
1621call_pending (EV_P) 1685call_pending (EV_P)
1622{ 1686{
1623 int pri; 1687 int pri;
1624 1688
1625 EV_FREQUENT_CHECK;
1626
1627 for (pri = NUMPRI; pri--; ) 1689 for (pri = NUMPRI; pri--; )
1628 while (pendingcnt [pri]) 1690 while (pendingcnt [pri])
1629 { 1691 {
1630 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1692 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1631 1693
… …
1633 { 1695 {
1634 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1696 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1635 1697
1636 p->w->pending = 0; 1698 p->w->pending = 0;
1637 EV_CB_INVOKE (p->w, p->events); 1699 EV_CB_INVOKE (p->w, p->events);
1700 EV_FREQUENT_CHECK;
1638 } 1701 }
1639 } 1702 }
1640
1641 EV_FREQUENT_CHECK;
1642} 1703}
1643 1704
1644#if EV_IDLE_ENABLE 1705#if EV_IDLE_ENABLE
1645void inline_size 1706void inline_size
1646idle_reify (EV_P) 1707idle_reify (EV_P)
… …
1698#if EV_PERIODIC_ENABLE 1759#if EV_PERIODIC_ENABLE
1699void inline_size 1760void inline_size
1700periodics_reify (EV_P) 1761periodics_reify (EV_P)
1701{ 1762{
1702 EV_FREQUENT_CHECK; 1763 EV_FREQUENT_CHECK;
1764
1703 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1765 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1704 { 1766 {
1705 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1767 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1706 1768
1707 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1769 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
1713 1775
1714 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1776 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1715 1777
1716 ANHE_at_cache (periodics [HEAP0]); 1778 ANHE_at_cache (periodics [HEAP0]);
1717 downheap (periodics, periodiccnt, HEAP0); 1779 downheap (periodics, periodiccnt, HEAP0);
1718 EV_FREQUENT_CHECK;
1719 } 1780 }
1720 else if (w->interval) 1781 else if (w->interval)
1721 { 1782 {
1722 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1783 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1723 /* if next trigger time is not sufficiently in the future, put it there */ 1784 /* if next trigger time is not sufficiently in the future, put it there */
… …
1848ev_unref (EV_P) 1909ev_unref (EV_P)
1849{ 1910{
1850 --activecnt; 1911 --activecnt;
1851} 1912}
1852 1913
1914void
1915ev_now_update (EV_P)
1916{
1917 time_update (EV_A_ 1e100);
1918}
1919
1853static int loop_done; 1920static int loop_done;
1854 1921
1855void 1922void
1856ev_loop (EV_P_ int flags) 1923ev_loop (EV_P_ int flags)
1857{ 1924{
… …
1859 1926
1860 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1927 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1861 1928
1862 do 1929 do
1863 { 1930 {
1931#if EV_VERIFY >= 2
1932 ev_loop_verify (EV_A);
1933#endif
1934
1864#ifndef _WIN32 1935#ifndef _WIN32
1865 if (expect_false (curpid)) /* penalise the forking check even more */ 1936 if (expect_false (curpid)) /* penalise the forking check even more */
1866 if (expect_false (getpid () != curpid)) 1937 if (expect_false (getpid () != curpid))
1867 { 1938 {
1868 curpid = getpid (); 1939 curpid = getpid ();
… …
2506 } 2577 }
2507 2578
2508 } 2579 }
2509} 2580}
2510 2581
2582#endif
2583
2584#ifdef _WIN32
2585# define EV_LSTAT(p,b) _stati64 (p, b)
2586#else
2587# define EV_LSTAT(p,b) lstat (p, b)
2511#endif 2588#endif
2512 2589
2513void 2590void
2514ev_stat_stat (EV_P_ ev_stat *w) 2591ev_stat_stat (EV_P_ ev_stat *w)
2515{ 2592{
… …
2911once_cb (EV_P_ struct ev_once *once, int revents) 2988once_cb (EV_P_ struct ev_once *once, int revents)
2912{ 2989{
2913 void (*cb)(int revents, void *arg) = once->cb; 2990 void (*cb)(int revents, void *arg) = once->cb;
2914 void *arg = once->arg; 2991 void *arg = once->arg;
2915 2992
2916 ev_io_stop (EV_A_ &once->io); 2993 ev_io_stop (EV_A_ &once->io);
2917 ev_timer_stop (EV_A_ &once->to); 2994 ev_timer_stop (EV_A_ &once->to);
2918 ev_free (once); 2995 ev_free (once);
2919 2996
2920 cb (revents, arg); 2997 cb (revents, arg);
2921} 2998}

Diff Legend

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