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

Diff Legend

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