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

Comparing libev/ev.c (file contents):
Revision 1.192 by root, Fri Dec 21 07:55:29 2007 UTC vs.
Revision 1.196 by root, Sat Dec 22 12:43:28 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/* sig_atomic_t is used to avoid per-thread variables or locking but still */
286/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
268 288
269#ifdef _WIN32 289#ifdef _WIN32
270# include "ev_win32.c" 290# include "ev_win32.c"
271#endif 291#endif
272 292
… …
408{ 428{
409 return ev_rt_now; 429 return ev_rt_now;
410} 430}
411#endif 431#endif
412 432
433void
434ev_sleep (ev_tstamp delay)
435{
436 if (delay > 0.)
437 {
438#if EV_USE_NANOSLEEP
439 struct timespec ts;
440
441 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443
444 nanosleep (&ts, 0);
445#elif defined(_WIN32)
446 Sleep (delay * 1e3);
447#else
448 struct timeval tv;
449
450 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
452
453 select (0, 0, 0, 0, &tv);
454#endif
455 }
456}
457
458/*****************************************************************************/
459
413int inline_size 460int inline_size
414array_nextsize (int elem, int cur, int cnt) 461array_nextsize (int elem, int cur, int cnt)
415{ 462{
416 int ncur = cur + 1; 463 int ncur = cur + 1;
417 464
… …
925} 972}
926 973
927unsigned int 974unsigned int
928ev_embeddable_backends (void) 975ev_embeddable_backends (void)
929{ 976{
977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
978
930 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 979 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
931 return EVBACKEND_KQUEUE 980 /* please fix it and tell me how to detect the fix */
932 | EVBACKEND_PORT; 981 flags &= ~EVBACKEND_EPOLL;
982
983#ifdef __APPLE__
984 /* is there anything thats not broken on darwin? */
985 flags &= ~EVBACKEND_KQUEUE;
986#endif
987
988 return flags;
933} 989}
934 990
935unsigned int 991unsigned int
936ev_backend (EV_P) 992ev_backend (EV_P)
937{ 993{
… …
940 996
941unsigned int 997unsigned int
942ev_loop_count (EV_P) 998ev_loop_count (EV_P)
943{ 999{
944 return loop_count; 1000 return loop_count;
1001}
1002
1003void
1004ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1005{
1006 io_blocktime = interval;
1007}
1008
1009void
1010ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1011{
1012 timeout_blocktime = interval;
945} 1013}
946 1014
947static void noinline 1015static void noinline
948loop_init (EV_P_ unsigned int flags) 1016loop_init (EV_P_ unsigned int flags)
949{ 1017{
… …
959 1027
960 ev_rt_now = ev_time (); 1028 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1029 mn_now = get_clock ();
962 now_floor = mn_now; 1030 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1031 rtmn_diff = ev_rt_now - mn_now;
1032
1033 io_blocktime = 0.;
1034 timeout_blocktime = 0.;
964 1035
965 /* pid check not overridable via env */ 1036 /* pid check not overridable via env */
966#ifndef _WIN32 1037#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1038 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1039 curpid = getpid ();
… …
1456 /* update fd-related kernel structures */ 1527 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1528 fd_reify (EV_A);
1458 1529
1459 /* calculate blocking time */ 1530 /* calculate blocking time */
1460 { 1531 {
1461 ev_tstamp block; 1532 ev_tstamp waittime = 0.;
1533 ev_tstamp sleeptime = 0.;
1462 1534
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1535 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1536 {
1467 /* update time to cancel out callback processing overhead */ 1537 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1538 time_update (EV_A_ 1e100);
1469 1539
1470 block = MAX_BLOCKTIME; 1540 waittime = MAX_BLOCKTIME;
1471 1541
1472 if (timercnt) 1542 if (timercnt)
1473 { 1543 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1544 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1475 if (block > to) block = to; 1545 if (waittime > to) waittime = to;
1476 } 1546 }
1477 1547
1478#if EV_PERIODIC_ENABLE 1548#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1549 if (periodiccnt)
1480 { 1550 {
1481 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1551 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1482 if (block > to) block = to; 1552 if (waittime > to) waittime = to;
1483 } 1553 }
1484#endif 1554#endif
1485 1555
1486 if (expect_false (block < 0.)) block = 0.; 1556 if (expect_false (waittime < timeout_blocktime))
1557 waittime = timeout_blocktime;
1558
1559 sleeptime = waittime - backend_fudge;
1560
1561 if (expect_true (sleeptime > io_blocktime))
1562 sleeptime = io_blocktime;
1563
1564 if (sleeptime)
1565 {
1566 ev_sleep (sleeptime);
1567 waittime -= sleeptime;
1568 }
1487 } 1569 }
1488 1570
1489 ++loop_count; 1571 ++loop_count;
1490 backend_poll (EV_A_ block); 1572 backend_poll (EV_A_ waittime);
1491 1573
1492 /* update ev_rt_now, do magic */ 1574 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1575 time_update (EV_A_ waittime + sleeptime);
1494 } 1576 }
1495 1577
1496 /* queue pending timers and reschedule them */ 1578 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1579 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1580#if EV_PERIODIC_ENABLE
… …
2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2275 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2194 2276
2195 if (ev_cb (w)) 2277 if (ev_cb (w))
2196 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2278 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2197 else 2279 else
2198 ev_embed_sweep (loop, w); 2280 ev_loop (w->other, EVLOOP_NONBLOCK);
2199} 2281}
2200 2282
2201static void 2283static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2284embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{ 2285{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2286 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205 2287
2206 fd_reify (w->other); 2288 {
2289 struct ev_loop *loop = w->other;
2290
2291 while (fdchangecnt)
2292 {
2293 fd_reify (EV_A);
2294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2295 }
2296 }
2207} 2297}
2298
2299#if 0
2300static void
2301embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2302{
2303 ev_idle_stop (EV_A_ idle);
2304}
2305#endif
2208 2306
2209void 2307void
2210ev_embed_start (EV_P_ ev_embed *w) 2308ev_embed_start (EV_P_ ev_embed *w)
2211{ 2309{
2212 if (expect_false (ev_is_active (w))) 2310 if (expect_false (ev_is_active (w)))
… …
2223 2321
2224 ev_prepare_init (&w->prepare, embed_prepare_cb); 2322 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI); 2323 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare); 2324 ev_prepare_start (EV_A_ &w->prepare);
2227 2325
2326 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2327
2228 ev_start (EV_A_ (W)w, 1); 2328 ev_start (EV_A_ (W)w, 1);
2229} 2329}
2230 2330
2231void 2331void
2232ev_embed_stop (EV_P_ ev_embed *w) 2332ev_embed_stop (EV_P_ ev_embed *w)

Diff Legend

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