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

Comparing libev/ev.c (file contents):
Revision 1.168 by root, Sat Dec 8 14:12:07 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 236#endif
210 237
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
218
219/**/ 238/**/
239
240/*
241 * This is used to avoid floating point rounding problems.
242 * It is added to ev_rt_now when scheduling periodics
243 * to ensure progress, time-wise, even when rounding
244 * errors are against us.
245 * This value is good at least till the year 4000.
246 * Better solutions welcome.
247 */
248#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 249
221#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) */
222#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) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 252/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 253
225#if __GNUC__ >= 3 254#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 255# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 256# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 257#else
236# define expect(expr,value) (expr) 258# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 259# define noinline
260# if __STDC_VERSION__ < 199901L
261# define inline
262# endif
240#endif 263#endif
241 264
242#define expect_false(expr) expect ((expr) != 0, 0) 265#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 266#define expect_true(expr) expect ((expr) != 0, 1)
267#define inline_size static inline
268
269#if EV_MINIMAL
270# define inline_speed static noinline
271#else
272# define inline_speed static inline
273#endif
244 274
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 275#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 276#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 277
248#define EMPTY /* required for microsofts broken pseudo-c compiler */ 278#define EMPTY /* required for microsofts broken pseudo-c compiler */
250 280
251typedef ev_watcher *W; 281typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
254 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 */
255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 288static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
289#endif
256 290
257#ifdef _WIN32 291#ifdef _WIN32
258# include "ev_win32.c" 292# include "ev_win32.c"
259#endif 293#endif
260 294
396{ 430{
397 return ev_rt_now; 431 return ev_rt_now;
398} 432}
399#endif 433#endif
400 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
401int inline_size 462int inline_size
402array_nextsize (int elem, int cur, int cnt) 463array_nextsize (int elem, int cur, int cnt)
403{ 464{
404 int ncur = cur + 1; 465 int ncur = cur + 1;
405 466
417 } 478 }
418 479
419 return ncur; 480 return ncur;
420} 481}
421 482
422inline_speed void * 483static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 484array_realloc (int elem, void *base, int *cur, int cnt)
424{ 485{
425 *cur = array_nextsize (elem, *cur, cnt); 486 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 487 return ev_realloc (base, elem * *cur);
427} 488}
452 513
453void noinline 514void noinline
454ev_feed_event (EV_P_ void *w, int revents) 515ev_feed_event (EV_P_ void *w, int revents)
455{ 516{
456 W w_ = (W)w; 517 W w_ = (W)w;
518 int pri = ABSPRI (w_);
457 519
458 if (expect_false (w_->pending)) 520 if (expect_false (w_->pending))
521 pendings [pri][w_->pending - 1].events |= revents;
522 else
459 { 523 {
524 w_->pending = ++pendingcnt [pri];
525 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
526 pendings [pri][w_->pending - 1].w = w_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 527 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 528 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 529}
469 530
470void inline_size 531void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 532queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 533{
473 int i; 534 int i;
474 535
475 for (i = 0; i < eventcnt; ++i) 536 for (i = 0; i < eventcnt; ++i)
522 { 583 {
523 int fd = fdchanges [i]; 584 int fd = fdchanges [i];
524 ANFD *anfd = anfds + fd; 585 ANFD *anfd = anfds + fd;
525 ev_io *w; 586 ev_io *w;
526 587
527 int events = 0; 588 unsigned char events = 0;
528 589
529 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)
530 events |= w->events; 591 events |= (unsigned char)w->events;
531 592
532#if EV_SELECT_IS_WINSOCKET 593#if EV_SELECT_IS_WINSOCKET
533 if (events) 594 if (events)
534 { 595 {
535 unsigned long argp; 596 unsigned long argp;
536 anfd->handle = _get_osfhandle (fd); 597 anfd->handle = _get_osfhandle (fd);
537 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));
538 } 599 }
539#endif 600#endif
540 601
602 {
603 unsigned char o_events = anfd->events;
604 unsigned char o_reify = anfd->reify;
605
541 anfd->reify = 0; 606 anfd->reify = 0;
542
543 backend_modify (EV_A_ fd, anfd->events, events);
544 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 }
545 } 612 }
546 613
547 fdchangecnt = 0; 614 fdchangecnt = 0;
548} 615}
549 616
550void inline_size 617void inline_size
551fd_change (EV_P_ int fd) 618fd_change (EV_P_ int fd, int flags)
552{ 619{
553 if (expect_false (anfds [fd].reify)) 620 unsigned char reify = anfds [fd].reify;
554 return;
555
556 anfds [fd].reify = 1; 621 anfds [fd].reify |= flags;
557 622
623 if (expect_true (!reify))
624 {
558 ++fdchangecnt; 625 ++fdchangecnt;
559 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 626 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
560 fdchanges [fdchangecnt - 1] = fd; 627 fdchanges [fdchangecnt - 1] = fd;
628 }
561} 629}
562 630
563void inline_speed 631void inline_speed
564fd_kill (EV_P_ int fd) 632fd_kill (EV_P_ int fd)
565{ 633{
616 684
617 for (fd = 0; fd < anfdmax; ++fd) 685 for (fd = 0; fd < anfdmax; ++fd)
618 if (anfds [fd].events) 686 if (anfds [fd].events)
619 { 687 {
620 anfds [fd].events = 0; 688 anfds [fd].events = 0;
621 fd_change (EV_A_ fd); 689 fd_change (EV_A_ fd, EV_IOFDSET | 1);
622 } 690 }
623} 691}
624 692
625/*****************************************************************************/ 693/*****************************************************************************/
626 694
627void inline_speed 695void inline_speed
628upheap (WT *heap, int k) 696upheap (WT *heap, int k)
629{ 697{
630 WT w = heap [k]; 698 WT w = heap [k];
631 699
632 while (k && heap [k >> 1]->at > w->at) 700 while (k)
633 { 701 {
702 int p = (k - 1) >> 1;
703
704 if (heap [p]->at <= w->at)
705 break;
706
634 heap [k] = heap [k >> 1]; 707 heap [k] = heap [p];
635 ((W)heap [k])->active = k + 1; 708 ((W)heap [k])->active = k + 1;
636 k >>= 1; 709 k = p;
637 } 710 }
638 711
639 heap [k] = w; 712 heap [k] = w;
640 ((W)heap [k])->active = k + 1; 713 ((W)heap [k])->active = k + 1;
641
642} 714}
643 715
644void inline_speed 716void inline_speed
645downheap (WT *heap, int N, int k) 717downheap (WT *heap, int N, int k)
646{ 718{
647 WT w = heap [k]; 719 WT w = heap [k];
648 720
649 while (k < (N >> 1)) 721 for (;;)
650 { 722 {
651 int j = k << 1; 723 int c = (k << 1) + 1;
652 724
653 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 725 if (c >= N)
654 ++j;
655
656 if (w->at <= heap [j]->at)
657 break; 726 break;
658 727
728 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
729 ? 1 : 0;
730
731 if (w->at <= heap [c]->at)
732 break;
733
659 heap [k] = heap [j]; 734 heap [k] = heap [c];
660 ((W)heap [k])->active = k + 1; 735 ((W)heap [k])->active = k + 1;
736
661 k = j; 737 k = c;
662 } 738 }
663 739
664 heap [k] = w; 740 heap [k] = w;
665 ((W)heap [k])->active = k + 1; 741 ((W)heap [k])->active = k + 1;
666} 742}
748 for (signum = signalmax; signum--; ) 824 for (signum = signalmax; signum--; )
749 if (signals [signum].gotsig) 825 if (signals [signum].gotsig)
750 ev_feed_signal_event (EV_A_ signum + 1); 826 ev_feed_signal_event (EV_A_ signum + 1);
751} 827}
752 828
753void inline_size 829void inline_speed
754fd_intern (int fd) 830fd_intern (int fd)
755{ 831{
756#ifdef _WIN32 832#ifdef _WIN32
757 int arg = 1; 833 int arg = 1;
758 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 834 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
773 ev_unref (EV_A); /* child watcher should not keep loop alive */ 849 ev_unref (EV_A); /* child watcher should not keep loop alive */
774} 850}
775 851
776/*****************************************************************************/ 852/*****************************************************************************/
777 853
778static ev_child *childs [EV_PID_HASHSIZE]; 854static WL childs [EV_PID_HASHSIZE];
779 855
780#ifndef _WIN32 856#ifndef _WIN32
781 857
782static ev_signal childev; 858static ev_signal childev;
783 859
898} 974}
899 975
900unsigned int 976unsigned int
901ev_embeddable_backends (void) 977ev_embeddable_backends (void)
902{ 978{
903 return EVBACKEND_EPOLL 979 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
904 | EVBACKEND_KQUEUE 980
905 | 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;
906} 986}
907 987
908unsigned int 988unsigned int
909ev_backend (EV_P) 989ev_backend (EV_P)
910{ 990{
913 993
914unsigned int 994unsigned int
915ev_loop_count (EV_P) 995ev_loop_count (EV_P)
916{ 996{
917 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;
918} 1010}
919 1011
920static void noinline 1012static void noinline
921loop_init (EV_P_ unsigned int flags) 1013loop_init (EV_P_ unsigned int flags)
922{ 1014{
933 ev_rt_now = ev_time (); 1025 ev_rt_now = ev_time ();
934 mn_now = get_clock (); 1026 mn_now = get_clock ();
935 now_floor = mn_now; 1027 now_floor = mn_now;
936 rtmn_diff = ev_rt_now - mn_now; 1028 rtmn_diff = ev_rt_now - mn_now;
937 1029
1030 io_blocktime = 0.;
1031 timeout_blocktime = 0.;
1032
938 /* pid check not overridable via env */ 1033 /* pid check not overridable via env */
939#ifndef _WIN32 1034#ifndef _WIN32
940 if (flags & EVFLAG_FORKCHECK) 1035 if (flags & EVFLAG_FORKCHECK)
941 curpid = getpid (); 1036 curpid = getpid ();
942#endif 1037#endif
1010 array_free (pending, [i]); 1105 array_free (pending, [i]);
1011#if EV_IDLE_ENABLE 1106#if EV_IDLE_ENABLE
1012 array_free (idle, [i]); 1107 array_free (idle, [i]);
1013#endif 1108#endif
1014 } 1109 }
1110
1111 ev_free (anfds); anfdmax = 0;
1015 1112
1016 /* have to use the microsoft-never-gets-it-right macro */ 1113 /* have to use the microsoft-never-gets-it-right macro */
1017 array_free (fdchange, EMPTY); 1114 array_free (fdchange, EMPTY);
1018 array_free (timer, EMPTY); 1115 array_free (timer, EMPTY);
1019#if EV_PERIODIC_ENABLE 1116#if EV_PERIODIC_ENABLE
1020 array_free (periodic, EMPTY); 1117 array_free (periodic, EMPTY);
1118#endif
1119#if EV_FORK_ENABLE
1120 array_free (fork, EMPTY);
1021#endif 1121#endif
1022 array_free (prepare, EMPTY); 1122 array_free (prepare, EMPTY);
1023 array_free (check, EMPTY); 1123 array_free (check, EMPTY);
1024 1124
1025 backend = 0; 1125 backend = 0;
1195void inline_size 1295void inline_size
1196timers_reify (EV_P) 1296timers_reify (EV_P)
1197{ 1297{
1198 while (timercnt && ((WT)timers [0])->at <= mn_now) 1298 while (timercnt && ((WT)timers [0])->at <= mn_now)
1199 { 1299 {
1200 ev_timer *w = timers [0]; 1300 ev_timer *w = (ev_timer *)timers [0];
1201 1301
1202 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1302 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1203 1303
1204 /* first reschedule or stop timer */ 1304 /* first reschedule or stop timer */
1205 if (w->repeat) 1305 if (w->repeat)
1208 1308
1209 ((WT)w)->at += w->repeat; 1309 ((WT)w)->at += w->repeat;
1210 if (((WT)w)->at < mn_now) 1310 if (((WT)w)->at < mn_now)
1211 ((WT)w)->at = mn_now; 1311 ((WT)w)->at = mn_now;
1212 1312
1213 downheap ((WT *)timers, timercnt, 0); 1313 downheap (timers, timercnt, 0);
1214 } 1314 }
1215 else 1315 else
1216 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1316 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1217 1317
1218 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1318 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1223void inline_size 1323void inline_size
1224periodics_reify (EV_P) 1324periodics_reify (EV_P)
1225{ 1325{
1226 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1326 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1227 { 1327 {
1228 ev_periodic *w = periodics [0]; 1328 ev_periodic *w = (ev_periodic *)periodics [0];
1229 1329
1230 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1330 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1231 1331
1232 /* first reschedule or stop timer */ 1332 /* first reschedule or stop timer */
1233 if (w->reschedule_cb) 1333 if (w->reschedule_cb)
1234 { 1334 {
1235 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1335 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1236 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1336 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1237 downheap ((WT *)periodics, periodiccnt, 0); 1337 downheap (periodics, periodiccnt, 0);
1238 } 1338 }
1239 else if (w->interval) 1339 else if (w->interval)
1240 { 1340 {
1241 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1341 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1342 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1242 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1343 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1243 downheap ((WT *)periodics, periodiccnt, 0); 1344 downheap (periodics, periodiccnt, 0);
1244 } 1345 }
1245 else 1346 else
1246 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1347 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1247 1348
1248 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1349 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1255 int i; 1356 int i;
1256 1357
1257 /* adjust periodics after time jump */ 1358 /* adjust periodics after time jump */
1258 for (i = 0; i < periodiccnt; ++i) 1359 for (i = 0; i < periodiccnt; ++i)
1259 { 1360 {
1260 ev_periodic *w = periodics [i]; 1361 ev_periodic *w = (ev_periodic *)periodics [i];
1261 1362
1262 if (w->reschedule_cb) 1363 if (w->reschedule_cb)
1263 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1364 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1264 else if (w->interval) 1365 else if (w->interval)
1265 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1366 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1266 } 1367 }
1267 1368
1268 /* now rebuild the heap */ 1369 /* now rebuild the heap */
1269 for (i = periodiccnt >> 1; i--; ) 1370 for (i = periodiccnt >> 1; i--; )
1270 downheap ((WT *)periodics, periodiccnt, i); 1371 downheap (periodics, periodiccnt, i);
1271} 1372}
1272#endif 1373#endif
1273 1374
1274#if EV_IDLE_ENABLE 1375#if EV_IDLE_ENABLE
1275void inline_size 1376void inline_size
1292 } 1393 }
1293 } 1394 }
1294} 1395}
1295#endif 1396#endif
1296 1397
1297int inline_size 1398void inline_speed
1298time_update_monotonic (EV_P) 1399time_update (EV_P_ ev_tstamp max_block)
1299{ 1400{
1401 int i;
1402
1403#if EV_USE_MONOTONIC
1404 if (expect_true (have_monotonic))
1405 {
1406 ev_tstamp odiff = rtmn_diff;
1407
1300 mn_now = get_clock (); 1408 mn_now = get_clock ();
1301 1409
1410 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1411 /* interpolate in the meantime */
1302 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1412 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1303 { 1413 {
1304 ev_rt_now = rtmn_diff + mn_now; 1414 ev_rt_now = rtmn_diff + mn_now;
1305 return 0; 1415 return;
1306 } 1416 }
1307 else 1417
1308 {
1309 now_floor = mn_now; 1418 now_floor = mn_now;
1310 ev_rt_now = ev_time (); 1419 ev_rt_now = ev_time ();
1311 return 1;
1312 }
1313}
1314 1420
1315void inline_size 1421 /* loop a few times, before making important decisions.
1316time_update (EV_P) 1422 * on the choice of "4": one iteration isn't enough,
1317{ 1423 * in case we get preempted during the calls to
1318 int i; 1424 * ev_time and get_clock. a second call is almost guaranteed
1319 1425 * to succeed in that case, though. and looping a few more times
1320#if EV_USE_MONOTONIC 1426 * doesn't hurt either as we only do this on time-jumps or
1321 if (expect_true (have_monotonic)) 1427 * in the unlikely event of having been preempted here.
1322 { 1428 */
1323 if (time_update_monotonic (EV_A)) 1429 for (i = 4; --i; )
1324 { 1430 {
1325 ev_tstamp odiff = rtmn_diff;
1326
1327 /* loop a few times, before making important decisions.
1328 * on the choice of "4": one iteration isn't enough,
1329 * in case we get preempted during the calls to
1330 * ev_time and get_clock. a second call is almost guaranteed
1331 * to succeed in that case, though. and looping a few more times
1332 * doesn't hurt either as we only do this on time-jumps or
1333 * in the unlikely event of having been preempted here.
1334 */
1335 for (i = 4; --i; )
1336 {
1337 rtmn_diff = ev_rt_now - mn_now; 1431 rtmn_diff = ev_rt_now - mn_now;
1338 1432
1339 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1433 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1340 return; /* all is well */ 1434 return; /* all is well */
1341 1435
1342 ev_rt_now = ev_time (); 1436 ev_rt_now = ev_time ();
1343 mn_now = get_clock (); 1437 mn_now = get_clock ();
1344 now_floor = mn_now; 1438 now_floor = mn_now;
1345 } 1439 }
1346 1440
1347# if EV_PERIODIC_ENABLE 1441# if EV_PERIODIC_ENABLE
1348 periodics_reschedule (EV_A); 1442 periodics_reschedule (EV_A);
1349# endif 1443# endif
1350 /* no timer adjustment, as the monotonic clock doesn't jump */ 1444 /* no timer adjustment, as the monotonic clock doesn't jump */
1351 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1445 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1352 }
1353 } 1446 }
1354 else 1447 else
1355#endif 1448#endif
1356 { 1449 {
1357 ev_rt_now = ev_time (); 1450 ev_rt_now = ev_time ();
1358 1451
1359 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1452 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1360 { 1453 {
1361#if EV_PERIODIC_ENABLE 1454#if EV_PERIODIC_ENABLE
1362 periodics_reschedule (EV_A); 1455 periodics_reschedule (EV_A);
1363#endif 1456#endif
1364
1365 /* adjust timers. this is easy, as the offset is the same for all of them */ 1457 /* adjust timers. this is easy, as the offset is the same for all of them */
1366 for (i = 0; i < timercnt; ++i) 1458 for (i = 0; i < timercnt; ++i)
1367 ((WT)timers [i])->at += ev_rt_now - mn_now; 1459 ((WT)timers [i])->at += ev_rt_now - mn_now;
1368 } 1460 }
1369 1461
1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1505 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1414 call_pending (EV_A); 1506 call_pending (EV_A);
1415 } 1507 }
1416#endif 1508#endif
1417 1509
1418 /* queue check watchers (and execute them) */ 1510 /* queue prepare watchers (and execute them) */
1419 if (expect_false (preparecnt)) 1511 if (expect_false (preparecnt))
1420 { 1512 {
1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1513 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1422 call_pending (EV_A); 1514 call_pending (EV_A);
1423 } 1515 }
1432 /* update fd-related kernel structures */ 1524 /* update fd-related kernel structures */
1433 fd_reify (EV_A); 1525 fd_reify (EV_A);
1434 1526
1435 /* calculate blocking time */ 1527 /* calculate blocking time */
1436 { 1528 {
1437 ev_tstamp block; 1529 ev_tstamp waittime = 0.;
1530 ev_tstamp sleeptime = 0.;
1438 1531
1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1532 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1440 block = 0.; /* do not block at all */
1441 else
1442 { 1533 {
1443 /* update time to cancel out callback processing overhead */ 1534 /* update time to cancel out callback processing overhead */
1444#if EV_USE_MONOTONIC
1445 if (expect_true (have_monotonic))
1446 time_update_monotonic (EV_A); 1535 time_update (EV_A_ 1e100);
1447 else
1448#endif
1449 {
1450 ev_rt_now = ev_time ();
1451 mn_now = ev_rt_now;
1452 }
1453 1536
1454 block = MAX_BLOCKTIME; 1537 waittime = MAX_BLOCKTIME;
1455 1538
1456 if (timercnt) 1539 if (timercnt)
1457 { 1540 {
1458 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1541 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1459 if (block > to) block = to; 1542 if (waittime > to) waittime = to;
1460 } 1543 }
1461 1544
1462#if EV_PERIODIC_ENABLE 1545#if EV_PERIODIC_ENABLE
1463 if (periodiccnt) 1546 if (periodiccnt)
1464 { 1547 {
1465 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;
1466 if (block > to) block = to; 1549 if (waittime > to) waittime = to;
1467 } 1550 }
1468#endif 1551#endif
1469 1552
1470 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 }
1471 } 1566 }
1472 1567
1473 ++loop_count; 1568 ++loop_count;
1474 backend_poll (EV_A_ block); 1569 backend_poll (EV_A_ waittime);
1570
1571 /* update ev_rt_now, do magic */
1572 time_update (EV_A_ waittime + sleeptime);
1475 } 1573 }
1476
1477 /* update ev_rt_now, do magic */
1478 time_update (EV_A);
1479 1574
1480 /* queue pending timers and reschedule them */ 1575 /* queue pending timers and reschedule them */
1481 timers_reify (EV_A); /* relative timers called last */ 1576 timers_reify (EV_A); /* relative timers called last */
1482#if EV_PERIODIC_ENABLE 1577#if EV_PERIODIC_ENABLE
1483 periodics_reify (EV_A); /* absolute timers called first */ 1578 periodics_reify (EV_A); /* absolute timers called first */
1545ev_clear_pending (EV_P_ void *w) 1640ev_clear_pending (EV_P_ void *w)
1546{ 1641{
1547 W w_ = (W)w; 1642 W w_ = (W)w;
1548 int pending = w_->pending; 1643 int pending = w_->pending;
1549 1644
1550 if (!pending) 1645 if (expect_true (pending))
1646 {
1647 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1648 w_->pending = 0;
1649 p->w = 0;
1650 return p->events;
1651 }
1652 else
1551 return 0; 1653 return 0;
1552
1553 w_->pending = 0;
1554 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1555 p->w = 0;
1556
1557 return p->events;
1558} 1654}
1559 1655
1560void inline_size 1656void inline_size
1561pri_adjust (EV_P_ W w) 1657pri_adjust (EV_P_ W w)
1562{ 1658{
1581 w->active = 0; 1677 w->active = 0;
1582} 1678}
1583 1679
1584/*****************************************************************************/ 1680/*****************************************************************************/
1585 1681
1586void 1682void noinline
1587ev_io_start (EV_P_ ev_io *w) 1683ev_io_start (EV_P_ ev_io *w)
1588{ 1684{
1589 int fd = w->fd; 1685 int fd = w->fd;
1590 1686
1591 if (expect_false (ev_is_active (w))) 1687 if (expect_false (ev_is_active (w)))
1593 1689
1594 assert (("ev_io_start called with negative fd", fd >= 0)); 1690 assert (("ev_io_start called with negative fd", fd >= 0));
1595 1691
1596 ev_start (EV_A_ (W)w, 1); 1692 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1693 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1598 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1694 wlist_add (&anfds[fd].head, (WL)w);
1599 1695
1600 fd_change (EV_A_ fd); 1696 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1697 w->events &= ~EV_IOFDSET;
1601} 1698}
1602 1699
1603void 1700void noinline
1604ev_io_stop (EV_P_ ev_io *w) 1701ev_io_stop (EV_P_ ev_io *w)
1605{ 1702{
1606 clear_pending (EV_A_ (W)w); 1703 clear_pending (EV_A_ (W)w);
1607 if (expect_false (!ev_is_active (w))) 1704 if (expect_false (!ev_is_active (w)))
1608 return; 1705 return;
1609 1706
1610 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));
1611 1708
1612 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1709 wlist_del (&anfds[w->fd].head, (WL)w);
1613 ev_stop (EV_A_ (W)w); 1710 ev_stop (EV_A_ (W)w);
1614 1711
1615 fd_change (EV_A_ w->fd); 1712 fd_change (EV_A_ w->fd, 1);
1616} 1713}
1617 1714
1618void 1715void noinline
1619ev_timer_start (EV_P_ ev_timer *w) 1716ev_timer_start (EV_P_ ev_timer *w)
1620{ 1717{
1621 if (expect_false (ev_is_active (w))) 1718 if (expect_false (ev_is_active (w)))
1622 return; 1719 return;
1623 1720
1624 ((WT)w)->at += mn_now; 1721 ((WT)w)->at += mn_now;
1625 1722
1626 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1723 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1627 1724
1628 ev_start (EV_A_ (W)w, ++timercnt); 1725 ev_start (EV_A_ (W)w, ++timercnt);
1629 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1726 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1630 timers [timercnt - 1] = w; 1727 timers [timercnt - 1] = (WT)w;
1631 upheap ((WT *)timers, timercnt - 1); 1728 upheap (timers, timercnt - 1);
1632 1729
1633 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1730 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1634} 1731}
1635 1732
1636void 1733void noinline
1637ev_timer_stop (EV_P_ ev_timer *w) 1734ev_timer_stop (EV_P_ ev_timer *w)
1638{ 1735{
1639 clear_pending (EV_A_ (W)w); 1736 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w))) 1737 if (expect_false (!ev_is_active (w)))
1641 return; 1738 return;
1642 1739
1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1740 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1644 1741
1645 { 1742 {
1646 int active = ((W)w)->active; 1743 int active = ((W)w)->active;
1647 1744
1648 if (expect_true (--active < --timercnt)) 1745 if (expect_true (--active < --timercnt))
1649 { 1746 {
1650 timers [active] = timers [timercnt]; 1747 timers [active] = timers [timercnt];
1651 adjustheap ((WT *)timers, timercnt, active); 1748 adjustheap (timers, timercnt, active);
1652 } 1749 }
1653 } 1750 }
1654 1751
1655 ((WT)w)->at -= mn_now; 1752 ((WT)w)->at -= mn_now;
1656 1753
1657 ev_stop (EV_A_ (W)w); 1754 ev_stop (EV_A_ (W)w);
1658} 1755}
1659 1756
1660void 1757void noinline
1661ev_timer_again (EV_P_ ev_timer *w) 1758ev_timer_again (EV_P_ ev_timer *w)
1662{ 1759{
1663 if (ev_is_active (w)) 1760 if (ev_is_active (w))
1664 { 1761 {
1665 if (w->repeat) 1762 if (w->repeat)
1666 { 1763 {
1667 ((WT)w)->at = mn_now + w->repeat; 1764 ((WT)w)->at = mn_now + w->repeat;
1668 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1765 adjustheap (timers, timercnt, ((W)w)->active - 1);
1669 } 1766 }
1670 else 1767 else
1671 ev_timer_stop (EV_A_ w); 1768 ev_timer_stop (EV_A_ w);
1672 } 1769 }
1673 else if (w->repeat) 1770 else if (w->repeat)
1676 ev_timer_start (EV_A_ w); 1773 ev_timer_start (EV_A_ w);
1677 } 1774 }
1678} 1775}
1679 1776
1680#if EV_PERIODIC_ENABLE 1777#if EV_PERIODIC_ENABLE
1681void 1778void noinline
1682ev_periodic_start (EV_P_ ev_periodic *w) 1779ev_periodic_start (EV_P_ ev_periodic *w)
1683{ 1780{
1684 if (expect_false (ev_is_active (w))) 1781 if (expect_false (ev_is_active (w)))
1685 return; 1782 return;
1686 1783
1688 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1785 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1689 else if (w->interval) 1786 else if (w->interval)
1690 { 1787 {
1691 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1788 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1692 /* this formula differs from the one in periodic_reify because we do not always round up */ 1789 /* this formula differs from the one in periodic_reify because we do not always round up */
1693 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1790 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1694 } 1791 }
1792 else
1793 ((WT)w)->at = w->offset;
1695 1794
1696 ev_start (EV_A_ (W)w, ++periodiccnt); 1795 ev_start (EV_A_ (W)w, ++periodiccnt);
1697 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1796 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1698 periodics [periodiccnt - 1] = w; 1797 periodics [periodiccnt - 1] = (WT)w;
1699 upheap ((WT *)periodics, periodiccnt - 1); 1798 upheap (periodics, periodiccnt - 1);
1700 1799
1701 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1800 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1702} 1801}
1703 1802
1704void 1803void noinline
1705ev_periodic_stop (EV_P_ ev_periodic *w) 1804ev_periodic_stop (EV_P_ ev_periodic *w)
1706{ 1805{
1707 clear_pending (EV_A_ (W)w); 1806 clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w))) 1807 if (expect_false (!ev_is_active (w)))
1709 return; 1808 return;
1710 1809
1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1810 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1712 1811
1713 { 1812 {
1714 int active = ((W)w)->active; 1813 int active = ((W)w)->active;
1715 1814
1716 if (expect_true (--active < --periodiccnt)) 1815 if (expect_true (--active < --periodiccnt))
1717 { 1816 {
1718 periodics [active] = periodics [periodiccnt]; 1817 periodics [active] = periodics [periodiccnt];
1719 adjustheap ((WT *)periodics, periodiccnt, active); 1818 adjustheap (periodics, periodiccnt, active);
1720 } 1819 }
1721 } 1820 }
1722 1821
1723 ev_stop (EV_A_ (W)w); 1822 ev_stop (EV_A_ (W)w);
1724} 1823}
1725 1824
1726void 1825void noinline
1727ev_periodic_again (EV_P_ ev_periodic *w) 1826ev_periodic_again (EV_P_ ev_periodic *w)
1728{ 1827{
1729 /* TODO: use adjustheap and recalculation */ 1828 /* TODO: use adjustheap and recalculation */
1730 ev_periodic_stop (EV_A_ w); 1829 ev_periodic_stop (EV_A_ w);
1731 ev_periodic_start (EV_A_ w); 1830 ev_periodic_start (EV_A_ w);
1734 1833
1735#ifndef SA_RESTART 1834#ifndef SA_RESTART
1736# define SA_RESTART 0 1835# define SA_RESTART 0
1737#endif 1836#endif
1738 1837
1739void 1838void noinline
1740ev_signal_start (EV_P_ ev_signal *w) 1839ev_signal_start (EV_P_ ev_signal *w)
1741{ 1840{
1742#if EV_MULTIPLICITY 1841#if EV_MULTIPLICITY
1743 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1842 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1744#endif 1843#endif
1745 if (expect_false (ev_is_active (w))) 1844 if (expect_false (ev_is_active (w)))
1746 return; 1845 return;
1747 1846
1748 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1847 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1749 1848
1849 {
1850#ifndef _WIN32
1851 sigset_t full, prev;
1852 sigfillset (&full);
1853 sigprocmask (SIG_SETMASK, &full, &prev);
1854#endif
1855
1856 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1857
1858#ifndef _WIN32
1859 sigprocmask (SIG_SETMASK, &prev, 0);
1860#endif
1861 }
1862
1750 ev_start (EV_A_ (W)w, 1); 1863 ev_start (EV_A_ (W)w, 1);
1751 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1752 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1864 wlist_add (&signals [w->signum - 1].head, (WL)w);
1753 1865
1754 if (!((WL)w)->next) 1866 if (!((WL)w)->next)
1755 { 1867 {
1756#if _WIN32 1868#if _WIN32
1757 signal (w->signum, sighandler); 1869 signal (w->signum, sighandler);
1763 sigaction (w->signum, &sa, 0); 1875 sigaction (w->signum, &sa, 0);
1764#endif 1876#endif
1765 } 1877 }
1766} 1878}
1767 1879
1768void 1880void noinline
1769ev_signal_stop (EV_P_ ev_signal *w) 1881ev_signal_stop (EV_P_ ev_signal *w)
1770{ 1882{
1771 clear_pending (EV_A_ (W)w); 1883 clear_pending (EV_A_ (W)w);
1772 if (expect_false (!ev_is_active (w))) 1884 if (expect_false (!ev_is_active (w)))
1773 return; 1885 return;
1774 1886
1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1887 wlist_del (&signals [w->signum - 1].head, (WL)w);
1776 ev_stop (EV_A_ (W)w); 1888 ev_stop (EV_A_ (W)w);
1777 1889
1778 if (!signals [w->signum - 1].head) 1890 if (!signals [w->signum - 1].head)
1779 signal (w->signum, SIG_DFL); 1891 signal (w->signum, SIG_DFL);
1780} 1892}
1787#endif 1899#endif
1788 if (expect_false (ev_is_active (w))) 1900 if (expect_false (ev_is_active (w)))
1789 return; 1901 return;
1790 1902
1791 ev_start (EV_A_ (W)w, 1); 1903 ev_start (EV_A_ (W)w, 1);
1792 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1904 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1793} 1905}
1794 1906
1795void 1907void
1796ev_child_stop (EV_P_ ev_child *w) 1908ev_child_stop (EV_P_ ev_child *w)
1797{ 1909{
1798 clear_pending (EV_A_ (W)w); 1910 clear_pending (EV_A_ (W)w);
1799 if (expect_false (!ev_is_active (w))) 1911 if (expect_false (!ev_is_active (w)))
1800 return; 1912 return;
1801 1913
1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1914 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1803 ev_stop (EV_A_ (W)w); 1915 ev_stop (EV_A_ (W)w);
1804} 1916}
1805 1917
1806#if EV_STAT_ENABLE 1918#if EV_STAT_ENABLE
1807 1919
2149 2261
2150#if EV_EMBED_ENABLE 2262#if EV_EMBED_ENABLE
2151void noinline 2263void noinline
2152ev_embed_sweep (EV_P_ ev_embed *w) 2264ev_embed_sweep (EV_P_ ev_embed *w)
2153{ 2265{
2154 ev_loop (w->loop, EVLOOP_NONBLOCK); 2266 ev_loop (w->other, EVLOOP_NONBLOCK);
2155} 2267}
2156 2268
2157static void 2269static void
2158embed_cb (EV_P_ ev_io *io, int revents) 2270embed_io_cb (EV_P_ ev_io *io, int revents)
2159{ 2271{
2160 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2272 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2161 2273
2162 if (ev_cb (w)) 2274 if (ev_cb (w))
2163 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2275 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2164 else 2276 else
2165 ev_embed_sweep (loop, w); 2277 ev_loop (w->other, EVLOOP_NONBLOCK);
2166} 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
2167 2303
2168void 2304void
2169ev_embed_start (EV_P_ ev_embed *w) 2305ev_embed_start (EV_P_ ev_embed *w)
2170{ 2306{
2171 if (expect_false (ev_is_active (w))) 2307 if (expect_false (ev_is_active (w)))
2172 return; 2308 return;
2173 2309
2174 { 2310 {
2175 struct ev_loop *loop = w->loop; 2311 struct ev_loop *loop = w->other;
2176 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 ()));
2177 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2313 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2178 } 2314 }
2179 2315
2180 ev_set_priority (&w->io, ev_priority (w)); 2316 ev_set_priority (&w->io, ev_priority (w));
2181 ev_io_start (EV_A_ &w->io); 2317 ev_io_start (EV_A_ &w->io);
2182 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
2183 ev_start (EV_A_ (W)w, 1); 2325 ev_start (EV_A_ (W)w, 1);
2184} 2326}
2185 2327
2186void 2328void
2187ev_embed_stop (EV_P_ ev_embed *w) 2329ev_embed_stop (EV_P_ ev_embed *w)
2189 clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2190 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2191 return; 2333 return;
2192 2334
2193 ev_io_stop (EV_A_ &w->io); 2335 ev_io_stop (EV_A_ &w->io);
2336 ev_prepare_stop (EV_A_ &w->prepare);
2194 2337
2195 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2196} 2339}
2197#endif 2340#endif
2198 2341
2287 ev_timer_set (&once->to, timeout, 0.); 2430 ev_timer_set (&once->to, timeout, 0.);
2288 ev_timer_start (EV_A_ &once->to); 2431 ev_timer_start (EV_A_ &once->to);
2289 } 2432 }
2290} 2433}
2291 2434
2435#if EV_MULTIPLICITY
2436 #include "ev_wrap.h"
2437#endif
2438
2292#ifdef __cplusplus 2439#ifdef __cplusplus
2293} 2440}
2294#endif 2441#endif
2295 2442

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines