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

Comparing libev/ev.c (file contents):
Revision 1.164 by root, Fri Dec 7 16:44:10 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)
507} 568}
508 569
509void 570void
510ev_feed_fd_event (EV_P_ int fd, int revents) 571ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 572{
573 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 574 fd_event (EV_A_ fd, revents);
513} 575}
514 576
515void inline_size 577void inline_size
516fd_reify (EV_P) 578fd_reify (EV_P)
517{ 579{
521 { 583 {
522 int fd = fdchanges [i]; 584 int fd = fdchanges [i];
523 ANFD *anfd = anfds + fd; 585 ANFD *anfd = anfds + fd;
524 ev_io *w; 586 ev_io *w;
525 587
526 int events = 0; 588 unsigned char events = 0;
527 589
528 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)
529 events |= w->events; 591 events |= (unsigned char)w->events;
530 592
531#if EV_SELECT_IS_WINSOCKET 593#if EV_SELECT_IS_WINSOCKET
532 if (events) 594 if (events)
533 { 595 {
534 unsigned long argp; 596 unsigned long argp;
535 anfd->handle = _get_osfhandle (fd); 597 anfd->handle = _get_osfhandle (fd);
536 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));
537 } 599 }
538#endif 600#endif
539 601
602 {
603 unsigned char o_events = anfd->events;
604 unsigned char o_reify = anfd->reify;
605
540 anfd->reify = 0; 606 anfd->reify = 0;
541
542 backend_modify (EV_A_ fd, anfd->events, events);
543 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 }
544 } 612 }
545 613
546 fdchangecnt = 0; 614 fdchangecnt = 0;
547} 615}
548 616
549void inline_size 617void inline_size
550fd_change (EV_P_ int fd) 618fd_change (EV_P_ int fd, int flags)
551{ 619{
552 if (expect_false (anfds [fd].reify)) 620 unsigned char reify = anfds [fd].reify;
553 return;
554
555 anfds [fd].reify = 1; 621 anfds [fd].reify |= flags;
556 622
623 if (expect_true (!reify))
624 {
557 ++fdchangecnt; 625 ++fdchangecnt;
558 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 626 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
559 fdchanges [fdchangecnt - 1] = fd; 627 fdchanges [fdchangecnt - 1] = fd;
628 }
560} 629}
561 630
562void inline_speed 631void inline_speed
563fd_kill (EV_P_ int fd) 632fd_kill (EV_P_ int fd)
564{ 633{
615 684
616 for (fd = 0; fd < anfdmax; ++fd) 685 for (fd = 0; fd < anfdmax; ++fd)
617 if (anfds [fd].events) 686 if (anfds [fd].events)
618 { 687 {
619 anfds [fd].events = 0; 688 anfds [fd].events = 0;
620 fd_change (EV_A_ fd); 689 fd_change (EV_A_ fd, EV_IOFDSET | 1);
621 } 690 }
622} 691}
623 692
624/*****************************************************************************/ 693/*****************************************************************************/
625 694
626void inline_speed 695void inline_speed
627upheap (WT *heap, int k) 696upheap (WT *heap, int k)
628{ 697{
629 WT w = heap [k]; 698 WT w = heap [k];
630 699
631 while (k && heap [k >> 1]->at > w->at) 700 while (k)
632 { 701 {
702 int p = (k - 1) >> 1;
703
704 if (heap [p]->at <= w->at)
705 break;
706
633 heap [k] = heap [k >> 1]; 707 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 708 ((W)heap [k])->active = k + 1;
635 k >>= 1; 709 k = p;
636 } 710 }
637 711
638 heap [k] = w; 712 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 713 ((W)heap [k])->active = k + 1;
640
641} 714}
642 715
643void inline_speed 716void inline_speed
644downheap (WT *heap, int N, int k) 717downheap (WT *heap, int N, int k)
645{ 718{
646 WT w = heap [k]; 719 WT w = heap [k];
647 720
648 while (k < (N >> 1)) 721 for (;;)
649 { 722 {
650 int j = k << 1; 723 int c = (k << 1) + 1;
651 724
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 725 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 726 break;
657 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
658 heap [k] = heap [j]; 734 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 735 ((W)heap [k])->active = k + 1;
736
660 k = j; 737 k = c;
661 } 738 }
662 739
663 heap [k] = w; 740 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 741 ((W)heap [k])->active = k + 1;
665} 742}
747 for (signum = signalmax; signum--; ) 824 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 825 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 826 ev_feed_signal_event (EV_A_ signum + 1);
750} 827}
751 828
752void inline_size 829void inline_speed
753fd_intern (int fd) 830fd_intern (int fd)
754{ 831{
755#ifdef _WIN32 832#ifdef _WIN32
756 int arg = 1; 833 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 834 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
772 ev_unref (EV_A); /* child watcher should not keep loop alive */ 849 ev_unref (EV_A); /* child watcher should not keep loop alive */
773} 850}
774 851
775/*****************************************************************************/ 852/*****************************************************************************/
776 853
777static ev_child *childs [EV_PID_HASHSIZE]; 854static WL childs [EV_PID_HASHSIZE];
778 855
779#ifndef _WIN32 856#ifndef _WIN32
780 857
781static ev_signal childev; 858static ev_signal childev;
782 859
897} 974}
898 975
899unsigned int 976unsigned int
900ev_embeddable_backends (void) 977ev_embeddable_backends (void)
901{ 978{
902 return EVBACKEND_EPOLL 979 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
903 | EVBACKEND_KQUEUE 980
904 | 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;
905} 986}
906 987
907unsigned int 988unsigned int
908ev_backend (EV_P) 989ev_backend (EV_P)
909{ 990{
912 993
913unsigned int 994unsigned int
914ev_loop_count (EV_P) 995ev_loop_count (EV_P)
915{ 996{
916 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;
917} 1010}
918 1011
919static void noinline 1012static void noinline
920loop_init (EV_P_ unsigned int flags) 1013loop_init (EV_P_ unsigned int flags)
921{ 1014{
932 ev_rt_now = ev_time (); 1025 ev_rt_now = ev_time ();
933 mn_now = get_clock (); 1026 mn_now = get_clock ();
934 now_floor = mn_now; 1027 now_floor = mn_now;
935 rtmn_diff = ev_rt_now - mn_now; 1028 rtmn_diff = ev_rt_now - mn_now;
936 1029
1030 io_blocktime = 0.;
1031 timeout_blocktime = 0.;
1032
937 /* pid check not overridable via env */ 1033 /* pid check not overridable via env */
938#ifndef _WIN32 1034#ifndef _WIN32
939 if (flags & EVFLAG_FORKCHECK) 1035 if (flags & EVFLAG_FORKCHECK)
940 curpid = getpid (); 1036 curpid = getpid ();
941#endif 1037#endif
1009 array_free (pending, [i]); 1105 array_free (pending, [i]);
1010#if EV_IDLE_ENABLE 1106#if EV_IDLE_ENABLE
1011 array_free (idle, [i]); 1107 array_free (idle, [i]);
1012#endif 1108#endif
1013 } 1109 }
1110
1111 ev_free (anfds); anfdmax = 0;
1014 1112
1015 /* have to use the microsoft-never-gets-it-right macro */ 1113 /* have to use the microsoft-never-gets-it-right macro */
1016 array_free (fdchange, EMPTY); 1114 array_free (fdchange, EMPTY);
1017 array_free (timer, EMPTY); 1115 array_free (timer, EMPTY);
1018#if EV_PERIODIC_ENABLE 1116#if EV_PERIODIC_ENABLE
1019 array_free (periodic, EMPTY); 1117 array_free (periodic, EMPTY);
1118#endif
1119#if EV_FORK_ENABLE
1120 array_free (fork, EMPTY);
1020#endif 1121#endif
1021 array_free (prepare, EMPTY); 1122 array_free (prepare, EMPTY);
1022 array_free (check, EMPTY); 1123 array_free (check, EMPTY);
1023 1124
1024 backend = 0; 1125 backend = 0;
1163 postfork = 1; 1264 postfork = 1;
1164} 1265}
1165 1266
1166/*****************************************************************************/ 1267/*****************************************************************************/
1167 1268
1269void
1270ev_invoke (EV_P_ void *w, int revents)
1271{
1272 EV_CB_INVOKE ((W)w, revents);
1273}
1274
1168void inline_speed 1275void inline_speed
1169call_pending (EV_P) 1276call_pending (EV_P)
1170{ 1277{
1171 int pri; 1278 int pri;
1172 1279
1188void inline_size 1295void inline_size
1189timers_reify (EV_P) 1296timers_reify (EV_P)
1190{ 1297{
1191 while (timercnt && ((WT)timers [0])->at <= mn_now) 1298 while (timercnt && ((WT)timers [0])->at <= mn_now)
1192 { 1299 {
1193 ev_timer *w = timers [0]; 1300 ev_timer *w = (ev_timer *)timers [0];
1194 1301
1195 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1302 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1196 1303
1197 /* first reschedule or stop timer */ 1304 /* first reschedule or stop timer */
1198 if (w->repeat) 1305 if (w->repeat)
1201 1308
1202 ((WT)w)->at += w->repeat; 1309 ((WT)w)->at += w->repeat;
1203 if (((WT)w)->at < mn_now) 1310 if (((WT)w)->at < mn_now)
1204 ((WT)w)->at = mn_now; 1311 ((WT)w)->at = mn_now;
1205 1312
1206 downheap ((WT *)timers, timercnt, 0); 1313 downheap (timers, timercnt, 0);
1207 } 1314 }
1208 else 1315 else
1209 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1316 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1210 1317
1211 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1318 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1216void inline_size 1323void inline_size
1217periodics_reify (EV_P) 1324periodics_reify (EV_P)
1218{ 1325{
1219 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1326 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1220 { 1327 {
1221 ev_periodic *w = periodics [0]; 1328 ev_periodic *w = (ev_periodic *)periodics [0];
1222 1329
1223 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1330 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1224 1331
1225 /* first reschedule or stop timer */ 1332 /* first reschedule or stop timer */
1226 if (w->reschedule_cb) 1333 if (w->reschedule_cb)
1227 { 1334 {
1228 ((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);
1229 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));
1230 downheap ((WT *)periodics, periodiccnt, 0); 1337 downheap (periodics, periodiccnt, 0);
1231 } 1338 }
1232 else if (w->interval) 1339 else if (w->interval)
1233 { 1340 {
1234 ((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;
1235 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));
1236 downheap ((WT *)periodics, periodiccnt, 0); 1344 downheap (periodics, periodiccnt, 0);
1237 } 1345 }
1238 else 1346 else
1239 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1347 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1240 1348
1241 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1349 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1248 int i; 1356 int i;
1249 1357
1250 /* adjust periodics after time jump */ 1358 /* adjust periodics after time jump */
1251 for (i = 0; i < periodiccnt; ++i) 1359 for (i = 0; i < periodiccnt; ++i)
1252 { 1360 {
1253 ev_periodic *w = periodics [i]; 1361 ev_periodic *w = (ev_periodic *)periodics [i];
1254 1362
1255 if (w->reschedule_cb) 1363 if (w->reschedule_cb)
1256 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1364 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257 else if (w->interval) 1365 else if (w->interval)
1258 ((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;
1259 } 1367 }
1260 1368
1261 /* now rebuild the heap */ 1369 /* now rebuild the heap */
1262 for (i = periodiccnt >> 1; i--; ) 1370 for (i = periodiccnt >> 1; i--; )
1263 downheap ((WT *)periodics, periodiccnt, i); 1371 downheap (periodics, periodiccnt, i);
1264} 1372}
1265#endif 1373#endif
1266 1374
1267#if EV_IDLE_ENABLE 1375#if EV_IDLE_ENABLE
1268void inline_size 1376void inline_size
1269idle_reify (EV_P) 1377idle_reify (EV_P)
1270{ 1378{
1271 if (expect_false (!idleall)) 1379 if (expect_false (idleall))
1272 { 1380 {
1273 int pri; 1381 int pri;
1274 1382
1275 for (pri = NUMPRI; pri--; ) 1383 for (pri = NUMPRI; pri--; )
1276 { 1384 {
1285 } 1393 }
1286 } 1394 }
1287} 1395}
1288#endif 1396#endif
1289 1397
1290int inline_size 1398void inline_speed
1291time_update_monotonic (EV_P) 1399time_update (EV_P_ ev_tstamp max_block)
1292{ 1400{
1401 int i;
1402
1403#if EV_USE_MONOTONIC
1404 if (expect_true (have_monotonic))
1405 {
1406 ev_tstamp odiff = rtmn_diff;
1407
1293 mn_now = get_clock (); 1408 mn_now = get_clock ();
1294 1409
1410 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1411 /* interpolate in the meantime */
1295 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1412 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1296 { 1413 {
1297 ev_rt_now = rtmn_diff + mn_now; 1414 ev_rt_now = rtmn_diff + mn_now;
1298 return 0; 1415 return;
1299 } 1416 }
1300 else 1417
1301 {
1302 now_floor = mn_now; 1418 now_floor = mn_now;
1303 ev_rt_now = ev_time (); 1419 ev_rt_now = ev_time ();
1304 return 1;
1305 }
1306}
1307 1420
1308void inline_size 1421 /* loop a few times, before making important decisions.
1309time_update (EV_P) 1422 * on the choice of "4": one iteration isn't enough,
1310{ 1423 * in case we get preempted during the calls to
1311 int i; 1424 * ev_time and get_clock. a second call is almost guaranteed
1312 1425 * to succeed in that case, though. and looping a few more times
1313#if EV_USE_MONOTONIC 1426 * doesn't hurt either as we only do this on time-jumps or
1314 if (expect_true (have_monotonic)) 1427 * in the unlikely event of having been preempted here.
1315 { 1428 */
1316 if (time_update_monotonic (EV_A)) 1429 for (i = 4; --i; )
1317 { 1430 {
1318 ev_tstamp odiff = rtmn_diff;
1319
1320 /* loop a few times, before making important decisions.
1321 * on the choice of "4": one iteration isn't enough,
1322 * in case we get preempted during the calls to
1323 * ev_time and get_clock. a second call is almost guaranteed
1324 * to succeed in that case, though. and looping a few more times
1325 * doesn't hurt either as we only do this on time-jumps or
1326 * in the unlikely event of having been preempted here.
1327 */
1328 for (i = 4; --i; )
1329 {
1330 rtmn_diff = ev_rt_now - mn_now; 1431 rtmn_diff = ev_rt_now - mn_now;
1331 1432
1332 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1433 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1333 return; /* all is well */ 1434 return; /* all is well */
1334 1435
1335 ev_rt_now = ev_time (); 1436 ev_rt_now = ev_time ();
1336 mn_now = get_clock (); 1437 mn_now = get_clock ();
1337 now_floor = mn_now; 1438 now_floor = mn_now;
1338 } 1439 }
1339 1440
1340# if EV_PERIODIC_ENABLE 1441# if EV_PERIODIC_ENABLE
1341 periodics_reschedule (EV_A); 1442 periodics_reschedule (EV_A);
1342# endif 1443# endif
1343 /* no timer adjustment, as the monotonic clock doesn't jump */ 1444 /* no timer adjustment, as the monotonic clock doesn't jump */
1344 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1445 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1345 }
1346 } 1446 }
1347 else 1447 else
1348#endif 1448#endif
1349 { 1449 {
1350 ev_rt_now = ev_time (); 1450 ev_rt_now = ev_time ();
1351 1451
1352 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))
1353 { 1453 {
1354#if EV_PERIODIC_ENABLE 1454#if EV_PERIODIC_ENABLE
1355 periodics_reschedule (EV_A); 1455 periodics_reschedule (EV_A);
1356#endif 1456#endif
1357
1358 /* 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 */
1359 for (i = 0; i < timercnt; ++i) 1458 for (i = 0; i < timercnt; ++i)
1360 ((WT)timers [i])->at += ev_rt_now - mn_now; 1459 ((WT)timers [i])->at += ev_rt_now - mn_now;
1361 } 1460 }
1362 1461
1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1505 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407 call_pending (EV_A); 1506 call_pending (EV_A);
1408 } 1507 }
1409#endif 1508#endif
1410 1509
1411 /* queue check watchers (and execute them) */ 1510 /* queue prepare watchers (and execute them) */
1412 if (expect_false (preparecnt)) 1511 if (expect_false (preparecnt))
1413 { 1512 {
1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1513 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415 call_pending (EV_A); 1514 call_pending (EV_A);
1416 } 1515 }
1425 /* update fd-related kernel structures */ 1524 /* update fd-related kernel structures */
1426 fd_reify (EV_A); 1525 fd_reify (EV_A);
1427 1526
1428 /* calculate blocking time */ 1527 /* calculate blocking time */
1429 { 1528 {
1430 ev_tstamp block; 1529 ev_tstamp waittime = 0.;
1530 ev_tstamp sleeptime = 0.;
1431 1531
1432 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1532 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1433 block = 0.; /* do not block at all */
1434 else
1435 { 1533 {
1436 /* update time to cancel out callback processing overhead */ 1534 /* update time to cancel out callback processing overhead */
1437#if EV_USE_MONOTONIC
1438 if (expect_true (have_monotonic))
1439 time_update_monotonic (EV_A); 1535 time_update (EV_A_ 1e100);
1440 else
1441#endif
1442 {
1443 ev_rt_now = ev_time ();
1444 mn_now = ev_rt_now;
1445 }
1446 1536
1447 block = MAX_BLOCKTIME; 1537 waittime = MAX_BLOCKTIME;
1448 1538
1449 if (timercnt) 1539 if (timercnt)
1450 { 1540 {
1451 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1541 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1452 if (block > to) block = to; 1542 if (waittime > to) waittime = to;
1453 } 1543 }
1454 1544
1455#if EV_PERIODIC_ENABLE 1545#if EV_PERIODIC_ENABLE
1456 if (periodiccnt) 1546 if (periodiccnt)
1457 { 1547 {
1458 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;
1459 if (block > to) block = to; 1549 if (waittime > to) waittime = to;
1460 } 1550 }
1461#endif 1551#endif
1462 1552
1463 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 }
1464 } 1566 }
1465 1567
1466 ++loop_count; 1568 ++loop_count;
1467 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);
1468 } 1573 }
1469
1470 /* update ev_rt_now, do magic */
1471 time_update (EV_A);
1472 1574
1473 /* queue pending timers and reschedule them */ 1575 /* queue pending timers and reschedule them */
1474 timers_reify (EV_A); /* relative timers called last */ 1576 timers_reify (EV_A); /* relative timers called last */
1475#if EV_PERIODIC_ENABLE 1577#if EV_PERIODIC_ENABLE
1476 periodics_reify (EV_A); /* absolute timers called first */ 1578 periodics_reify (EV_A); /* absolute timers called first */
1523 head = &(*head)->next; 1625 head = &(*head)->next;
1524 } 1626 }
1525} 1627}
1526 1628
1527void inline_speed 1629void inline_speed
1528ev_clear_pending (EV_P_ W w) 1630clear_pending (EV_P_ W w)
1529{ 1631{
1530 if (w->pending) 1632 if (w->pending)
1531 { 1633 {
1532 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1634 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533 w->pending = 0; 1635 w->pending = 0;
1534 } 1636 }
1637}
1638
1639int
1640ev_clear_pending (EV_P_ void *w)
1641{
1642 W w_ = (W)w;
1643 int pending = w_->pending;
1644
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
1653 return 0;
1535} 1654}
1536 1655
1537void inline_size 1656void inline_size
1538pri_adjust (EV_P_ W w) 1657pri_adjust (EV_P_ W w)
1539{ 1658{
1558 w->active = 0; 1677 w->active = 0;
1559} 1678}
1560 1679
1561/*****************************************************************************/ 1680/*****************************************************************************/
1562 1681
1563void 1682void noinline
1564ev_io_start (EV_P_ ev_io *w) 1683ev_io_start (EV_P_ ev_io *w)
1565{ 1684{
1566 int fd = w->fd; 1685 int fd = w->fd;
1567 1686
1568 if (expect_false (ev_is_active (w))) 1687 if (expect_false (ev_is_active (w)))
1570 1689
1571 assert (("ev_io_start called with negative fd", fd >= 0)); 1690 assert (("ev_io_start called with negative fd", fd >= 0));
1572 1691
1573 ev_start (EV_A_ (W)w, 1); 1692 ev_start (EV_A_ (W)w, 1);
1574 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1693 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1575 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1694 wlist_add (&anfds[fd].head, (WL)w);
1576 1695
1577 fd_change (EV_A_ fd); 1696 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1697 w->events &= ~EV_IOFDSET;
1578} 1698}
1579 1699
1580void 1700void noinline
1581ev_io_stop (EV_P_ ev_io *w) 1701ev_io_stop (EV_P_ ev_io *w)
1582{ 1702{
1583 ev_clear_pending (EV_A_ (W)w); 1703 clear_pending (EV_A_ (W)w);
1584 if (expect_false (!ev_is_active (w))) 1704 if (expect_false (!ev_is_active (w)))
1585 return; 1705 return;
1586 1706
1587 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));
1588 1708
1589 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1709 wlist_del (&anfds[w->fd].head, (WL)w);
1590 ev_stop (EV_A_ (W)w); 1710 ev_stop (EV_A_ (W)w);
1591 1711
1592 fd_change (EV_A_ w->fd); 1712 fd_change (EV_A_ w->fd, 1);
1593} 1713}
1594 1714
1595void 1715void noinline
1596ev_timer_start (EV_P_ ev_timer *w) 1716ev_timer_start (EV_P_ ev_timer *w)
1597{ 1717{
1598 if (expect_false (ev_is_active (w))) 1718 if (expect_false (ev_is_active (w)))
1599 return; 1719 return;
1600 1720
1601 ((WT)w)->at += mn_now; 1721 ((WT)w)->at += mn_now;
1602 1722
1603 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.));
1604 1724
1605 ev_start (EV_A_ (W)w, ++timercnt); 1725 ev_start (EV_A_ (W)w, ++timercnt);
1606 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1726 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1607 timers [timercnt - 1] = w; 1727 timers [timercnt - 1] = (WT)w;
1608 upheap ((WT *)timers, timercnt - 1); 1728 upheap (timers, timercnt - 1);
1609 1729
1610 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1730 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1611} 1731}
1612 1732
1613void 1733void noinline
1614ev_timer_stop (EV_P_ ev_timer *w) 1734ev_timer_stop (EV_P_ ev_timer *w)
1615{ 1735{
1616 ev_clear_pending (EV_A_ (W)w); 1736 clear_pending (EV_A_ (W)w);
1617 if (expect_false (!ev_is_active (w))) 1737 if (expect_false (!ev_is_active (w)))
1618 return; 1738 return;
1619 1739
1620 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1740 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1621 1741
1622 { 1742 {
1623 int active = ((W)w)->active; 1743 int active = ((W)w)->active;
1624 1744
1625 if (expect_true (--active < --timercnt)) 1745 if (expect_true (--active < --timercnt))
1626 { 1746 {
1627 timers [active] = timers [timercnt]; 1747 timers [active] = timers [timercnt];
1628 adjustheap ((WT *)timers, timercnt, active); 1748 adjustheap (timers, timercnt, active);
1629 } 1749 }
1630 } 1750 }
1631 1751
1632 ((WT)w)->at -= mn_now; 1752 ((WT)w)->at -= mn_now;
1633 1753
1634 ev_stop (EV_A_ (W)w); 1754 ev_stop (EV_A_ (W)w);
1635} 1755}
1636 1756
1637void 1757void noinline
1638ev_timer_again (EV_P_ ev_timer *w) 1758ev_timer_again (EV_P_ ev_timer *w)
1639{ 1759{
1640 if (ev_is_active (w)) 1760 if (ev_is_active (w))
1641 { 1761 {
1642 if (w->repeat) 1762 if (w->repeat)
1643 { 1763 {
1644 ((WT)w)->at = mn_now + w->repeat; 1764 ((WT)w)->at = mn_now + w->repeat;
1645 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1765 adjustheap (timers, timercnt, ((W)w)->active - 1);
1646 } 1766 }
1647 else 1767 else
1648 ev_timer_stop (EV_A_ w); 1768 ev_timer_stop (EV_A_ w);
1649 } 1769 }
1650 else if (w->repeat) 1770 else if (w->repeat)
1653 ev_timer_start (EV_A_ w); 1773 ev_timer_start (EV_A_ w);
1654 } 1774 }
1655} 1775}
1656 1776
1657#if EV_PERIODIC_ENABLE 1777#if EV_PERIODIC_ENABLE
1658void 1778void noinline
1659ev_periodic_start (EV_P_ ev_periodic *w) 1779ev_periodic_start (EV_P_ ev_periodic *w)
1660{ 1780{
1661 if (expect_false (ev_is_active (w))) 1781 if (expect_false (ev_is_active (w)))
1662 return; 1782 return;
1663 1783
1665 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1785 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1786 else if (w->interval)
1667 { 1787 {
1668 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.));
1669 /* 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 */
1670 ((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;
1671 } 1791 }
1792 else
1793 ((WT)w)->at = w->offset;
1672 1794
1673 ev_start (EV_A_ (W)w, ++periodiccnt); 1795 ev_start (EV_A_ (W)w, ++periodiccnt);
1674 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1796 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1675 periodics [periodiccnt - 1] = w; 1797 periodics [periodiccnt - 1] = (WT)w;
1676 upheap ((WT *)periodics, periodiccnt - 1); 1798 upheap (periodics, periodiccnt - 1);
1677 1799
1678 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1800 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1679} 1801}
1680 1802
1681void 1803void noinline
1682ev_periodic_stop (EV_P_ ev_periodic *w) 1804ev_periodic_stop (EV_P_ ev_periodic *w)
1683{ 1805{
1684 ev_clear_pending (EV_A_ (W)w); 1806 clear_pending (EV_A_ (W)w);
1685 if (expect_false (!ev_is_active (w))) 1807 if (expect_false (!ev_is_active (w)))
1686 return; 1808 return;
1687 1809
1688 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1810 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1689 1811
1690 { 1812 {
1691 int active = ((W)w)->active; 1813 int active = ((W)w)->active;
1692 1814
1693 if (expect_true (--active < --periodiccnt)) 1815 if (expect_true (--active < --periodiccnt))
1694 { 1816 {
1695 periodics [active] = periodics [periodiccnt]; 1817 periodics [active] = periodics [periodiccnt];
1696 adjustheap ((WT *)periodics, periodiccnt, active); 1818 adjustheap (periodics, periodiccnt, active);
1697 } 1819 }
1698 } 1820 }
1699 1821
1700 ev_stop (EV_A_ (W)w); 1822 ev_stop (EV_A_ (W)w);
1701} 1823}
1702 1824
1703void 1825void noinline
1704ev_periodic_again (EV_P_ ev_periodic *w) 1826ev_periodic_again (EV_P_ ev_periodic *w)
1705{ 1827{
1706 /* TODO: use adjustheap and recalculation */ 1828 /* TODO: use adjustheap and recalculation */
1707 ev_periodic_stop (EV_A_ w); 1829 ev_periodic_stop (EV_A_ w);
1708 ev_periodic_start (EV_A_ w); 1830 ev_periodic_start (EV_A_ w);
1711 1833
1712#ifndef SA_RESTART 1834#ifndef SA_RESTART
1713# define SA_RESTART 0 1835# define SA_RESTART 0
1714#endif 1836#endif
1715 1837
1716void 1838void noinline
1717ev_signal_start (EV_P_ ev_signal *w) 1839ev_signal_start (EV_P_ ev_signal *w)
1718{ 1840{
1719#if EV_MULTIPLICITY 1841#if EV_MULTIPLICITY
1720 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));
1721#endif 1843#endif
1722 if (expect_false (ev_is_active (w))) 1844 if (expect_false (ev_is_active (w)))
1723 return; 1845 return;
1724 1846
1725 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));
1726 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
1727 ev_start (EV_A_ (W)w, 1); 1863 ev_start (EV_A_ (W)w, 1);
1728 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1729 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1864 wlist_add (&signals [w->signum - 1].head, (WL)w);
1730 1865
1731 if (!((WL)w)->next) 1866 if (!((WL)w)->next)
1732 { 1867 {
1733#if _WIN32 1868#if _WIN32
1734 signal (w->signum, sighandler); 1869 signal (w->signum, sighandler);
1740 sigaction (w->signum, &sa, 0); 1875 sigaction (w->signum, &sa, 0);
1741#endif 1876#endif
1742 } 1877 }
1743} 1878}
1744 1879
1745void 1880void noinline
1746ev_signal_stop (EV_P_ ev_signal *w) 1881ev_signal_stop (EV_P_ ev_signal *w)
1747{ 1882{
1748 ev_clear_pending (EV_A_ (W)w); 1883 clear_pending (EV_A_ (W)w);
1749 if (expect_false (!ev_is_active (w))) 1884 if (expect_false (!ev_is_active (w)))
1750 return; 1885 return;
1751 1886
1752 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1887 wlist_del (&signals [w->signum - 1].head, (WL)w);
1753 ev_stop (EV_A_ (W)w); 1888 ev_stop (EV_A_ (W)w);
1754 1889
1755 if (!signals [w->signum - 1].head) 1890 if (!signals [w->signum - 1].head)
1756 signal (w->signum, SIG_DFL); 1891 signal (w->signum, SIG_DFL);
1757} 1892}
1764#endif 1899#endif
1765 if (expect_false (ev_is_active (w))) 1900 if (expect_false (ev_is_active (w)))
1766 return; 1901 return;
1767 1902
1768 ev_start (EV_A_ (W)w, 1); 1903 ev_start (EV_A_ (W)w, 1);
1769 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1904 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1770} 1905}
1771 1906
1772void 1907void
1773ev_child_stop (EV_P_ ev_child *w) 1908ev_child_stop (EV_P_ ev_child *w)
1774{ 1909{
1775 ev_clear_pending (EV_A_ (W)w); 1910 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1911 if (expect_false (!ev_is_active (w)))
1777 return; 1912 return;
1778 1913
1779 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1914 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1780 ev_stop (EV_A_ (W)w); 1915 ev_stop (EV_A_ (W)w);
1781} 1916}
1782 1917
1783#if EV_STAT_ENABLE 1918#if EV_STAT_ENABLE
1784 1919
2016} 2151}
2017 2152
2018void 2153void
2019ev_stat_stop (EV_P_ ev_stat *w) 2154ev_stat_stop (EV_P_ ev_stat *w)
2020{ 2155{
2021 ev_clear_pending (EV_A_ (W)w); 2156 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2157 if (expect_false (!ev_is_active (w)))
2023 return; 2158 return;
2024 2159
2025#if EV_USE_INOTIFY 2160#if EV_USE_INOTIFY
2026 infy_del (EV_A_ w); 2161 infy_del (EV_A_ w);
2052} 2187}
2053 2188
2054void 2189void
2055ev_idle_stop (EV_P_ ev_idle *w) 2190ev_idle_stop (EV_P_ ev_idle *w)
2056{ 2191{
2057 ev_clear_pending (EV_A_ (W)w); 2192 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2193 if (expect_false (!ev_is_active (w)))
2059 return; 2194 return;
2060 2195
2061 { 2196 {
2062 int active = ((W)w)->active; 2197 int active = ((W)w)->active;
2082} 2217}
2083 2218
2084void 2219void
2085ev_prepare_stop (EV_P_ ev_prepare *w) 2220ev_prepare_stop (EV_P_ ev_prepare *w)
2086{ 2221{
2087 ev_clear_pending (EV_A_ (W)w); 2222 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2223 if (expect_false (!ev_is_active (w)))
2089 return; 2224 return;
2090 2225
2091 { 2226 {
2092 int active = ((W)w)->active; 2227 int active = ((W)w)->active;
2109} 2244}
2110 2245
2111void 2246void
2112ev_check_stop (EV_P_ ev_check *w) 2247ev_check_stop (EV_P_ ev_check *w)
2113{ 2248{
2114 ev_clear_pending (EV_A_ (W)w); 2249 clear_pending (EV_A_ (W)w);
2115 if (expect_false (!ev_is_active (w))) 2250 if (expect_false (!ev_is_active (w)))
2116 return; 2251 return;
2117 2252
2118 { 2253 {
2119 int active = ((W)w)->active; 2254 int active = ((W)w)->active;
2126 2261
2127#if EV_EMBED_ENABLE 2262#if EV_EMBED_ENABLE
2128void noinline 2263void noinline
2129ev_embed_sweep (EV_P_ ev_embed *w) 2264ev_embed_sweep (EV_P_ ev_embed *w)
2130{ 2265{
2131 ev_loop (w->loop, EVLOOP_NONBLOCK); 2266 ev_loop (w->other, EVLOOP_NONBLOCK);
2132} 2267}
2133 2268
2134static void 2269static void
2135embed_cb (EV_P_ ev_io *io, int revents) 2270embed_io_cb (EV_P_ ev_io *io, int revents)
2136{ 2271{
2137 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2272 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2138 2273
2139 if (ev_cb (w)) 2274 if (ev_cb (w))
2140 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2275 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2141 else 2276 else
2142 ev_embed_sweep (loop, w); 2277 ev_loop (w->other, EVLOOP_NONBLOCK);
2143} 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
2144 2303
2145void 2304void
2146ev_embed_start (EV_P_ ev_embed *w) 2305ev_embed_start (EV_P_ ev_embed *w)
2147{ 2306{
2148 if (expect_false (ev_is_active (w))) 2307 if (expect_false (ev_is_active (w)))
2149 return; 2308 return;
2150 2309
2151 { 2310 {
2152 struct ev_loop *loop = w->loop; 2311 struct ev_loop *loop = w->other;
2153 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 ()));
2154 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2313 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2155 } 2314 }
2156 2315
2157 ev_set_priority (&w->io, ev_priority (w)); 2316 ev_set_priority (&w->io, ev_priority (w));
2158 ev_io_start (EV_A_ &w->io); 2317 ev_io_start (EV_A_ &w->io);
2159 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
2160 ev_start (EV_A_ (W)w, 1); 2325 ev_start (EV_A_ (W)w, 1);
2161} 2326}
2162 2327
2163void 2328void
2164ev_embed_stop (EV_P_ ev_embed *w) 2329ev_embed_stop (EV_P_ ev_embed *w)
2165{ 2330{
2166 ev_clear_pending (EV_A_ (W)w); 2331 clear_pending (EV_A_ (W)w);
2167 if (expect_false (!ev_is_active (w))) 2332 if (expect_false (!ev_is_active (w)))
2168 return; 2333 return;
2169 2334
2170 ev_io_stop (EV_A_ &w->io); 2335 ev_io_stop (EV_A_ &w->io);
2336 ev_prepare_stop (EV_A_ &w->prepare);
2171 2337
2172 ev_stop (EV_A_ (W)w); 2338 ev_stop (EV_A_ (W)w);
2173} 2339}
2174#endif 2340#endif
2175 2341
2186} 2352}
2187 2353
2188void 2354void
2189ev_fork_stop (EV_P_ ev_fork *w) 2355ev_fork_stop (EV_P_ ev_fork *w)
2190{ 2356{
2191 ev_clear_pending (EV_A_ (W)w); 2357 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2358 if (expect_false (!ev_is_active (w)))
2193 return; 2359 return;
2194 2360
2195 { 2361 {
2196 int active = ((W)w)->active; 2362 int active = ((W)w)->active;
2264 ev_timer_set (&once->to, timeout, 0.); 2430 ev_timer_set (&once->to, timeout, 0.);
2265 ev_timer_start (EV_A_ &once->to); 2431 ev_timer_start (EV_A_ &once->to);
2266 } 2432 }
2267} 2433}
2268 2434
2435#if EV_MULTIPLICITY
2436 #include "ev_wrap.h"
2437#endif
2438
2269#ifdef __cplusplus 2439#ifdef __cplusplus
2270} 2440}
2271#endif 2441#endif
2272 2442

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines