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.193 by root, Sat Dec 22 05:47:58 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 */
… …
396{ 426{
397 return ev_rt_now; 427 return ev_rt_now;
398} 428}
399#endif 429#endif
400 430
431void
432ev_sleep (ev_tstamp delay)
433{
434 if (delay > 0.)
435 {
436#if EV_USE_NANOSLEEP
437 struct timespec ts;
438
439 ts.tv_sec = (time_t)delay;
440 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
441
442 nanosleep (&ts, 0);
443#elif defined(_WIN32)
444 Sleep (delay * 1e3);
445#else
446 struct timeval tv;
447
448 tv.tv_sec = (time_t)delay;
449 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
450
451 select (0, 0, 0, 0, &tv);
452#endif
453 }
454}
455
456/*****************************************************************************/
457
401int inline_size 458int inline_size
402array_nextsize (int elem, int cur, int cnt) 459array_nextsize (int elem, int cur, int cnt)
403{ 460{
404 int ncur = cur + 1; 461 int ncur = cur + 1;
405 462
… …
417 } 474 }
418 475
419 return ncur; 476 return ncur;
420} 477}
421 478
422inline_speed void * 479static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 480array_realloc (int elem, void *base, int *cur, int cnt)
424{ 481{
425 *cur = array_nextsize (elem, *cur, cnt); 482 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 483 return ev_realloc (base, elem * *cur);
427} 484}
… …
452 509
453void noinline 510void noinline
454ev_feed_event (EV_P_ void *w, int revents) 511ev_feed_event (EV_P_ void *w, int revents)
455{ 512{
456 W w_ = (W)w; 513 W w_ = (W)w;
514 int pri = ABSPRI (w_);
457 515
458 if (expect_false (w_->pending)) 516 if (expect_false (w_->pending))
517 pendings [pri][w_->pending - 1].events |= revents;
518 else
459 { 519 {
520 w_->pending = ++pendingcnt [pri];
521 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
522 pendings [pri][w_->pending - 1].w = w_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 523 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 524 }
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} 525}
469 526
470void inline_size 527void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 528queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 529{
473 int i; 530 int i;
474 531
475 for (i = 0; i < eventcnt; ++i) 532 for (i = 0; i < eventcnt; ++i)
… …
522 { 579 {
523 int fd = fdchanges [i]; 580 int fd = fdchanges [i];
524 ANFD *anfd = anfds + fd; 581 ANFD *anfd = anfds + fd;
525 ev_io *w; 582 ev_io *w;
526 583
527 int events = 0; 584 unsigned char events = 0;
528 585
529 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 586 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
530 events |= w->events; 587 events |= (unsigned char)w->events;
531 588
532#if EV_SELECT_IS_WINSOCKET 589#if EV_SELECT_IS_WINSOCKET
533 if (events) 590 if (events)
534 { 591 {
535 unsigned long argp; 592 unsigned long argp;
536 anfd->handle = _get_osfhandle (fd); 593 anfd->handle = _get_osfhandle (fd);
537 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 594 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
538 } 595 }
539#endif 596#endif
540 597
598 {
599 unsigned char o_events = anfd->events;
600 unsigned char o_reify = anfd->reify;
601
541 anfd->reify = 0; 602 anfd->reify = 0;
542
543 backend_modify (EV_A_ fd, anfd->events, events);
544 anfd->events = events; 603 anfd->events = events;
604
605 if (o_events != events || o_reify & EV_IOFDSET)
606 backend_modify (EV_A_ fd, o_events, events);
607 }
545 } 608 }
546 609
547 fdchangecnt = 0; 610 fdchangecnt = 0;
548} 611}
549 612
550void inline_size 613void inline_size
551fd_change (EV_P_ int fd) 614fd_change (EV_P_ int fd, int flags)
552{ 615{
553 if (expect_false (anfds [fd].reify)) 616 unsigned char reify = anfds [fd].reify;
554 return;
555
556 anfds [fd].reify = 1; 617 anfds [fd].reify |= flags;
557 618
619 if (expect_true (!reify))
620 {
558 ++fdchangecnt; 621 ++fdchangecnt;
559 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 622 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
560 fdchanges [fdchangecnt - 1] = fd; 623 fdchanges [fdchangecnt - 1] = fd;
624 }
561} 625}
562 626
563void inline_speed 627void inline_speed
564fd_kill (EV_P_ int fd) 628fd_kill (EV_P_ int fd)
565{ 629{
… …
616 680
617 for (fd = 0; fd < anfdmax; ++fd) 681 for (fd = 0; fd < anfdmax; ++fd)
618 if (anfds [fd].events) 682 if (anfds [fd].events)
619 { 683 {
620 anfds [fd].events = 0; 684 anfds [fd].events = 0;
621 fd_change (EV_A_ fd); 685 fd_change (EV_A_ fd, EV_IOFDSET | 1);
622 } 686 }
623} 687}
624 688
625/*****************************************************************************/ 689/*****************************************************************************/
626 690
627void inline_speed 691void inline_speed
628upheap (WT *heap, int k) 692upheap (WT *heap, int k)
629{ 693{
630 WT w = heap [k]; 694 WT w = heap [k];
631 695
632 while (k && heap [k >> 1]->at > w->at) 696 while (k)
633 { 697 {
698 int p = (k - 1) >> 1;
699
700 if (heap [p]->at <= w->at)
701 break;
702
634 heap [k] = heap [k >> 1]; 703 heap [k] = heap [p];
635 ((W)heap [k])->active = k + 1; 704 ((W)heap [k])->active = k + 1;
636 k >>= 1; 705 k = p;
637 } 706 }
638 707
639 heap [k] = w; 708 heap [k] = w;
640 ((W)heap [k])->active = k + 1; 709 ((W)heap [k])->active = k + 1;
641
642} 710}
643 711
644void inline_speed 712void inline_speed
645downheap (WT *heap, int N, int k) 713downheap (WT *heap, int N, int k)
646{ 714{
647 WT w = heap [k]; 715 WT w = heap [k];
648 716
649 while (k < (N >> 1)) 717 for (;;)
650 { 718 {
651 int j = k << 1; 719 int c = (k << 1) + 1;
652 720
653 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 721 if (c >= N)
654 ++j;
655
656 if (w->at <= heap [j]->at)
657 break; 722 break;
658 723
724 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
725 ? 1 : 0;
726
727 if (w->at <= heap [c]->at)
728 break;
729
659 heap [k] = heap [j]; 730 heap [k] = heap [c];
660 ((W)heap [k])->active = k + 1; 731 ((W)heap [k])->active = k + 1;
732
661 k = j; 733 k = c;
662 } 734 }
663 735
664 heap [k] = w; 736 heap [k] = w;
665 ((W)heap [k])->active = k + 1; 737 ((W)heap [k])->active = k + 1;
666} 738}
… …
748 for (signum = signalmax; signum--; ) 820 for (signum = signalmax; signum--; )
749 if (signals [signum].gotsig) 821 if (signals [signum].gotsig)
750 ev_feed_signal_event (EV_A_ signum + 1); 822 ev_feed_signal_event (EV_A_ signum + 1);
751} 823}
752 824
753void inline_size 825void inline_speed
754fd_intern (int fd) 826fd_intern (int fd)
755{ 827{
756#ifdef _WIN32 828#ifdef _WIN32
757 int arg = 1; 829 int arg = 1;
758 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 830 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
773 ev_unref (EV_A); /* child watcher should not keep loop alive */ 845 ev_unref (EV_A); /* child watcher should not keep loop alive */
774} 846}
775 847
776/*****************************************************************************/ 848/*****************************************************************************/
777 849
778static ev_child *childs [EV_PID_HASHSIZE]; 850static WL childs [EV_PID_HASHSIZE];
779 851
780#ifndef _WIN32 852#ifndef _WIN32
781 853
782static ev_signal childev; 854static ev_signal childev;
783 855
… …
898} 970}
899 971
900unsigned int 972unsigned int
901ev_embeddable_backends (void) 973ev_embeddable_backends (void)
902{ 974{
975 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
903 return EVBACKEND_EPOLL 976 return EVBACKEND_KQUEUE
904 | EVBACKEND_KQUEUE
905 | EVBACKEND_PORT; 977 | EVBACKEND_PORT;
906} 978}
907 979
908unsigned int 980unsigned int
909ev_backend (EV_P) 981ev_backend (EV_P)
… …
913 985
914unsigned int 986unsigned int
915ev_loop_count (EV_P) 987ev_loop_count (EV_P)
916{ 988{
917 return loop_count; 989 return loop_count;
990}
991
992void
993ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
994{
995 io_blocktime = interval;
996}
997
998void
999ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1000{
1001 timeout_blocktime = interval;
918} 1002}
919 1003
920static void noinline 1004static void noinline
921loop_init (EV_P_ unsigned int flags) 1005loop_init (EV_P_ unsigned int flags)
922{ 1006{
… …
933 ev_rt_now = ev_time (); 1017 ev_rt_now = ev_time ();
934 mn_now = get_clock (); 1018 mn_now = get_clock ();
935 now_floor = mn_now; 1019 now_floor = mn_now;
936 rtmn_diff = ev_rt_now - mn_now; 1020 rtmn_diff = ev_rt_now - mn_now;
937 1021
1022 io_blocktime = 0.;
1023 timeout_blocktime = 0.;
1024
938 /* pid check not overridable via env */ 1025 /* pid check not overridable via env */
939#ifndef _WIN32 1026#ifndef _WIN32
940 if (flags & EVFLAG_FORKCHECK) 1027 if (flags & EVFLAG_FORKCHECK)
941 curpid = getpid (); 1028 curpid = getpid ();
942#endif 1029#endif
… …
1010 array_free (pending, [i]); 1097 array_free (pending, [i]);
1011#if EV_IDLE_ENABLE 1098#if EV_IDLE_ENABLE
1012 array_free (idle, [i]); 1099 array_free (idle, [i]);
1013#endif 1100#endif
1014 } 1101 }
1102
1103 ev_free (anfds); anfdmax = 0;
1015 1104
1016 /* have to use the microsoft-never-gets-it-right macro */ 1105 /* have to use the microsoft-never-gets-it-right macro */
1017 array_free (fdchange, EMPTY); 1106 array_free (fdchange, EMPTY);
1018 array_free (timer, EMPTY); 1107 array_free (timer, EMPTY);
1019#if EV_PERIODIC_ENABLE 1108#if EV_PERIODIC_ENABLE
1020 array_free (periodic, EMPTY); 1109 array_free (periodic, EMPTY);
1110#endif
1111#if EV_FORK_ENABLE
1112 array_free (fork, EMPTY);
1021#endif 1113#endif
1022 array_free (prepare, EMPTY); 1114 array_free (prepare, EMPTY);
1023 array_free (check, EMPTY); 1115 array_free (check, EMPTY);
1024 1116
1025 backend = 0; 1117 backend = 0;
… …
1195void inline_size 1287void inline_size
1196timers_reify (EV_P) 1288timers_reify (EV_P)
1197{ 1289{
1198 while (timercnt && ((WT)timers [0])->at <= mn_now) 1290 while (timercnt && ((WT)timers [0])->at <= mn_now)
1199 { 1291 {
1200 ev_timer *w = timers [0]; 1292 ev_timer *w = (ev_timer *)timers [0];
1201 1293
1202 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1294 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1203 1295
1204 /* first reschedule or stop timer */ 1296 /* first reschedule or stop timer */
1205 if (w->repeat) 1297 if (w->repeat)
… …
1208 1300
1209 ((WT)w)->at += w->repeat; 1301 ((WT)w)->at += w->repeat;
1210 if (((WT)w)->at < mn_now) 1302 if (((WT)w)->at < mn_now)
1211 ((WT)w)->at = mn_now; 1303 ((WT)w)->at = mn_now;
1212 1304
1213 downheap ((WT *)timers, timercnt, 0); 1305 downheap (timers, timercnt, 0);
1214 } 1306 }
1215 else 1307 else
1216 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1308 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1217 1309
1218 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1310 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1223void inline_size 1315void inline_size
1224periodics_reify (EV_P) 1316periodics_reify (EV_P)
1225{ 1317{
1226 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1318 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1227 { 1319 {
1228 ev_periodic *w = periodics [0]; 1320 ev_periodic *w = (ev_periodic *)periodics [0];
1229 1321
1230 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1322 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1231 1323
1232 /* first reschedule or stop timer */ 1324 /* first reschedule or stop timer */
1233 if (w->reschedule_cb) 1325 if (w->reschedule_cb)
1234 { 1326 {
1235 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1327 ((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)); 1328 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1237 downheap ((WT *)periodics, periodiccnt, 0); 1329 downheap (periodics, periodiccnt, 0);
1238 } 1330 }
1239 else if (w->interval) 1331 else if (w->interval)
1240 { 1332 {
1241 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1333 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1334 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)); 1335 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); 1336 downheap (periodics, periodiccnt, 0);
1244 } 1337 }
1245 else 1338 else
1246 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1339 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1247 1340
1248 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1341 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1255 int i; 1348 int i;
1256 1349
1257 /* adjust periodics after time jump */ 1350 /* adjust periodics after time jump */
1258 for (i = 0; i < periodiccnt; ++i) 1351 for (i = 0; i < periodiccnt; ++i)
1259 { 1352 {
1260 ev_periodic *w = periodics [i]; 1353 ev_periodic *w = (ev_periodic *)periodics [i];
1261 1354
1262 if (w->reschedule_cb) 1355 if (w->reschedule_cb)
1263 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1356 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1264 else if (w->interval) 1357 else if (w->interval)
1265 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1358 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1266 } 1359 }
1267 1360
1268 /* now rebuild the heap */ 1361 /* now rebuild the heap */
1269 for (i = periodiccnt >> 1; i--; ) 1362 for (i = periodiccnt >> 1; i--; )
1270 downheap ((WT *)periodics, periodiccnt, i); 1363 downheap (periodics, periodiccnt, i);
1271} 1364}
1272#endif 1365#endif
1273 1366
1274#if EV_IDLE_ENABLE 1367#if EV_IDLE_ENABLE
1275void inline_size 1368void inline_size
… …
1292 } 1385 }
1293 } 1386 }
1294} 1387}
1295#endif 1388#endif
1296 1389
1297int inline_size 1390void inline_speed
1298time_update_monotonic (EV_P) 1391time_update (EV_P_ ev_tstamp max_block)
1299{ 1392{
1393 int i;
1394
1395#if EV_USE_MONOTONIC
1396 if (expect_true (have_monotonic))
1397 {
1398 ev_tstamp odiff = rtmn_diff;
1399
1300 mn_now = get_clock (); 1400 mn_now = get_clock ();
1301 1401
1402 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1403 /* interpolate in the meantime */
1302 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1404 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1303 { 1405 {
1304 ev_rt_now = rtmn_diff + mn_now; 1406 ev_rt_now = rtmn_diff + mn_now;
1305 return 0; 1407 return;
1306 } 1408 }
1307 else 1409
1308 {
1309 now_floor = mn_now; 1410 now_floor = mn_now;
1310 ev_rt_now = ev_time (); 1411 ev_rt_now = ev_time ();
1311 return 1;
1312 }
1313}
1314 1412
1315void inline_size 1413 /* loop a few times, before making important decisions.
1316time_update (EV_P) 1414 * on the choice of "4": one iteration isn't enough,
1317{ 1415 * in case we get preempted during the calls to
1318 int i; 1416 * ev_time and get_clock. a second call is almost guaranteed
1319 1417 * to succeed in that case, though. and looping a few more times
1320#if EV_USE_MONOTONIC 1418 * doesn't hurt either as we only do this on time-jumps or
1321 if (expect_true (have_monotonic)) 1419 * in the unlikely event of having been preempted here.
1322 { 1420 */
1323 if (time_update_monotonic (EV_A)) 1421 for (i = 4; --i; )
1324 { 1422 {
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; 1423 rtmn_diff = ev_rt_now - mn_now;
1338 1424
1339 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1425 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1340 return; /* all is well */ 1426 return; /* all is well */
1341 1427
1342 ev_rt_now = ev_time (); 1428 ev_rt_now = ev_time ();
1343 mn_now = get_clock (); 1429 mn_now = get_clock ();
1344 now_floor = mn_now; 1430 now_floor = mn_now;
1345 } 1431 }
1346 1432
1347# if EV_PERIODIC_ENABLE 1433# if EV_PERIODIC_ENABLE
1348 periodics_reschedule (EV_A); 1434 periodics_reschedule (EV_A);
1349# endif 1435# endif
1350 /* no timer adjustment, as the monotonic clock doesn't jump */ 1436 /* no timer adjustment, as the monotonic clock doesn't jump */
1351 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1437 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1352 }
1353 } 1438 }
1354 else 1439 else
1355#endif 1440#endif
1356 { 1441 {
1357 ev_rt_now = ev_time (); 1442 ev_rt_now = ev_time ();
1358 1443
1359 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1444 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1360 { 1445 {
1361#if EV_PERIODIC_ENABLE 1446#if EV_PERIODIC_ENABLE
1362 periodics_reschedule (EV_A); 1447 periodics_reschedule (EV_A);
1363#endif 1448#endif
1364
1365 /* adjust timers. this is easy, as the offset is the same for all of them */ 1449 /* adjust timers. this is easy, as the offset is the same for all of them */
1366 for (i = 0; i < timercnt; ++i) 1450 for (i = 0; i < timercnt; ++i)
1367 ((WT)timers [i])->at += ev_rt_now - mn_now; 1451 ((WT)timers [i])->at += ev_rt_now - mn_now;
1368 } 1452 }
1369 1453
… …
1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1497 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1414 call_pending (EV_A); 1498 call_pending (EV_A);
1415 } 1499 }
1416#endif 1500#endif
1417 1501
1418 /* queue check watchers (and execute them) */ 1502 /* queue prepare watchers (and execute them) */
1419 if (expect_false (preparecnt)) 1503 if (expect_false (preparecnt))
1420 { 1504 {
1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1505 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1422 call_pending (EV_A); 1506 call_pending (EV_A);
1423 } 1507 }
… …
1432 /* update fd-related kernel structures */ 1516 /* update fd-related kernel structures */
1433 fd_reify (EV_A); 1517 fd_reify (EV_A);
1434 1518
1435 /* calculate blocking time */ 1519 /* calculate blocking time */
1436 { 1520 {
1437 ev_tstamp block; 1521 ev_tstamp waittime = 0.;
1522 ev_tstamp sleeptime = 0.;
1438 1523
1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1524 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1440 block = 0.; /* do not block at all */
1441 else
1442 { 1525 {
1443 /* update time to cancel out callback processing overhead */ 1526 /* 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); 1527 time_update (EV_A_ 1e100);
1447 else
1448#endif
1449 {
1450 ev_rt_now = ev_time ();
1451 mn_now = ev_rt_now;
1452 }
1453 1528
1454 block = MAX_BLOCKTIME; 1529 waittime = MAX_BLOCKTIME;
1455 1530
1456 if (timercnt) 1531 if (timercnt)
1457 { 1532 {
1458 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1533 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1459 if (block > to) block = to; 1534 if (waittime > to) waittime = to;
1460 } 1535 }
1461 1536
1462#if EV_PERIODIC_ENABLE 1537#if EV_PERIODIC_ENABLE
1463 if (periodiccnt) 1538 if (periodiccnt)
1464 { 1539 {
1465 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1540 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1466 if (block > to) block = to; 1541 if (waittime > to) waittime = to;
1467 } 1542 }
1468#endif 1543#endif
1469 1544
1470 if (expect_false (block < 0.)) block = 0.; 1545 if (expect_false (waittime < timeout_blocktime))
1546 waittime = timeout_blocktime;
1547
1548 sleeptime = waittime - backend_fudge;
1549
1550 if (expect_true (sleeptime > io_blocktime))
1551 sleeptime = io_blocktime;
1552
1553 if (sleeptime)
1554 {
1555 ev_sleep (sleeptime);
1556 waittime -= sleeptime;
1557 }
1471 } 1558 }
1472 1559
1473 ++loop_count; 1560 ++loop_count;
1474 backend_poll (EV_A_ block); 1561 backend_poll (EV_A_ waittime);
1562
1563 /* update ev_rt_now, do magic */
1564 time_update (EV_A_ waittime + sleeptime);
1475 } 1565 }
1476
1477 /* update ev_rt_now, do magic */
1478 time_update (EV_A);
1479 1566
1480 /* queue pending timers and reschedule them */ 1567 /* queue pending timers and reschedule them */
1481 timers_reify (EV_A); /* relative timers called last */ 1568 timers_reify (EV_A); /* relative timers called last */
1482#if EV_PERIODIC_ENABLE 1569#if EV_PERIODIC_ENABLE
1483 periodics_reify (EV_A); /* absolute timers called first */ 1570 periodics_reify (EV_A); /* absolute timers called first */
… …
1545ev_clear_pending (EV_P_ void *w) 1632ev_clear_pending (EV_P_ void *w)
1546{ 1633{
1547 W w_ = (W)w; 1634 W w_ = (W)w;
1548 int pending = w_->pending; 1635 int pending = w_->pending;
1549 1636
1550 if (!pending) 1637 if (expect_true (pending))
1638 {
1639 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1640 w_->pending = 0;
1641 p->w = 0;
1642 return p->events;
1643 }
1644 else
1551 return 0; 1645 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} 1646}
1559 1647
1560void inline_size 1648void inline_size
1561pri_adjust (EV_P_ W w) 1649pri_adjust (EV_P_ W w)
1562{ 1650{
… …
1581 w->active = 0; 1669 w->active = 0;
1582} 1670}
1583 1671
1584/*****************************************************************************/ 1672/*****************************************************************************/
1585 1673
1586void 1674void noinline
1587ev_io_start (EV_P_ ev_io *w) 1675ev_io_start (EV_P_ ev_io *w)
1588{ 1676{
1589 int fd = w->fd; 1677 int fd = w->fd;
1590 1678
1591 if (expect_false (ev_is_active (w))) 1679 if (expect_false (ev_is_active (w)))
… …
1593 1681
1594 assert (("ev_io_start called with negative fd", fd >= 0)); 1682 assert (("ev_io_start called with negative fd", fd >= 0));
1595 1683
1596 ev_start (EV_A_ (W)w, 1); 1684 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1685 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1598 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1686 wlist_add (&anfds[fd].head, (WL)w);
1599 1687
1600 fd_change (EV_A_ fd); 1688 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1689 w->events &= ~EV_IOFDSET;
1601} 1690}
1602 1691
1603void 1692void noinline
1604ev_io_stop (EV_P_ ev_io *w) 1693ev_io_stop (EV_P_ ev_io *w)
1605{ 1694{
1606 clear_pending (EV_A_ (W)w); 1695 clear_pending (EV_A_ (W)w);
1607 if (expect_false (!ev_is_active (w))) 1696 if (expect_false (!ev_is_active (w)))
1608 return; 1697 return;
1609 1698
1610 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1699 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1611 1700
1612 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1701 wlist_del (&anfds[w->fd].head, (WL)w);
1613 ev_stop (EV_A_ (W)w); 1702 ev_stop (EV_A_ (W)w);
1614 1703
1615 fd_change (EV_A_ w->fd); 1704 fd_change (EV_A_ w->fd, 1);
1616} 1705}
1617 1706
1618void 1707void noinline
1619ev_timer_start (EV_P_ ev_timer *w) 1708ev_timer_start (EV_P_ ev_timer *w)
1620{ 1709{
1621 if (expect_false (ev_is_active (w))) 1710 if (expect_false (ev_is_active (w)))
1622 return; 1711 return;
1623 1712
1624 ((WT)w)->at += mn_now; 1713 ((WT)w)->at += mn_now;
1625 1714
1626 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1715 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1627 1716
1628 ev_start (EV_A_ (W)w, ++timercnt); 1717 ev_start (EV_A_ (W)w, ++timercnt);
1629 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1718 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1630 timers [timercnt - 1] = w; 1719 timers [timercnt - 1] = (WT)w;
1631 upheap ((WT *)timers, timercnt - 1); 1720 upheap (timers, timercnt - 1);
1632 1721
1633 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1722 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1634} 1723}
1635 1724
1636void 1725void noinline
1637ev_timer_stop (EV_P_ ev_timer *w) 1726ev_timer_stop (EV_P_ ev_timer *w)
1638{ 1727{
1639 clear_pending (EV_A_ (W)w); 1728 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w))) 1729 if (expect_false (!ev_is_active (w)))
1641 return; 1730 return;
1642 1731
1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1732 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1644 1733
1645 { 1734 {
1646 int active = ((W)w)->active; 1735 int active = ((W)w)->active;
1647 1736
1648 if (expect_true (--active < --timercnt)) 1737 if (expect_true (--active < --timercnt))
1649 { 1738 {
1650 timers [active] = timers [timercnt]; 1739 timers [active] = timers [timercnt];
1651 adjustheap ((WT *)timers, timercnt, active); 1740 adjustheap (timers, timercnt, active);
1652 } 1741 }
1653 } 1742 }
1654 1743
1655 ((WT)w)->at -= mn_now; 1744 ((WT)w)->at -= mn_now;
1656 1745
1657 ev_stop (EV_A_ (W)w); 1746 ev_stop (EV_A_ (W)w);
1658} 1747}
1659 1748
1660void 1749void noinline
1661ev_timer_again (EV_P_ ev_timer *w) 1750ev_timer_again (EV_P_ ev_timer *w)
1662{ 1751{
1663 if (ev_is_active (w)) 1752 if (ev_is_active (w))
1664 { 1753 {
1665 if (w->repeat) 1754 if (w->repeat)
1666 { 1755 {
1667 ((WT)w)->at = mn_now + w->repeat; 1756 ((WT)w)->at = mn_now + w->repeat;
1668 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1757 adjustheap (timers, timercnt, ((W)w)->active - 1);
1669 } 1758 }
1670 else 1759 else
1671 ev_timer_stop (EV_A_ w); 1760 ev_timer_stop (EV_A_ w);
1672 } 1761 }
1673 else if (w->repeat) 1762 else if (w->repeat)
… …
1676 ev_timer_start (EV_A_ w); 1765 ev_timer_start (EV_A_ w);
1677 } 1766 }
1678} 1767}
1679 1768
1680#if EV_PERIODIC_ENABLE 1769#if EV_PERIODIC_ENABLE
1681void 1770void noinline
1682ev_periodic_start (EV_P_ ev_periodic *w) 1771ev_periodic_start (EV_P_ ev_periodic *w)
1683{ 1772{
1684 if (expect_false (ev_is_active (w))) 1773 if (expect_false (ev_is_active (w)))
1685 return; 1774 return;
1686 1775
… …
1688 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1777 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1689 else if (w->interval) 1778 else if (w->interval)
1690 { 1779 {
1691 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1780 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 */ 1781 /* 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; 1782 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1694 } 1783 }
1784 else
1785 ((WT)w)->at = w->offset;
1695 1786
1696 ev_start (EV_A_ (W)w, ++periodiccnt); 1787 ev_start (EV_A_ (W)w, ++periodiccnt);
1697 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1788 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1698 periodics [periodiccnt - 1] = w; 1789 periodics [periodiccnt - 1] = (WT)w;
1699 upheap ((WT *)periodics, periodiccnt - 1); 1790 upheap (periodics, periodiccnt - 1);
1700 1791
1701 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1792 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1702} 1793}
1703 1794
1704void 1795void noinline
1705ev_periodic_stop (EV_P_ ev_periodic *w) 1796ev_periodic_stop (EV_P_ ev_periodic *w)
1706{ 1797{
1707 clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1709 return; 1800 return;
1710 1801
1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1802 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1712 1803
1713 { 1804 {
1714 int active = ((W)w)->active; 1805 int active = ((W)w)->active;
1715 1806
1716 if (expect_true (--active < --periodiccnt)) 1807 if (expect_true (--active < --periodiccnt))
1717 { 1808 {
1718 periodics [active] = periodics [periodiccnt]; 1809 periodics [active] = periodics [periodiccnt];
1719 adjustheap ((WT *)periodics, periodiccnt, active); 1810 adjustheap (periodics, periodiccnt, active);
1720 } 1811 }
1721 } 1812 }
1722 1813
1723 ev_stop (EV_A_ (W)w); 1814 ev_stop (EV_A_ (W)w);
1724} 1815}
1725 1816
1726void 1817void noinline
1727ev_periodic_again (EV_P_ ev_periodic *w) 1818ev_periodic_again (EV_P_ ev_periodic *w)
1728{ 1819{
1729 /* TODO: use adjustheap and recalculation */ 1820 /* TODO: use adjustheap and recalculation */
1730 ev_periodic_stop (EV_A_ w); 1821 ev_periodic_stop (EV_A_ w);
1731 ev_periodic_start (EV_A_ w); 1822 ev_periodic_start (EV_A_ w);
… …
1734 1825
1735#ifndef SA_RESTART 1826#ifndef SA_RESTART
1736# define SA_RESTART 0 1827# define SA_RESTART 0
1737#endif 1828#endif
1738 1829
1739void 1830void noinline
1740ev_signal_start (EV_P_ ev_signal *w) 1831ev_signal_start (EV_P_ ev_signal *w)
1741{ 1832{
1742#if EV_MULTIPLICITY 1833#if EV_MULTIPLICITY
1743 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1834 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1744#endif 1835#endif
1745 if (expect_false (ev_is_active (w))) 1836 if (expect_false (ev_is_active (w)))
1746 return; 1837 return;
1747 1838
1748 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1839 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1749 1840
1841 {
1842#ifndef _WIN32
1843 sigset_t full, prev;
1844 sigfillset (&full);
1845 sigprocmask (SIG_SETMASK, &full, &prev);
1846#endif
1847
1848 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1849
1850#ifndef _WIN32
1851 sigprocmask (SIG_SETMASK, &prev, 0);
1852#endif
1853 }
1854
1750 ev_start (EV_A_ (W)w, 1); 1855 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); 1856 wlist_add (&signals [w->signum - 1].head, (WL)w);
1753 1857
1754 if (!((WL)w)->next) 1858 if (!((WL)w)->next)
1755 { 1859 {
1756#if _WIN32 1860#if _WIN32
1757 signal (w->signum, sighandler); 1861 signal (w->signum, sighandler);
… …
1763 sigaction (w->signum, &sa, 0); 1867 sigaction (w->signum, &sa, 0);
1764#endif 1868#endif
1765 } 1869 }
1766} 1870}
1767 1871
1768void 1872void noinline
1769ev_signal_stop (EV_P_ ev_signal *w) 1873ev_signal_stop (EV_P_ ev_signal *w)
1770{ 1874{
1771 clear_pending (EV_A_ (W)w); 1875 clear_pending (EV_A_ (W)w);
1772 if (expect_false (!ev_is_active (w))) 1876 if (expect_false (!ev_is_active (w)))
1773 return; 1877 return;
1774 1878
1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1879 wlist_del (&signals [w->signum - 1].head, (WL)w);
1776 ev_stop (EV_A_ (W)w); 1880 ev_stop (EV_A_ (W)w);
1777 1881
1778 if (!signals [w->signum - 1].head) 1882 if (!signals [w->signum - 1].head)
1779 signal (w->signum, SIG_DFL); 1883 signal (w->signum, SIG_DFL);
1780} 1884}
… …
1787#endif 1891#endif
1788 if (expect_false (ev_is_active (w))) 1892 if (expect_false (ev_is_active (w)))
1789 return; 1893 return;
1790 1894
1791 ev_start (EV_A_ (W)w, 1); 1895 ev_start (EV_A_ (W)w, 1);
1792 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1896 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1793} 1897}
1794 1898
1795void 1899void
1796ev_child_stop (EV_P_ ev_child *w) 1900ev_child_stop (EV_P_ ev_child *w)
1797{ 1901{
1798 clear_pending (EV_A_ (W)w); 1902 clear_pending (EV_A_ (W)w);
1799 if (expect_false (!ev_is_active (w))) 1903 if (expect_false (!ev_is_active (w)))
1800 return; 1904 return;
1801 1905
1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1906 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1803 ev_stop (EV_A_ (W)w); 1907 ev_stop (EV_A_ (W)w);
1804} 1908}
1805 1909
1806#if EV_STAT_ENABLE 1910#if EV_STAT_ENABLE
1807 1911
… …
2149 2253
2150#if EV_EMBED_ENABLE 2254#if EV_EMBED_ENABLE
2151void noinline 2255void noinline
2152ev_embed_sweep (EV_P_ ev_embed *w) 2256ev_embed_sweep (EV_P_ ev_embed *w)
2153{ 2257{
2154 ev_loop (w->loop, EVLOOP_NONBLOCK); 2258 ev_loop (w->other, EVLOOP_NONBLOCK);
2155} 2259}
2156 2260
2157static void 2261static void
2158embed_cb (EV_P_ ev_io *io, int revents) 2262embed_io_cb (EV_P_ ev_io *io, int revents)
2159{ 2263{
2160 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2264 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2161 2265
2162 if (ev_cb (w)) 2266 if (ev_cb (w))
2163 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2267 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2164 else 2268 else
2165 ev_embed_sweep (loop, w); 2269 ev_embed_sweep (loop, w);
2166} 2270}
2167 2271
2272static void
2273embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2274{
2275 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2276
2277 fd_reify (w->other);
2278}
2279
2168void 2280void
2169ev_embed_start (EV_P_ ev_embed *w) 2281ev_embed_start (EV_P_ ev_embed *w)
2170{ 2282{
2171 if (expect_false (ev_is_active (w))) 2283 if (expect_false (ev_is_active (w)))
2172 return; 2284 return;
2173 2285
2174 { 2286 {
2175 struct ev_loop *loop = w->loop; 2287 struct ev_loop *loop = w->other;
2176 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2288 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2177 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2289 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2178 } 2290 }
2179 2291
2180 ev_set_priority (&w->io, ev_priority (w)); 2292 ev_set_priority (&w->io, ev_priority (w));
2181 ev_io_start (EV_A_ &w->io); 2293 ev_io_start (EV_A_ &w->io);
2182 2294
2295 ev_prepare_init (&w->prepare, embed_prepare_cb);
2296 ev_set_priority (&w->prepare, EV_MINPRI);
2297 ev_prepare_start (EV_A_ &w->prepare);
2298
2183 ev_start (EV_A_ (W)w, 1); 2299 ev_start (EV_A_ (W)w, 1);
2184} 2300}
2185 2301
2186void 2302void
2187ev_embed_stop (EV_P_ ev_embed *w) 2303ev_embed_stop (EV_P_ ev_embed *w)
… …
2189 clear_pending (EV_A_ (W)w); 2305 clear_pending (EV_A_ (W)w);
2190 if (expect_false (!ev_is_active (w))) 2306 if (expect_false (!ev_is_active (w)))
2191 return; 2307 return;
2192 2308
2193 ev_io_stop (EV_A_ &w->io); 2309 ev_io_stop (EV_A_ &w->io);
2310 ev_prepare_stop (EV_A_ &w->prepare);
2194 2311
2195 ev_stop (EV_A_ (W)w); 2312 ev_stop (EV_A_ (W)w);
2196} 2313}
2197#endif 2314#endif
2198 2315
… …
2287 ev_timer_set (&once->to, timeout, 0.); 2404 ev_timer_set (&once->to, timeout, 0.);
2288 ev_timer_start (EV_A_ &once->to); 2405 ev_timer_start (EV_A_ &once->to);
2289 } 2406 }
2290} 2407}
2291 2408
2409#if EV_MULTIPLICITY
2410 #include "ev_wrap.h"
2411#endif
2412
2292#ifdef __cplusplus 2413#ifdef __cplusplus
2293} 2414}
2294#endif 2415#endif
2295 2416

Diff Legend

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