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

Comparing libev/ev.c (file contents):
Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs.
Revision 1.299 by root, Tue Jul 14 00:09:59 2009 UTC

… …
391# define inline_speed static noinline 391# define inline_speed static noinline
392#else 392#else
393# define inline_speed static inline 393# define inline_speed static inline
394#endif 394#endif
395 395
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397
398#if EV_MINPRI == EV_MAXPRI
399# define ABSPRI(w) (((W)w), 0)
400#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 401# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
402#endif
398 403
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 404#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 405#define EMPTY2(a,b) /* used to suppress some warnings */
401 406
402typedef ev_watcher *W; 407typedef ev_watcher *W;
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 490#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 491#define ev_free(ptr) ev_realloc ((ptr), 0)
487 492
488/*****************************************************************************/ 493/*****************************************************************************/
489 494
495/* set in reify when reification needed */
496#define EV_ANFD_REIFY 1
497
490/* file descriptor info structure */ 498/* file descriptor info structure */
491typedef struct 499typedef struct
492{ 500{
493 WL head; 501 WL head;
494 unsigned char events; /* the events watched for */ 502 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 503 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 504 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 505 unsigned char unused;
498#if EV_USE_EPOLL 506#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 507 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 508#endif
… …
562 570
563 static int ev_default_loop_ptr; 571 static int ev_default_loop_ptr;
564 572
565#endif 573#endif
566 574
575#if EV_MINIMAL < 2
576# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
577# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
578# define EV_INVOKE_PENDING invoke_cb (EV_A)
579#else
580# define EV_RELEASE_CB (void)0
581# define EV_ACQUIRE_CB (void)0
582# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
583#endif
584
585#define EVUNLOOP_RECURSE 0x80
586
567/*****************************************************************************/ 587/*****************************************************************************/
568 588
569#ifndef EV_HAVE_EV_TIME 589#ifndef EV_HAVE_EV_TIME
570ev_tstamp 590ev_tstamp
571ev_time (void) 591ev_time (void)
… …
627 647
628 tv.tv_sec = (time_t)delay; 648 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 649 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 650
631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 651 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 652 /* somehting not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 653 /* by older ones */
634 select (0, 0, 0, 0, &tv); 654 select (0, 0, 0, 0, &tv);
635#endif 655#endif
636 } 656 }
637} 657}
… …
745} 765}
746 766
747/*****************************************************************************/ 767/*****************************************************************************/
748 768
749inline_speed void 769inline_speed void
750fd_event (EV_P_ int fd, int revents) 770fd_event_nc (EV_P_ int fd, int revents)
751{ 771{
752 ANFD *anfd = anfds + fd; 772 ANFD *anfd = anfds + fd;
753 ev_io *w; 773 ev_io *w;
754 774
755 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 775 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
759 if (ev) 779 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 780 ev_feed_event (EV_A_ (W)w, ev);
761 } 781 }
762} 782}
763 783
784/* do not submit kernel events for fds that have reify set */
785/* because that means they changed while we were polling for new events */
786inline_speed void
787fd_event (EV_P_ int fd, int revents)
788{
789 ANFD *anfd = anfds + fd;
790
791 if (expect_true (!anfd->reify))
792 fd_event_nc (EV_A_ fd, revents);
793}
794
764void 795void
765ev_feed_fd_event (EV_P_ int fd, int revents) 796ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 797{
767 if (fd >= 0 && fd < anfdmax) 798 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 799 fd_event_nc (EV_A_ fd, revents);
769} 800}
770 801
771/* make sure the external fd watch events are in-sync */ 802/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 803/* with the kernel/libev internal state */
773inline_size void 804inline_size void
… …
888 for (fd = 0; fd < anfdmax; ++fd) 919 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 920 if (anfds [fd].events)
890 { 921 {
891 anfds [fd].events = 0; 922 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 923 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 924 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 925 }
895} 926}
896 927
897/*****************************************************************************/ 928/*****************************************************************************/
898 929
… …
1352ev_backend (EV_P) 1383ev_backend (EV_P)
1353{ 1384{
1354 return backend; 1385 return backend;
1355} 1386}
1356 1387
1388#if EV_MINIMAL < 2
1357unsigned int 1389unsigned int
1358ev_loop_count (EV_P) 1390ev_loop_count (EV_P)
1359{ 1391{
1360 return loop_count; 1392 return loop_count;
1361} 1393}
1362 1394
1395unsigned int
1396ev_loop_depth (EV_P)
1397{
1398 return loop_depth;
1399}
1400
1363void 1401void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1402ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1403{
1366 io_blocktime = interval; 1404 io_blocktime = interval;
1367} 1405}
… …
1369void 1407void
1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1408ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371{ 1409{
1372 timeout_blocktime = interval; 1410 timeout_blocktime = interval;
1373} 1411}
1412
1413void
1414ev_set_userdata (EV_P_ void *data)
1415{
1416 userdata = data;
1417}
1418
1419void *
1420ev_userdata (EV_P)
1421{
1422 return userdata;
1423}
1424
1425void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1426{
1427 invoke_cb = invoke_pending_cb;
1428}
1429
1430void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1431{
1432 release_cb = release;
1433 acquire_cb = acquire;
1434}
1435#endif
1374 1436
1375/* initialise a loop structure, must be zero-initialised */ 1437/* initialise a loop structure, must be zero-initialised */
1376static void noinline 1438static void noinline
1377loop_init (EV_P_ unsigned int flags) 1439loop_init (EV_P_ unsigned int flags)
1378{ 1440{
… …
1400 1462
1401 ev_rt_now = ev_time (); 1463 ev_rt_now = ev_time ();
1402 mn_now = get_clock (); 1464 mn_now = get_clock ();
1403 now_floor = mn_now; 1465 now_floor = mn_now;
1404 rtmn_diff = ev_rt_now - mn_now; 1466 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2
1468 invoke_cb = ev_invoke_pending;
1469#endif
1405 1470
1406 io_blocktime = 0.; 1471 io_blocktime = 0.;
1407 timeout_blocktime = 0.; 1472 timeout_blocktime = 0.;
1408 backend = 0; 1473 backend = 0;
1409 backend_fd = -1; 1474 backend_fd = -1;
… …
1603void 1668void
1604ev_loop_fork (EV_P) 1669ev_loop_fork (EV_P)
1605{ 1670{
1606 postfork = 1; /* must be in line with ev_default_fork */ 1671 postfork = 1; /* must be in line with ev_default_fork */
1607} 1672}
1673#endif /* multiplicity */
1608 1674
1609#if EV_VERIFY 1675#if EV_VERIFY
1610static void noinline 1676static void noinline
1611verify_watcher (EV_P_ W w) 1677verify_watcher (EV_P_ W w)
1612{ 1678{
… …
1640 verify_watcher (EV_A_ ws [cnt]); 1706 verify_watcher (EV_A_ ws [cnt]);
1641 } 1707 }
1642} 1708}
1643#endif 1709#endif
1644 1710
1711#if EV_MINIMAL < 2
1645void 1712void
1646ev_loop_verify (EV_P) 1713ev_loop_verify (EV_P)
1647{ 1714{
1648#if EV_VERIFY 1715#if EV_VERIFY
1649 int i; 1716 int i;
… …
1702 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1703 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1704# endif 1771# endif
1705#endif 1772#endif
1706} 1773}
1707 1774#endif
1708#endif /* multiplicity */
1709 1775
1710#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1711struct ev_loop * 1777struct ev_loop *
1712ev_default_loop_init (unsigned int flags) 1778ev_default_loop_init (unsigned int flags)
1713#else 1779#else
… …
1774ev_invoke (EV_P_ void *w, int revents) 1840ev_invoke (EV_P_ void *w, int revents)
1775{ 1841{
1776 EV_CB_INVOKE ((W)w, revents); 1842 EV_CB_INVOKE ((W)w, revents);
1777} 1843}
1778 1844
1779inline_speed void 1845void noinline
1780call_pending (EV_P) 1846ev_invoke_pending (EV_P)
1781{ 1847{
1782 int pri; 1848 int pri;
1783 1849
1784 for (pri = NUMPRI; pri--; ) 1850 for (pri = NUMPRI; pri--; )
1785 while (pendingcnt [pri]) 1851 while (pendingcnt [pri])
… …
2020 2086
2021 mn_now = ev_rt_now; 2087 mn_now = ev_rt_now;
2022 } 2088 }
2023} 2089}
2024 2090
2025static int loop_done;
2026
2027void 2091void
2028ev_loop (EV_P_ int flags) 2092ev_loop (EV_P_ int flags)
2029{ 2093{
2094#if EV_MINIMAL < 2
2095 ++loop_depth;
2096#endif
2097
2098 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2099
2030 loop_done = EVUNLOOP_CANCEL; 2100 loop_done = EVUNLOOP_CANCEL;
2031 2101
2032 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2102 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2033 2103
2034 do 2104 do
2035 { 2105 {
2036#if EV_VERIFY >= 2 2106#if EV_VERIFY >= 2
2037 ev_loop_verify (EV_A); 2107 ev_loop_verify (EV_A);
… …
2050 /* we might have forked, so queue fork handlers */ 2120 /* we might have forked, so queue fork handlers */
2051 if (expect_false (postfork)) 2121 if (expect_false (postfork))
2052 if (forkcnt) 2122 if (forkcnt)
2053 { 2123 {
2054 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2124 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055 call_pending (EV_A); 2125 EV_INVOKE_PENDING;
2056 } 2126 }
2057#endif 2127#endif
2058 2128
2059 /* queue prepare watchers (and execute them) */ 2129 /* queue prepare watchers (and execute them) */
2060 if (expect_false (preparecnt)) 2130 if (expect_false (preparecnt))
2061 { 2131 {
2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2132 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063 call_pending (EV_A); 2133 EV_INVOKE_PENDING;
2064 } 2134 }
2135
2136 if (expect_false (loop_done))
2137 break;
2065 2138
2066 /* we might have forked, so reify kernel state if necessary */ 2139 /* we might have forked, so reify kernel state if necessary */
2067 if (expect_false (postfork)) 2140 if (expect_false (postfork))
2068 loop_fork (EV_A); 2141 loop_fork (EV_A);
2069 2142
… …
2075 ev_tstamp waittime = 0.; 2148 ev_tstamp waittime = 0.;
2076 ev_tstamp sleeptime = 0.; 2149 ev_tstamp sleeptime = 0.;
2077 2150
2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2151 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2079 { 2152 {
2153 /* remember old timestamp for io_blocktime calculation */
2154 ev_tstamp prev_mn_now = mn_now;
2155
2080 /* update time to cancel out callback processing overhead */ 2156 /* update time to cancel out callback processing overhead */
2081 time_update (EV_A_ 1e100); 2157 time_update (EV_A_ 1e100);
2082 2158
2083 waittime = MAX_BLOCKTIME; 2159 waittime = MAX_BLOCKTIME;
2084 2160
… …
2094 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2170 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2095 if (waittime > to) waittime = to; 2171 if (waittime > to) waittime = to;
2096 } 2172 }
2097#endif 2173#endif
2098 2174
2175 /* don't let timeouts decrease the waittime below timeout_blocktime */
2099 if (expect_false (waittime < timeout_blocktime)) 2176 if (expect_false (waittime < timeout_blocktime))
2100 waittime = timeout_blocktime; 2177 waittime = timeout_blocktime;
2101 2178
2102 sleeptime = waittime - backend_fudge; 2179 /* extra check because io_blocktime is commonly 0 */
2103
2104 if (expect_true (sleeptime > io_blocktime)) 2180 if (expect_false (io_blocktime))
2105 sleeptime = io_blocktime;
2106
2107 if (sleeptime)
2108 { 2181 {
2182 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2183
2184 if (sleeptime > waittime - backend_fudge)
2185 sleeptime = waittime - backend_fudge;
2186
2187 if (expect_true (sleeptime > 0.))
2188 {
2109 ev_sleep (sleeptime); 2189 ev_sleep (sleeptime);
2110 waittime -= sleeptime; 2190 waittime -= sleeptime;
2191 }
2111 } 2192 }
2112 } 2193 }
2113 2194
2195#if EV_MINIMAL < 2
2114 ++loop_count; 2196 ++loop_count;
2197#endif
2198 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2115 backend_poll (EV_A_ waittime); 2199 backend_poll (EV_A_ waittime);
2200 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2116 2201
2117 /* update ev_rt_now, do magic */ 2202 /* update ev_rt_now, do magic */
2118 time_update (EV_A_ waittime + sleeptime); 2203 time_update (EV_A_ waittime + sleeptime);
2119 } 2204 }
2120 2205
… …
2131 2216
2132 /* queue check watchers, to be executed first */ 2217 /* queue check watchers, to be executed first */
2133 if (expect_false (checkcnt)) 2218 if (expect_false (checkcnt))
2134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2219 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2135 2220
2136 call_pending (EV_A); 2221 EV_INVOKE_PENDING;
2137 } 2222 }
2138 while (expect_true ( 2223 while (expect_true (
2139 activecnt 2224 activecnt
2140 && !loop_done 2225 && !loop_done
2141 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2226 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2142 )); 2227 ));
2143 2228
2144 if (loop_done == EVUNLOOP_ONE) 2229 if (loop_done == EVUNLOOP_ONE)
2145 loop_done = EVUNLOOP_CANCEL; 2230 loop_done = EVUNLOOP_CANCEL;
2231
2232#if EV_MINIMAL < 2
2233 --loop_depth;
2234#endif
2146} 2235}
2147 2236
2148void 2237void
2149ev_unloop (EV_P_ int how) 2238ev_unloop (EV_P_ int how)
2150{ 2239{
… …
2242} 2331}
2243 2332
2244inline_size void 2333inline_size void
2245pri_adjust (EV_P_ W w) 2334pri_adjust (EV_P_ W w)
2246{ 2335{
2247 int pri = w->priority; 2336 int pri = ev_priority (w);
2248 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2337 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2249 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2338 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2250 w->priority = pri; 2339 ev_set_priority (w, pri);
2251} 2340}
2252 2341
2253inline_speed void 2342inline_speed void
2254ev_start (EV_P_ W w, int active) 2343ev_start (EV_P_ W w, int active)
2255{ 2344{
… …
2282 2371
2283 ev_start (EV_A_ (W)w, 1); 2372 ev_start (EV_A_ (W)w, 1);
2284 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2373 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2285 wlist_add (&anfds[fd].head, (WL)w); 2374 wlist_add (&anfds[fd].head, (WL)w);
2286 2375
2287 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2376 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2288 w->events &= ~EV__IOFDSET; 2377 w->events &= ~EV__IOFDSET;
2289 2378
2290 EV_FREQUENT_CHECK; 2379 EV_FREQUENT_CHECK;
2291} 2380}
2292 2381
… …
2496 if (!((WL)w)->next) 2585 if (!((WL)w)->next)
2497 { 2586 {
2498#if _WIN32 2587#if _WIN32
2499 signal (w->signum, ev_sighandler); 2588 signal (w->signum, ev_sighandler);
2500#else 2589#else
2501 struct sigaction sa; 2590 struct sigaction sa = { };
2502 sa.sa_handler = ev_sighandler; 2591 sa.sa_handler = ev_sighandler;
2503 sigfillset (&sa.sa_mask); 2592 sigfillset (&sa.sa_mask);
2504 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2593 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2505 sigaction (w->signum, &sa, 0); 2594 sigaction (w->signum, &sa, 0);
2506#endif 2595#endif

Diff Legend

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