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

Comparing libev/ev.c (file contents):
Revision 1.186 by root, Sat Dec 15 23:14:38 2007 UTC vs.
Revision 1.198 by root, Sun Dec 23 04:45:51 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
… …
205#endif 217#endif
206 218
207#if !EV_STAT_ENABLE 219#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY 220# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0 221# define EV_USE_INOTIFY 0
222#endif
223
224#if !EV_USE_NANOSLEEP
225# ifndef _WIN32
226# include <sys/select.h>
227# endif
210#endif 228#endif
211 229
212#if EV_USE_INOTIFY 230#if EV_USE_INOTIFY
213# include <sys/inotify.h> 231# include <sys/inotify.h>
214#endif 232#endif
… …
262 280
263typedef ev_watcher *W; 281typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
266 284
285#if EV_USE_MONOTONIC
286/* sig_atomic_t is used to avoid per-thread variables or locking but still */
287/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 288static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
289#endif
268 290
269#ifdef _WIN32 291#ifdef _WIN32
270# include "ev_win32.c" 292# include "ev_win32.c"
271#endif 293#endif
272 294
… …
408{ 430{
409 return ev_rt_now; 431 return ev_rt_now;
410} 432}
411#endif 433#endif
412 434
435void
436ev_sleep (ev_tstamp delay)
437{
438 if (delay > 0.)
439 {
440#if EV_USE_NANOSLEEP
441 struct timespec ts;
442
443 ts.tv_sec = (time_t)delay;
444 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
445
446 nanosleep (&ts, 0);
447#elif defined(_WIN32)
448 Sleep (delay * 1e3);
449#else
450 struct timeval tv;
451
452 tv.tv_sec = (time_t)delay;
453 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
454
455 select (0, 0, 0, 0, &tv);
456#endif
457 }
458}
459
460/*****************************************************************************/
461
413int inline_size 462int inline_size
414array_nextsize (int elem, int cur, int cnt) 463array_nextsize (int elem, int cur, int cnt)
415{ 464{
416 int ncur = cur + 1; 465 int ncur = cur + 1;
417 466
… …
925} 974}
926 975
927unsigned int 976unsigned int
928ev_embeddable_backends (void) 977ev_embeddable_backends (void)
929{ 978{
930 return EVBACKEND_EPOLL 979 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
931 | EVBACKEND_KQUEUE 980
932 | EVBACKEND_PORT; 981 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
982 /* please fix it and tell me how to detect the fix */
983 flags &= ~EVBACKEND_EPOLL;
984
985 return flags;
933} 986}
934 987
935unsigned int 988unsigned int
936ev_backend (EV_P) 989ev_backend (EV_P)
937{ 990{
… …
940 993
941unsigned int 994unsigned int
942ev_loop_count (EV_P) 995ev_loop_count (EV_P)
943{ 996{
944 return loop_count; 997 return loop_count;
998}
999
1000void
1001ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1002{
1003 io_blocktime = interval;
1004}
1005
1006void
1007ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1008{
1009 timeout_blocktime = interval;
945} 1010}
946 1011
947static void noinline 1012static void noinline
948loop_init (EV_P_ unsigned int flags) 1013loop_init (EV_P_ unsigned int flags)
949{ 1014{
… …
960 ev_rt_now = ev_time (); 1025 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1026 mn_now = get_clock ();
962 now_floor = mn_now; 1027 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1028 rtmn_diff = ev_rt_now - mn_now;
964 1029
1030 io_blocktime = 0.;
1031 timeout_blocktime = 0.;
1032
965 /* pid check not overridable via env */ 1033 /* pid check not overridable via env */
966#ifndef _WIN32 1034#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1035 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1036 curpid = getpid ();
969#endif 1037#endif
… …
1046 array_free (fdchange, EMPTY); 1114 array_free (fdchange, EMPTY);
1047 array_free (timer, EMPTY); 1115 array_free (timer, EMPTY);
1048#if EV_PERIODIC_ENABLE 1116#if EV_PERIODIC_ENABLE
1049 array_free (periodic, EMPTY); 1117 array_free (periodic, EMPTY);
1050#endif 1118#endif
1119#if EV_FORK_ENABLE
1120 array_free (fork, EMPTY);
1121#endif
1051 array_free (prepare, EMPTY); 1122 array_free (prepare, EMPTY);
1052 array_free (check, EMPTY); 1123 array_free (check, EMPTY);
1053 array_free (fork, EMPTY);
1054 1124
1055 backend = 0; 1125 backend = 0;
1056} 1126}
1057 1127
1058void inline_size infy_fork (EV_P); 1128void inline_size infy_fork (EV_P);
… …
1454 /* update fd-related kernel structures */ 1524 /* update fd-related kernel structures */
1455 fd_reify (EV_A); 1525 fd_reify (EV_A);
1456 1526
1457 /* calculate blocking time */ 1527 /* calculate blocking time */
1458 { 1528 {
1459 ev_tstamp block; 1529 ev_tstamp waittime = 0.;
1530 ev_tstamp sleeptime = 0.;
1460 1531
1461 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1532 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1462 block = 0.; /* do not block at all */
1463 else
1464 { 1533 {
1465 /* update time to cancel out callback processing overhead */ 1534 /* update time to cancel out callback processing overhead */
1466 time_update (EV_A_ 1e100); 1535 time_update (EV_A_ 1e100);
1467 1536
1468 block = MAX_BLOCKTIME; 1537 waittime = MAX_BLOCKTIME;
1469 1538
1470 if (timercnt) 1539 if (timercnt)
1471 { 1540 {
1472 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1541 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1473 if (block > to) block = to; 1542 if (waittime > to) waittime = to;
1474 } 1543 }
1475 1544
1476#if EV_PERIODIC_ENABLE 1545#if EV_PERIODIC_ENABLE
1477 if (periodiccnt) 1546 if (periodiccnt)
1478 { 1547 {
1479 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1548 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1480 if (block > to) block = to; 1549 if (waittime > to) waittime = to;
1481 } 1550 }
1482#endif 1551#endif
1483 1552
1484 if (expect_false (block < 0.)) block = 0.; 1553 if (expect_false (waittime < timeout_blocktime))
1554 waittime = timeout_blocktime;
1555
1556 sleeptime = waittime - backend_fudge;
1557
1558 if (expect_true (sleeptime > io_blocktime))
1559 sleeptime = io_blocktime;
1560
1561 if (sleeptime)
1562 {
1563 ev_sleep (sleeptime);
1564 waittime -= sleeptime;
1565 }
1485 } 1566 }
1486 1567
1487 ++loop_count; 1568 ++loop_count;
1488 backend_poll (EV_A_ block); 1569 backend_poll (EV_A_ waittime);
1489 1570
1490 /* update ev_rt_now, do magic */ 1571 /* update ev_rt_now, do magic */
1491 time_update (EV_A_ block); 1572 time_update (EV_A_ waittime + sleeptime);
1492 } 1573 }
1493 1574
1494 /* queue pending timers and reschedule them */ 1575 /* queue pending timers and reschedule them */
1495 timers_reify (EV_A); /* relative timers called last */ 1576 timers_reify (EV_A); /* relative timers called last */
1496#if EV_PERIODIC_ENABLE 1577#if EV_PERIODIC_ENABLE
… …
2180 2261
2181#if EV_EMBED_ENABLE 2262#if EV_EMBED_ENABLE
2182void noinline 2263void noinline
2183ev_embed_sweep (EV_P_ ev_embed *w) 2264ev_embed_sweep (EV_P_ ev_embed *w)
2184{ 2265{
2185 ev_loop (w->loop, EVLOOP_NONBLOCK); 2266 ev_loop (w->other, EVLOOP_NONBLOCK);
2186} 2267}
2187 2268
2188static void 2269static void
2189embed_cb (EV_P_ ev_io *io, int revents) 2270embed_io_cb (EV_P_ ev_io *io, int revents)
2190{ 2271{
2191 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2272 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2192 2273
2193 if (ev_cb (w)) 2274 if (ev_cb (w))
2194 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2275 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2195 else 2276 else
2196 ev_embed_sweep (loop, w); 2277 ev_loop (w->other, EVLOOP_NONBLOCK);
2197} 2278}
2279
2280static void
2281embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2282{
2283 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2284
2285 {
2286 struct ev_loop *loop = w->other;
2287
2288 while (fdchangecnt)
2289 {
2290 fd_reify (EV_A);
2291 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2292 }
2293 }
2294}
2295
2296#if 0
2297static void
2298embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2299{
2300 ev_idle_stop (EV_A_ idle);
2301}
2302#endif
2198 2303
2199void 2304void
2200ev_embed_start (EV_P_ ev_embed *w) 2305ev_embed_start (EV_P_ ev_embed *w)
2201{ 2306{
2202 if (expect_false (ev_is_active (w))) 2307 if (expect_false (ev_is_active (w)))
2203 return; 2308 return;
2204 2309
2205 { 2310 {
2206 struct ev_loop *loop = w->loop; 2311 struct ev_loop *loop = w->other;
2207 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2312 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2208 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2313 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2209 } 2314 }
2210 2315
2211 ev_set_priority (&w->io, ev_priority (w)); 2316 ev_set_priority (&w->io, ev_priority (w));
2212 ev_io_start (EV_A_ &w->io); 2317 ev_io_start (EV_A_ &w->io);
2213 2318
2319 ev_prepare_init (&w->prepare, embed_prepare_cb);
2320 ev_set_priority (&w->prepare, EV_MINPRI);
2321 ev_prepare_start (EV_A_ &w->prepare);
2322
2323 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2324
2214 ev_start (EV_A_ (W)w, 1); 2325 ev_start (EV_A_ (W)w, 1);
2215} 2326}
2216 2327
2217void 2328void
2218ev_embed_stop (EV_P_ ev_embed *w) 2329ev_embed_stop (EV_P_ ev_embed *w)
… …
2220 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2221 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2222 return; 2333 return;
2223 2334
2224 ev_io_stop (EV_A_ &w->io); 2335 ev_io_stop (EV_A_ &w->io);
2336 ev_prepare_stop (EV_A_ &w->prepare);
2225 2337
2226 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2227} 2339}
2228#endif 2340#endif
2229 2341
… …
2318 ev_timer_set (&once->to, timeout, 0.); 2430 ev_timer_set (&once->to, timeout, 0.);
2319 ev_timer_start (EV_A_ &once->to); 2431 ev_timer_start (EV_A_ &once->to);
2320 } 2432 }
2321} 2433}
2322 2434
2435#if EV_MULTIPLICITY
2436 #include "ev_wrap.h"
2437#endif
2438
2323#ifdef __cplusplus 2439#ifdef __cplusplus
2324} 2440}
2325#endif 2441#endif
2326 2442

Diff Legend

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