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

Comparing libev/ev.c (file contents):
Revision 1.182 by root, Wed Dec 12 01:27:08 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
… …
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
… …
261 280
262typedef ev_watcher *W; 281typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
265 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 */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 288static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
289#endif
267 290
268#ifdef _WIN32 291#ifdef _WIN32
269# include "ev_win32.c" 292# include "ev_win32.c"
270#endif 293#endif
271 294
… …
407{ 430{
408 return ev_rt_now; 431 return ev_rt_now;
409} 432}
410#endif 433#endif
411 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
412int inline_size 462int inline_size
413array_nextsize (int elem, int cur, int cnt) 463array_nextsize (int elem, int cur, int cnt)
414{ 464{
415 int ncur = cur + 1; 465 int ncur = cur + 1;
416 466
… …
533 { 583 {
534 int fd = fdchanges [i]; 584 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 585 ANFD *anfd = anfds + fd;
536 ev_io *w; 586 ev_io *w;
537 587
538 int events = 0; 588 unsigned char events = 0;
539 589
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 590 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 591 events |= (unsigned char)w->events;
542 592
543#if EV_SELECT_IS_WINSOCKET 593#if EV_SELECT_IS_WINSOCKET
544 if (events) 594 if (events)
545 { 595 {
546 unsigned long argp; 596 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 597 anfd->handle = _get_osfhandle (fd);
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 598 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 599 }
550#endif 600#endif
551 601
602 {
603 unsigned char o_events = anfd->events;
604 unsigned char o_reify = anfd->reify;
605
552 anfd->reify = 0; 606 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 607 anfd->events = events;
608
609 if (o_events != events || o_reify & EV_IOFDSET)
610 backend_modify (EV_A_ fd, o_events, events);
611 }
556 } 612 }
557 613
558 fdchangecnt = 0; 614 fdchangecnt = 0;
559} 615}
560 616
561void inline_size 617void inline_size
562fd_change (EV_P_ int fd) 618fd_change (EV_P_ int fd, int flags)
563{ 619{
564 if (expect_false (anfds [fd].reify)) 620 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 621 anfds [fd].reify |= flags;
568 622
623 if (expect_true (!reify))
624 {
569 ++fdchangecnt; 625 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 626 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 627 fdchanges [fdchangecnt - 1] = fd;
628 }
572} 629}
573 630
574void inline_speed 631void inline_speed
575fd_kill (EV_P_ int fd) 632fd_kill (EV_P_ int fd)
576{ 633{
… …
627 684
628 for (fd = 0; fd < anfdmax; ++fd) 685 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 686 if (anfds [fd].events)
630 { 687 {
631 anfds [fd].events = 0; 688 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 689 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 690 }
634} 691}
635 692
636/*****************************************************************************/ 693/*****************************************************************************/
637 694
… …
917} 974}
918 975
919unsigned int 976unsigned int
920ev_embeddable_backends (void) 977ev_embeddable_backends (void)
921{ 978{
922 return EVBACKEND_EPOLL 979 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
923 | EVBACKEND_KQUEUE 980
924 | 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;
925} 986}
926 987
927unsigned int 988unsigned int
928ev_backend (EV_P) 989ev_backend (EV_P)
929{ 990{
… …
932 993
933unsigned int 994unsigned int
934ev_loop_count (EV_P) 995ev_loop_count (EV_P)
935{ 996{
936 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;
937} 1010}
938 1011
939static void noinline 1012static void noinline
940loop_init (EV_P_ unsigned int flags) 1013loop_init (EV_P_ unsigned int flags)
941{ 1014{
… …
952 ev_rt_now = ev_time (); 1025 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1026 mn_now = get_clock ();
954 now_floor = mn_now; 1027 now_floor = mn_now;
955 rtmn_diff = ev_rt_now - mn_now; 1028 rtmn_diff = ev_rt_now - mn_now;
956 1029
1030 io_blocktime = 0.;
1031 timeout_blocktime = 0.;
1032
957 /* pid check not overridable via env */ 1033 /* pid check not overridable via env */
958#ifndef _WIN32 1034#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1035 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1036 curpid = getpid ();
961#endif 1037#endif
… …
1029 array_free (pending, [i]); 1105 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1106#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1107 array_free (idle, [i]);
1032#endif 1108#endif
1033 } 1109 }
1110
1111 ev_free (anfds); anfdmax = 0;
1034 1112
1035 /* have to use the microsoft-never-gets-it-right macro */ 1113 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1114 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1115 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1116#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1117 array_free (periodic, EMPTY);
1118#endif
1119#if EV_FORK_ENABLE
1120 array_free (fork, EMPTY);
1040#endif 1121#endif
1041 array_free (prepare, EMPTY); 1122 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1123 array_free (check, EMPTY);
1043 1124
1044 backend = 0; 1125 backend = 0;
… …
1443 /* update fd-related kernel structures */ 1524 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1525 fd_reify (EV_A);
1445 1526
1446 /* calculate blocking time */ 1527 /* calculate blocking time */
1447 { 1528 {
1448 ev_tstamp block; 1529 ev_tstamp waittime = 0.;
1530 ev_tstamp sleeptime = 0.;
1449 1531
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1532 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1533 {
1454 /* update time to cancel out callback processing overhead */ 1534 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 1535 time_update (EV_A_ 1e100);
1456 1536
1457 block = MAX_BLOCKTIME; 1537 waittime = MAX_BLOCKTIME;
1458 1538
1459 if (timercnt) 1539 if (timercnt)
1460 { 1540 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1541 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1462 if (block > to) block = to; 1542 if (waittime > to) waittime = to;
1463 } 1543 }
1464 1544
1465#if EV_PERIODIC_ENABLE 1545#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 1546 if (periodiccnt)
1467 { 1547 {
1468 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;
1469 if (block > to) block = to; 1549 if (waittime > to) waittime = to;
1470 } 1550 }
1471#endif 1551#endif
1472 1552
1473 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 }
1474 } 1566 }
1475 1567
1476 ++loop_count; 1568 ++loop_count;
1477 backend_poll (EV_A_ block); 1569 backend_poll (EV_A_ waittime);
1478 1570
1479 /* update ev_rt_now, do magic */ 1571 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 1572 time_update (EV_A_ waittime + sleeptime);
1481 } 1573 }
1482 1574
1483 /* queue pending timers and reschedule them */ 1575 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 1576 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 1577#if EV_PERIODIC_ENABLE
… …
1599 1691
1600 ev_start (EV_A_ (W)w, 1); 1692 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1693 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1602 wlist_add (&anfds[fd].head, (WL)w); 1694 wlist_add (&anfds[fd].head, (WL)w);
1603 1695
1604 fd_change (EV_A_ fd); 1696 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1697 w->events &= ~EV_IOFDSET;
1605} 1698}
1606 1699
1607void noinline 1700void noinline
1608ev_io_stop (EV_P_ ev_io *w) 1701ev_io_stop (EV_P_ ev_io *w)
1609{ 1702{
… …
1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1707 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1615 1708
1616 wlist_del (&anfds[w->fd].head, (WL)w); 1709 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 1710 ev_stop (EV_A_ (W)w);
1618 1711
1619 fd_change (EV_A_ w->fd); 1712 fd_change (EV_A_ w->fd, 1);
1620} 1713}
1621 1714
1622void noinline 1715void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 1716ev_timer_start (EV_P_ ev_timer *w)
1624{ 1717{
… …
2168 2261
2169#if EV_EMBED_ENABLE 2262#if EV_EMBED_ENABLE
2170void noinline 2263void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2264ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2265{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2266 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2267}
2175 2268
2176static void 2269static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2270embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2271{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2272 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2273
2181 if (ev_cb (w)) 2274 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2275 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2276 else
2184 ev_embed_sweep (loop, w); 2277 ev_loop (w->other, EVLOOP_NONBLOCK);
2185} 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
2186 2303
2187void 2304void
2188ev_embed_start (EV_P_ ev_embed *w) 2305ev_embed_start (EV_P_ ev_embed *w)
2189{ 2306{
2190 if (expect_false (ev_is_active (w))) 2307 if (expect_false (ev_is_active (w)))
2191 return; 2308 return;
2192 2309
2193 { 2310 {
2194 struct ev_loop *loop = w->loop; 2311 struct ev_loop *loop = w->other;
2195 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 ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2313 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2314 }
2198 2315
2199 ev_set_priority (&w->io, ev_priority (w)); 2316 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2317 ev_io_start (EV_A_ &w->io);
2201 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
2202 ev_start (EV_A_ (W)w, 1); 2325 ev_start (EV_A_ (W)w, 1);
2203} 2326}
2204 2327
2205void 2328void
2206ev_embed_stop (EV_P_ ev_embed *w) 2329ev_embed_stop (EV_P_ ev_embed *w)
… …
2208 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2210 return; 2333 return;
2211 2334
2212 ev_io_stop (EV_A_ &w->io); 2335 ev_io_stop (EV_A_ &w->io);
2336 ev_prepare_stop (EV_A_ &w->prepare);
2213 2337
2214 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2215} 2339}
2216#endif 2340#endif
2217 2341
… …
2306 ev_timer_set (&once->to, timeout, 0.); 2430 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 2431 ev_timer_start (EV_A_ &once->to);
2308 } 2432 }
2309} 2433}
2310 2434
2435#if EV_MULTIPLICITY
2436 #include "ev_wrap.h"
2437#endif
2438
2311#ifdef __cplusplus 2439#ifdef __cplusplus
2312} 2440}
2313#endif 2441#endif
2314 2442

Diff Legend

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