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.295 by root, Wed Jul 8 04:29:31 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;
… …
627 632
628 tv.tv_sec = (time_t)delay; 633 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 635
631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 637 /* somehting not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 638 /* by older ones */
634 select (0, 0, 0, 0, &tv); 639 select (0, 0, 0, 0, &tv);
635#endif 640#endif
636 } 641 }
637} 642}
… …
1358ev_loop_count (EV_P) 1363ev_loop_count (EV_P)
1359{ 1364{
1360 return loop_count; 1365 return loop_count;
1361} 1366}
1362 1367
1368unsigned int
1369ev_loop_depth (EV_P)
1370{
1371 return loop_depth;
1372}
1373
1363void 1374void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1375ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1376{
1366 io_blocktime = interval; 1377 io_blocktime = interval;
1367} 1378}
… …
2020 2031
2021 mn_now = ev_rt_now; 2032 mn_now = ev_rt_now;
2022 } 2033 }
2023} 2034}
2024 2035
2025static int loop_done;
2026
2027void 2036void
2028ev_loop (EV_P_ int flags) 2037ev_loop (EV_P_ int flags)
2029{ 2038{
2039 ++loop_depth;
2040
2030 loop_done = EVUNLOOP_CANCEL; 2041 loop_done = EVUNLOOP_CANCEL;
2031 2042
2032 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
2033 2044
2034 do 2045 do
… …
2075 ev_tstamp waittime = 0.; 2086 ev_tstamp waittime = 0.;
2076 ev_tstamp sleeptime = 0.; 2087 ev_tstamp sleeptime = 0.;
2077 2088
2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2089 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2079 { 2090 {
2091 /* remember old timestamp for io_blocktime calculation */
2092 ev_tstamp prev_mn_now = mn_now;
2093
2080 /* update time to cancel out callback processing overhead */ 2094 /* update time to cancel out callback processing overhead */
2081 time_update (EV_A_ 1e100); 2095 time_update (EV_A_ 1e100);
2082 2096
2083 waittime = MAX_BLOCKTIME; 2097 waittime = MAX_BLOCKTIME;
2084 2098
… …
2094 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2108 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2095 if (waittime > to) waittime = to; 2109 if (waittime > to) waittime = to;
2096 } 2110 }
2097#endif 2111#endif
2098 2112
2113 /* don't let timeouts decrease the waittime below timeout_blocktime */
2099 if (expect_false (waittime < timeout_blocktime)) 2114 if (expect_false (waittime < timeout_blocktime))
2100 waittime = timeout_blocktime; 2115 waittime = timeout_blocktime;
2101 2116
2102 sleeptime = waittime - backend_fudge; 2117 /* extra check because io_blocktime is commonly 0 */
2103
2104 if (expect_true (sleeptime > io_blocktime)) 2118 if (expect_false (io_blocktime))
2105 sleeptime = io_blocktime;
2106
2107 if (sleeptime)
2108 { 2119 {
2120 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2121
2122 if (sleeptime > waittime - backend_fudge)
2123 sleeptime = waittime - backend_fudge;
2124
2125 if (expect_true (sleeptime > 0.))
2126 {
2109 ev_sleep (sleeptime); 2127 ev_sleep (sleeptime);
2110 waittime -= sleeptime; 2128 waittime -= sleeptime;
2129 }
2111 } 2130 }
2112 } 2131 }
2113 2132
2114 ++loop_count; 2133 ++loop_count;
2115 backend_poll (EV_A_ waittime); 2134 backend_poll (EV_A_ waittime);
… …
2141 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2142 )); 2161 ));
2143 2162
2144 if (loop_done == EVUNLOOP_ONE) 2163 if (loop_done == EVUNLOOP_ONE)
2145 loop_done = EVUNLOOP_CANCEL; 2164 loop_done = EVUNLOOP_CANCEL;
2165
2166 --loop_depth;
2146} 2167}
2147 2168
2148void 2169void
2149ev_unloop (EV_P_ int how) 2170ev_unloop (EV_P_ int how)
2150{ 2171{
… …
2242} 2263}
2243 2264
2244inline_size void 2265inline_size void
2245pri_adjust (EV_P_ W w) 2266pri_adjust (EV_P_ W w)
2246{ 2267{
2247 int pri = w->priority; 2268 int pri = ev_priority (w);
2248 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2269 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2249 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2270 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2250 w->priority = pri; 2271 ev_set_priority (w, pri);
2251} 2272}
2252 2273
2253inline_speed void 2274inline_speed void
2254ev_start (EV_P_ W w, int active) 2275ev_start (EV_P_ W w, int active)
2255{ 2276{

Diff Legend

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