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

Comparing libev/ev.c (file contents):
Revision 1.181 by root, Wed Dec 12 00:17:08 2007 UTC vs.
Revision 1.193 by root, Sat Dec 22 05:47:58 2007 UTC

… …
51# ifndef EV_USE_MONOTONIC 51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 52# define EV_USE_MONOTONIC 0
53# endif 53# endif
54# ifndef EV_USE_REALTIME 54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 55# define EV_USE_REALTIME 0
56# endif
57# endif
58
59# ifndef EV_USE_NANOSLEEP
60# if HAVE_NANOSLEEP
61# define EV_USE_NANOSLEEP 1
62# else
63# define EV_USE_NANOSLEEP 0
56# endif 64# endif
57# endif 65# endif
58 66
59# ifndef EV_USE_SELECT 67# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 68# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
146 154
147#ifndef EV_USE_REALTIME 155#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 156# define EV_USE_REALTIME 0
149#endif 157#endif
150 158
159#ifndef EV_USE_NANOSLEEP
160# define EV_USE_NANOSLEEP 0
161#endif
162
151#ifndef EV_USE_SELECT 163#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 164# define EV_USE_SELECT 1
153#endif 165#endif
154 166
155#ifndef EV_USE_POLL 167#ifndef EV_USE_POLL
… …
202#ifndef CLOCK_REALTIME 214#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 215# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 216# define EV_USE_REALTIME 0
205#endif 217#endif
206 218
219#if !EV_STAT_ENABLE
220# undef EV_USE_INOTIFY
221# define EV_USE_INOTIFY 0
222#endif
223
224#if !EV_USE_NANOSLEEP
225# ifndef _WIN32
226# include <sys/select.h>
227# endif
228#endif
229
230#if EV_USE_INOTIFY
231# include <sys/inotify.h>
232#endif
233
207#if EV_SELECT_IS_WINSOCKET 234#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 235# include <winsock.h>
209#endif
210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif 236#endif
218 237
219/**/ 238/**/
220 239
221/* 240/*
… …
230 249
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 250#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 251#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 252/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 253
235#if __GNUC__ >= 3 254#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 255# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 256# define noinline __attribute__ ((noinline))
238#else 257#else
239# define expect(expr,value) (expr) 258# define expect(expr,value) (expr)
240# define noinline 259# define noinline
… …
407{ 426{
408 return ev_rt_now; 427 return ev_rt_now;
409} 428}
410#endif 429#endif
411 430
431void
432ev_sleep (ev_tstamp delay)
433{
434 if (delay > 0.)
435 {
436#if EV_USE_NANOSLEEP
437 struct timespec ts;
438
439 ts.tv_sec = (time_t)delay;
440 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
441
442 nanosleep (&ts, 0);
443#elif defined(_WIN32)
444 Sleep (delay * 1e3);
445#else
446 struct timeval tv;
447
448 tv.tv_sec = (time_t)delay;
449 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
450
451 select (0, 0, 0, 0, &tv);
452#endif
453 }
454}
455
456/*****************************************************************************/
457
412int inline_size 458int inline_size
413array_nextsize (int elem, int cur, int cnt) 459array_nextsize (int elem, int cur, int cnt)
414{ 460{
415 int ncur = cur + 1; 461 int ncur = cur + 1;
416 462
… …
533 { 579 {
534 int fd = fdchanges [i]; 580 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 581 ANFD *anfd = anfds + fd;
536 ev_io *w; 582 ev_io *w;
537 583
538 int events = 0; 584 unsigned char events = 0;
539 585
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 586 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 587 events |= (unsigned char)w->events;
542 588
543#if EV_SELECT_IS_WINSOCKET 589#if EV_SELECT_IS_WINSOCKET
544 if (events) 590 if (events)
545 { 591 {
546 unsigned long argp; 592 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 593 anfd->handle = _get_osfhandle (fd);
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 594 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 595 }
550#endif 596#endif
551 597
598 {
599 unsigned char o_events = anfd->events;
600 unsigned char o_reify = anfd->reify;
601
552 anfd->reify = 0; 602 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 603 anfd->events = events;
604
605 if (o_events != events || o_reify & EV_IOFDSET)
606 backend_modify (EV_A_ fd, o_events, events);
607 }
556 } 608 }
557 609
558 fdchangecnt = 0; 610 fdchangecnt = 0;
559} 611}
560 612
561void inline_size 613void inline_size
562fd_change (EV_P_ int fd) 614fd_change (EV_P_ int fd, int flags)
563{ 615{
564 if (expect_false (anfds [fd].reify)) 616 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 617 anfds [fd].reify |= flags;
568 618
619 if (expect_true (!reify))
620 {
569 ++fdchangecnt; 621 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 622 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 623 fdchanges [fdchangecnt - 1] = fd;
624 }
572} 625}
573 626
574void inline_speed 627void inline_speed
575fd_kill (EV_P_ int fd) 628fd_kill (EV_P_ int fd)
576{ 629{
… …
627 680
628 for (fd = 0; fd < anfdmax; ++fd) 681 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 682 if (anfds [fd].events)
630 { 683 {
631 anfds [fd].events = 0; 684 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 685 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 686 }
634} 687}
635 688
636/*****************************************************************************/ 689/*****************************************************************************/
637 690
… …
792 ev_unref (EV_A); /* child watcher should not keep loop alive */ 845 ev_unref (EV_A); /* child watcher should not keep loop alive */
793} 846}
794 847
795/*****************************************************************************/ 848/*****************************************************************************/
796 849
797static ev_child *childs [EV_PID_HASHSIZE]; 850static WL childs [EV_PID_HASHSIZE];
798 851
799#ifndef _WIN32 852#ifndef _WIN32
800 853
801static ev_signal childev; 854static ev_signal childev;
802 855
… …
917} 970}
918 971
919unsigned int 972unsigned int
920ev_embeddable_backends (void) 973ev_embeddable_backends (void)
921{ 974{
975 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
922 return EVBACKEND_EPOLL 976 return EVBACKEND_KQUEUE
923 | EVBACKEND_KQUEUE
924 | EVBACKEND_PORT; 977 | EVBACKEND_PORT;
925} 978}
926 979
927unsigned int 980unsigned int
928ev_backend (EV_P) 981ev_backend (EV_P)
… …
932 985
933unsigned int 986unsigned int
934ev_loop_count (EV_P) 987ev_loop_count (EV_P)
935{ 988{
936 return loop_count; 989 return loop_count;
990}
991
992void
993ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
994{
995 io_blocktime = interval;
996}
997
998void
999ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1000{
1001 timeout_blocktime = interval;
937} 1002}
938 1003
939static void noinline 1004static void noinline
940loop_init (EV_P_ unsigned int flags) 1005loop_init (EV_P_ unsigned int flags)
941{ 1006{
… …
952 ev_rt_now = ev_time (); 1017 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1018 mn_now = get_clock ();
954 now_floor = mn_now; 1019 now_floor = mn_now;
955 rtmn_diff = ev_rt_now - mn_now; 1020 rtmn_diff = ev_rt_now - mn_now;
956 1021
1022 io_blocktime = 0.;
1023 timeout_blocktime = 0.;
1024
957 /* pid check not overridable via env */ 1025 /* pid check not overridable via env */
958#ifndef _WIN32 1026#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1027 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1028 curpid = getpid ();
961#endif 1029#endif
… …
1029 array_free (pending, [i]); 1097 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1098#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1099 array_free (idle, [i]);
1032#endif 1100#endif
1033 } 1101 }
1102
1103 ev_free (anfds); anfdmax = 0;
1034 1104
1035 /* have to use the microsoft-never-gets-it-right macro */ 1105 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1106 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1107 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1108#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1109 array_free (periodic, EMPTY);
1110#endif
1111#if EV_FORK_ENABLE
1112 array_free (fork, EMPTY);
1040#endif 1113#endif
1041 array_free (prepare, EMPTY); 1114 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1115 array_free (check, EMPTY);
1043 1116
1044 backend = 0; 1117 backend = 0;
… …
1443 /* update fd-related kernel structures */ 1516 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1517 fd_reify (EV_A);
1445 1518
1446 /* calculate blocking time */ 1519 /* calculate blocking time */
1447 { 1520 {
1448 ev_tstamp block; 1521 ev_tstamp waittime = 0.;
1522 ev_tstamp sleeptime = 0.;
1449 1523
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1524 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1525 {
1454 /* update time to cancel out callback processing overhead */ 1526 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 1527 time_update (EV_A_ 1e100);
1456 1528
1457 block = MAX_BLOCKTIME; 1529 waittime = MAX_BLOCKTIME;
1458 1530
1459 if (timercnt) 1531 if (timercnt)
1460 { 1532 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1533 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1462 if (block > to) block = to; 1534 if (waittime > to) waittime = to;
1463 } 1535 }
1464 1536
1465#if EV_PERIODIC_ENABLE 1537#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 1538 if (periodiccnt)
1467 { 1539 {
1468 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1540 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1469 if (block > to) block = to; 1541 if (waittime > to) waittime = to;
1470 } 1542 }
1471#endif 1543#endif
1472 1544
1473 if (expect_false (block < 0.)) block = 0.; 1545 if (expect_false (waittime < timeout_blocktime))
1546 waittime = timeout_blocktime;
1547
1548 sleeptime = waittime - backend_fudge;
1549
1550 if (expect_true (sleeptime > io_blocktime))
1551 sleeptime = io_blocktime;
1552
1553 if (sleeptime)
1554 {
1555 ev_sleep (sleeptime);
1556 waittime -= sleeptime;
1557 }
1474 } 1558 }
1475 1559
1476 ++loop_count; 1560 ++loop_count;
1477 backend_poll (EV_A_ block); 1561 backend_poll (EV_A_ waittime);
1478 1562
1479 /* update ev_rt_now, do magic */ 1563 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 1564 time_update (EV_A_ waittime + sleeptime);
1481 } 1565 }
1482 1566
1483 /* queue pending timers and reschedule them */ 1567 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 1568 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 1569#if EV_PERIODIC_ENABLE
… …
1597 1681
1598 assert (("ev_io_start called with negative fd", fd >= 0)); 1682 assert (("ev_io_start called with negative fd", fd >= 0));
1599 1683
1600 ev_start (EV_A_ (W)w, 1); 1684 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1685 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1602 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1686 wlist_add (&anfds[fd].head, (WL)w);
1603 1687
1604 fd_change (EV_A_ fd); 1688 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1689 w->events &= ~EV_IOFDSET;
1605} 1690}
1606 1691
1607void noinline 1692void noinline
1608ev_io_stop (EV_P_ ev_io *w) 1693ev_io_stop (EV_P_ ev_io *w)
1609{ 1694{
… …
1611 if (expect_false (!ev_is_active (w))) 1696 if (expect_false (!ev_is_active (w)))
1612 return; 1697 return;
1613 1698
1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1699 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1615 1700
1616 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1701 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 1702 ev_stop (EV_A_ (W)w);
1618 1703
1619 fd_change (EV_A_ w->fd); 1704 fd_change (EV_A_ w->fd, 1);
1620} 1705}
1621 1706
1622void noinline 1707void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 1708ev_timer_start (EV_P_ ev_timer *w)
1624{ 1709{
… …
1766 sigprocmask (SIG_SETMASK, &prev, 0); 1851 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif 1852#endif
1768 } 1853 }
1769 1854
1770 ev_start (EV_A_ (W)w, 1); 1855 ev_start (EV_A_ (W)w, 1);
1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1856 wlist_add (&signals [w->signum - 1].head, (WL)w);
1772 1857
1773 if (!((WL)w)->next) 1858 if (!((WL)w)->next)
1774 { 1859 {
1775#if _WIN32 1860#if _WIN32
1776 signal (w->signum, sighandler); 1861 signal (w->signum, sighandler);
… …
1789{ 1874{
1790 clear_pending (EV_A_ (W)w); 1875 clear_pending (EV_A_ (W)w);
1791 if (expect_false (!ev_is_active (w))) 1876 if (expect_false (!ev_is_active (w)))
1792 return; 1877 return;
1793 1878
1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1879 wlist_del (&signals [w->signum - 1].head, (WL)w);
1795 ev_stop (EV_A_ (W)w); 1880 ev_stop (EV_A_ (W)w);
1796 1881
1797 if (!signals [w->signum - 1].head) 1882 if (!signals [w->signum - 1].head)
1798 signal (w->signum, SIG_DFL); 1883 signal (w->signum, SIG_DFL);
1799} 1884}
… …
1806#endif 1891#endif
1807 if (expect_false (ev_is_active (w))) 1892 if (expect_false (ev_is_active (w)))
1808 return; 1893 return;
1809 1894
1810 ev_start (EV_A_ (W)w, 1); 1895 ev_start (EV_A_ (W)w, 1);
1811 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1896 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1812} 1897}
1813 1898
1814void 1899void
1815ev_child_stop (EV_P_ ev_child *w) 1900ev_child_stop (EV_P_ ev_child *w)
1816{ 1901{
1817 clear_pending (EV_A_ (W)w); 1902 clear_pending (EV_A_ (W)w);
1818 if (expect_false (!ev_is_active (w))) 1903 if (expect_false (!ev_is_active (w)))
1819 return; 1904 return;
1820 1905
1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1906 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1822 ev_stop (EV_A_ (W)w); 1907 ev_stop (EV_A_ (W)w);
1823} 1908}
1824 1909
1825#if EV_STAT_ENABLE 1910#if EV_STAT_ENABLE
1826 1911
… …
2168 2253
2169#if EV_EMBED_ENABLE 2254#if EV_EMBED_ENABLE
2170void noinline 2255void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2256ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2257{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2258 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2259}
2175 2260
2176static void 2261static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2262embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2263{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2264 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2265
2181 if (ev_cb (w)) 2266 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2267 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2268 else
2184 ev_embed_sweep (loop, w); 2269 ev_embed_sweep (loop, w);
2185} 2270}
2186 2271
2272static void
2273embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2274{
2275 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2276
2277 fd_reify (w->other);
2278}
2279
2187void 2280void
2188ev_embed_start (EV_P_ ev_embed *w) 2281ev_embed_start (EV_P_ ev_embed *w)
2189{ 2282{
2190 if (expect_false (ev_is_active (w))) 2283 if (expect_false (ev_is_active (w)))
2191 return; 2284 return;
2192 2285
2193 { 2286 {
2194 struct ev_loop *loop = w->loop; 2287 struct ev_loop *loop = w->other;
2195 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2288 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2289 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2290 }
2198 2291
2199 ev_set_priority (&w->io, ev_priority (w)); 2292 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2293 ev_io_start (EV_A_ &w->io);
2201 2294
2295 ev_prepare_init (&w->prepare, embed_prepare_cb);
2296 ev_set_priority (&w->prepare, EV_MINPRI);
2297 ev_prepare_start (EV_A_ &w->prepare);
2298
2202 ev_start (EV_A_ (W)w, 1); 2299 ev_start (EV_A_ (W)w, 1);
2203} 2300}
2204 2301
2205void 2302void
2206ev_embed_stop (EV_P_ ev_embed *w) 2303ev_embed_stop (EV_P_ ev_embed *w)
… …
2208 clear_pending (EV_A_ (W)w); 2305 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2306 if (expect_false (!ev_is_active (w)))
2210 return; 2307 return;
2211 2308
2212 ev_io_stop (EV_A_ &w->io); 2309 ev_io_stop (EV_A_ &w->io);
2310 ev_prepare_stop (EV_A_ &w->prepare);
2213 2311
2214 ev_stop (EV_A_ (W)w); 2312 ev_stop (EV_A_ (W)w);
2215} 2313}
2216#endif 2314#endif
2217 2315
… …
2306 ev_timer_set (&once->to, timeout, 0.); 2404 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 2405 ev_timer_start (EV_A_ &once->to);
2308 } 2406 }
2309} 2407}
2310 2408
2409#if EV_MULTIPLICITY
2410 #include "ev_wrap.h"
2411#endif
2412
2311#ifdef __cplusplus 2413#ifdef __cplusplus
2312} 2414}
2313#endif 2415#endif
2314 2416

Diff Legend

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