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

Comparing libev/ev.c (file contents):
Revision 1.152 by root, Wed Nov 28 11:15:55 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)->priority - EV_MINPRI) 276#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 277
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 278#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 279#define EMPTY2(a,b) /* used to suppress some warnings */
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
281 perror (msg); 313 perror (msg);
282 abort (); 314 abort ();
283 } 315 }
284} 316}
285 317
286static void *(*alloc)(void *ptr, size_t size) = realloc; 318static void *(*alloc)(void *ptr, long size);
287 319
288void 320void
289ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 321ev_set_allocator (void *(*cb)(void *ptr, long size))
290{ 322{
291 alloc = cb; 323 alloc = cb;
292} 324}
293 325
294inline_speed void * 326inline_speed void *
295ev_realloc (void *ptr, size_t size) 327ev_realloc (void *ptr, long size)
296{ 328{
297 ptr = alloc (ptr, size); 329 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
298 330
299 if (!ptr && size) 331 if (!ptr && size)
300 { 332 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size); 333 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort (); 334 abort ();
303 } 335 }
304 336
305 return ptr; 337 return ptr;
306} 338}
324{ 356{
325 W w; 357 W w;
326 int events; 358 int events;
327} ANPENDING; 359} ANPENDING;
328 360
361#if EV_USE_INOTIFY
329typedef struct 362typedef struct
330{ 363{
331#if EV_USE_INOTIFY
332 WL head; 364 WL head;
333#endif
334} ANFS; 365} ANFS;
366#endif
335 367
336#if EV_MULTIPLICITY 368#if EV_MULTIPLICITY
337 369
338 struct ev_loop 370 struct ev_loop
339 { 371 {
396{ 428{
397 return ev_rt_now; 429 return ev_rt_now;
398} 430}
399#endif 431#endif
400 432
401#define array_roundsize(type,n) (((n) | 4) & ~3) 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
460int inline_size
461array_nextsize (int elem, int cur, int cnt)
462{
463 int ncur = cur + 1;
464
465 do
466 ncur <<= 1;
467 while (cnt > ncur);
468
469 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
470 if (elem * ncur > 4096)
471 {
472 ncur *= elem;
473 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
474 ncur = ncur - sizeof (void *) * 4;
475 ncur /= elem;
476 }
477
478 return ncur;
479}
480
481static noinline void *
482array_realloc (int elem, void *base, int *cur, int cnt)
483{
484 *cur = array_nextsize (elem, *cur, cnt);
485 return ev_realloc (base, elem * *cur);
486}
402 487
403#define array_needsize(type,base,cur,cnt,init) \ 488#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 489 if (expect_false ((cnt) > (cur))) \
405 { \ 490 { \
406 int newcnt = cur; \ 491 int ocur_ = (cur); \
407 do \ 492 (base) = (type *)array_realloc \
408 { \ 493 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 494 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 495 }
417 496
497#if 0
418#define array_slim(type,stem) \ 498#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 499 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 500 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 501 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 502 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 503 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 504 }
505#endif
425 506
426#define array_free(stem, idx) \ 507#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 508 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 509
429/*****************************************************************************/ 510/*****************************************************************************/
430 511
431void noinline 512void noinline
432ev_feed_event (EV_P_ void *w, int revents) 513ev_feed_event (EV_P_ void *w, int revents)
433{ 514{
434 W w_ = (W)w; 515 W w_ = (W)w;
516 int pri = ABSPRI (w_);
435 517
436 if (expect_false (w_->pending)) 518 if (expect_false (w_->pending))
519 pendings [pri][w_->pending - 1].events |= revents;
520 else
437 { 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_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 525 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 526 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 527}
447 528
448void inline_size 529void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 530queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 531{
451 int i; 532 int i;
452 533
453 for (i = 0; i < eventcnt; ++i) 534 for (i = 0; i < eventcnt; ++i)
485} 566}
486 567
487void 568void
488ev_feed_fd_event (EV_P_ int fd, int revents) 569ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 570{
571 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 572 fd_event (EV_A_ fd, revents);
491} 573}
492 574
493void inline_size 575void inline_size
494fd_reify (EV_P) 576fd_reify (EV_P)
495{ 577{
499 { 581 {
500 int fd = fdchanges [i]; 582 int fd = fdchanges [i];
501 ANFD *anfd = anfds + fd; 583 ANFD *anfd = anfds + fd;
502 ev_io *w; 584 ev_io *w;
503 585
504 int events = 0; 586 unsigned char events = 0;
505 587
506 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)
507 events |= w->events; 589 events |= (unsigned char)w->events;
508 590
509#if EV_SELECT_IS_WINSOCKET 591#if EV_SELECT_IS_WINSOCKET
510 if (events) 592 if (events)
511 { 593 {
512 unsigned long argp; 594 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd); 595 anfd->handle = _get_osfhandle (fd);
514 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));
515 } 597 }
516#endif 598#endif
517 599
600 {
601 unsigned char o_events = anfd->events;
602 unsigned char o_reify = anfd->reify;
603
518 anfd->reify = 0; 604 anfd->reify = 0;
519
520 backend_modify (EV_A_ fd, anfd->events, events);
521 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 }
522 } 610 }
523 611
524 fdchangecnt = 0; 612 fdchangecnt = 0;
525} 613}
526 614
527void inline_size 615void inline_size
528fd_change (EV_P_ int fd) 616fd_change (EV_P_ int fd, int flags)
529{ 617{
530 if (expect_false (anfds [fd].reify)) 618 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 619 anfds [fd].reify |= flags;
534 620
621 if (expect_true (!reify))
622 {
535 ++fdchangecnt; 623 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 624 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 625 fdchanges [fdchangecnt - 1] = fd;
626 }
538} 627}
539 628
540void inline_speed 629void inline_speed
541fd_kill (EV_P_ int fd) 630fd_kill (EV_P_ int fd)
542{ 631{
589static void noinline 678static void noinline
590fd_rearm_all (EV_P) 679fd_rearm_all (EV_P)
591{ 680{
592 int fd; 681 int fd;
593 682
594 /* this should be highly optimised to not do anything but set a flag */
595 for (fd = 0; fd < anfdmax; ++fd) 683 for (fd = 0; fd < anfdmax; ++fd)
596 if (anfds [fd].events) 684 if (anfds [fd].events)
597 { 685 {
598 anfds [fd].events = 0; 686 anfds [fd].events = 0;
599 fd_change (EV_A_ fd); 687 fd_change (EV_A_ fd, EV_IOFDSET | 1);
600 } 688 }
601} 689}
602 690
603/*****************************************************************************/ 691/*****************************************************************************/
604 692
605void inline_speed 693void inline_speed
606upheap (WT *heap, int k) 694upheap (WT *heap, int k)
607{ 695{
608 WT w = heap [k]; 696 WT w = heap [k];
609 697
610 while (k && heap [k >> 1]->at > w->at) 698 while (k)
611 { 699 {
700 int p = (k - 1) >> 1;
701
702 if (heap [p]->at <= w->at)
703 break;
704
612 heap [k] = heap [k >> 1]; 705 heap [k] = heap [p];
613 ((W)heap [k])->active = k + 1; 706 ((W)heap [k])->active = k + 1;
614 k >>= 1; 707 k = p;
615 } 708 }
616 709
617 heap [k] = w; 710 heap [k] = w;
618 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
619
620} 712}
621 713
622void inline_speed 714void inline_speed
623downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
624{ 716{
625 WT w = heap [k]; 717 WT w = heap [k];
626 718
627 while (k < (N >> 1)) 719 for (;;)
628 { 720 {
629 int j = k << 1; 721 int c = (k << 1) + 1;
630 722
631 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 723 if (c >= N)
632 ++j;
633
634 if (w->at <= heap [j]->at)
635 break; 724 break;
636 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
637 heap [k] = heap [j]; 732 heap [k] = heap [c];
638 ((W)heap [k])->active = k + 1; 733 ((W)heap [k])->active = k + 1;
734
639 k = j; 735 k = c;
640 } 736 }
641 737
642 heap [k] = w; 738 heap [k] = w;
643 ((W)heap [k])->active = k + 1; 739 ((W)heap [k])->active = k + 1;
644} 740}
726 for (signum = signalmax; signum--; ) 822 for (signum = signalmax; signum--; )
727 if (signals [signum].gotsig) 823 if (signals [signum].gotsig)
728 ev_feed_signal_event (EV_A_ signum + 1); 824 ev_feed_signal_event (EV_A_ signum + 1);
729} 825}
730 826
731void inline_size 827void inline_speed
732fd_intern (int fd) 828fd_intern (int fd)
733{ 829{
734#ifdef _WIN32 830#ifdef _WIN32
735 int arg = 1; 831 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 832 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
751 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
752} 848}
753 849
754/*****************************************************************************/ 850/*****************************************************************************/
755 851
756static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
757 853
758#ifndef _WIN32 854#ifndef _WIN32
759 855
760static ev_signal childev; 856static ev_signal childev;
761 857
765 ev_child *w; 861 ev_child *w;
766 862
767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 863 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
768 if (w->pid == pid || !w->pid) 864 if (w->pid == pid || !w->pid)
769 { 865 {
770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 866 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
771 w->rpid = pid; 867 w->rpid = pid;
772 w->rstatus = status; 868 w->rstatus = status;
773 ev_feed_event (EV_A_ (W)w, EV_CHILD); 869 ev_feed_event (EV_A_ (W)w, EV_CHILD);
774 } 870 }
775} 871}
776 872
777#ifndef WCONTINUED 873#ifndef WCONTINUED
876} 972}
877 973
878unsigned int 974unsigned int
879ev_embeddable_backends (void) 975ev_embeddable_backends (void)
880{ 976{
977 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
881 return EVBACKEND_EPOLL 978 return EVBACKEND_KQUEUE
882 | EVBACKEND_KQUEUE
883 | EVBACKEND_PORT; 979 | EVBACKEND_PORT;
884} 980}
885 981
886unsigned int 982unsigned int
887ev_backend (EV_P) 983ev_backend (EV_P)
888{ 984{
889 return backend; 985 return backend;
986}
987
988unsigned int
989ev_loop_count (EV_P)
990{
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;
890} 1004}
891 1005
892static void noinline 1006static void noinline
893loop_init (EV_P_ unsigned int flags) 1007loop_init (EV_P_ unsigned int flags)
894{ 1008{
905 ev_rt_now = ev_time (); 1019 ev_rt_now = ev_time ();
906 mn_now = get_clock (); 1020 mn_now = get_clock ();
907 now_floor = mn_now; 1021 now_floor = mn_now;
908 rtmn_diff = ev_rt_now - mn_now; 1022 rtmn_diff = ev_rt_now - mn_now;
909 1023
1024 io_blocktime = 0.;
1025 timeout_blocktime = 0.;
1026
1027 /* pid check not overridable via env */
1028#ifndef _WIN32
1029 if (flags & EVFLAG_FORKCHECK)
1030 curpid = getpid ();
1031#endif
1032
910 if (!(flags & EVFLAG_NOENV) 1033 if (!(flags & EVFLAG_NOENV)
911 && !enable_secure () 1034 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS")) 1035 && getenv ("LIBEV_FLAGS"))
913 flags = atoi (getenv ("LIBEV_FLAGS")); 1036 flags = atoi (getenv ("LIBEV_FLAGS"));
914 1037
970#if EV_USE_SELECT 1093#if EV_USE_SELECT
971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1094 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
972#endif 1095#endif
973 1096
974 for (i = NUMPRI; i--; ) 1097 for (i = NUMPRI; i--; )
1098 {
975 array_free (pending, [i]); 1099 array_free (pending, [i]);
1100#if EV_IDLE_ENABLE
1101 array_free (idle, [i]);
1102#endif
1103 }
1104
1105 ev_free (anfds); anfdmax = 0;
976 1106
977 /* have to use the microsoft-never-gets-it-right macro */ 1107 /* have to use the microsoft-never-gets-it-right macro */
978 array_free (fdchange, EMPTY0); 1108 array_free (fdchange, EMPTY);
979 array_free (timer, EMPTY0); 1109 array_free (timer, EMPTY);
980#if EV_PERIODIC_ENABLE 1110#if EV_PERIODIC_ENABLE
981 array_free (periodic, EMPTY0); 1111 array_free (periodic, EMPTY);
982#endif 1112#endif
1113#if EV_FORK_ENABLE
983 array_free (idle, EMPTY0); 1114 array_free (fork, EMPTY);
1115#endif
984 array_free (prepare, EMPTY0); 1116 array_free (prepare, EMPTY);
985 array_free (check, EMPTY0); 1117 array_free (check, EMPTY);
986 1118
987 backend = 0; 1119 backend = 0;
988} 1120}
1121
1122void inline_size infy_fork (EV_P);
989 1123
990void inline_size 1124void inline_size
991loop_fork (EV_P) 1125loop_fork (EV_P)
992{ 1126{
993#if EV_USE_PORT 1127#if EV_USE_PORT
996#if EV_USE_KQUEUE 1130#if EV_USE_KQUEUE
997 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1131 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
998#endif 1132#endif
999#if EV_USE_EPOLL 1133#if EV_USE_EPOLL
1000 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1134 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1135#endif
1136#if EV_USE_INOTIFY
1137 infy_fork (EV_A);
1001#endif 1138#endif
1002 1139
1003 if (ev_is_active (&sigev)) 1140 if (ev_is_active (&sigev))
1004 { 1141 {
1005 /* default loop */ 1142 /* default loop */
1121 postfork = 1; 1258 postfork = 1;
1122} 1259}
1123 1260
1124/*****************************************************************************/ 1261/*****************************************************************************/
1125 1262
1126int inline_size 1263void
1127any_pending (EV_P) 1264ev_invoke (EV_P_ void *w, int revents)
1128{ 1265{
1129 int pri; 1266 EV_CB_INVOKE ((W)w, revents);
1130
1131 for (pri = NUMPRI; pri--; )
1132 if (pendingcnt [pri])
1133 return 1;
1134
1135 return 0;
1136} 1267}
1137 1268
1138void inline_speed 1269void inline_speed
1139call_pending (EV_P) 1270call_pending (EV_P)
1140{ 1271{
1158void inline_size 1289void inline_size
1159timers_reify (EV_P) 1290timers_reify (EV_P)
1160{ 1291{
1161 while (timercnt && ((WT)timers [0])->at <= mn_now) 1292 while (timercnt && ((WT)timers [0])->at <= mn_now)
1162 { 1293 {
1163 ev_timer *w = timers [0]; 1294 ev_timer *w = (ev_timer *)timers [0];
1164 1295
1165 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1296 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1166 1297
1167 /* first reschedule or stop timer */ 1298 /* first reschedule or stop timer */
1168 if (w->repeat) 1299 if (w->repeat)
1171 1302
1172 ((WT)w)->at += w->repeat; 1303 ((WT)w)->at += w->repeat;
1173 if (((WT)w)->at < mn_now) 1304 if (((WT)w)->at < mn_now)
1174 ((WT)w)->at = mn_now; 1305 ((WT)w)->at = mn_now;
1175 1306
1176 downheap ((WT *)timers, timercnt, 0); 1307 downheap (timers, timercnt, 0);
1177 } 1308 }
1178 else 1309 else
1179 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1310 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1180 1311
1181 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1312 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1186void inline_size 1317void inline_size
1187periodics_reify (EV_P) 1318periodics_reify (EV_P)
1188{ 1319{
1189 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1320 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1190 { 1321 {
1191 ev_periodic *w = periodics [0]; 1322 ev_periodic *w = (ev_periodic *)periodics [0];
1192 1323
1193 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1324 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1194 1325
1195 /* first reschedule or stop timer */ 1326 /* first reschedule or stop timer */
1196 if (w->reschedule_cb) 1327 if (w->reschedule_cb)
1197 { 1328 {
1198 ((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);
1199 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));
1200 downheap ((WT *)periodics, periodiccnt, 0); 1331 downheap (periodics, periodiccnt, 0);
1201 } 1332 }
1202 else if (w->interval) 1333 else if (w->interval)
1203 { 1334 {
1204 ((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;
1205 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));
1206 downheap ((WT *)periodics, periodiccnt, 0); 1338 downheap (periodics, periodiccnt, 0);
1207 } 1339 }
1208 else 1340 else
1209 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1341 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1210 1342
1211 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1343 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1218 int i; 1350 int i;
1219 1351
1220 /* adjust periodics after time jump */ 1352 /* adjust periodics after time jump */
1221 for (i = 0; i < periodiccnt; ++i) 1353 for (i = 0; i < periodiccnt; ++i)
1222 { 1354 {
1223 ev_periodic *w = periodics [i]; 1355 ev_periodic *w = (ev_periodic *)periodics [i];
1224 1356
1225 if (w->reschedule_cb) 1357 if (w->reschedule_cb)
1226 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1358 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1227 else if (w->interval) 1359 else if (w->interval)
1228 ((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;
1229 } 1361 }
1230 1362
1231 /* now rebuild the heap */ 1363 /* now rebuild the heap */
1232 for (i = periodiccnt >> 1; i--; ) 1364 for (i = periodiccnt >> 1; i--; )
1233 downheap ((WT *)periodics, periodiccnt, i); 1365 downheap (periodics, periodiccnt, i);
1234} 1366}
1235#endif 1367#endif
1236 1368
1369#if EV_IDLE_ENABLE
1237int inline_size 1370void inline_size
1238time_update_monotonic (EV_P) 1371idle_reify (EV_P)
1239{ 1372{
1373 if (expect_false (idleall))
1374 {
1375 int pri;
1376
1377 for (pri = NUMPRI; pri--; )
1378 {
1379 if (pendingcnt [pri])
1380 break;
1381
1382 if (idlecnt [pri])
1383 {
1384 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1385 break;
1386 }
1387 }
1388 }
1389}
1390#endif
1391
1392void inline_speed
1393time_update (EV_P_ ev_tstamp max_block)
1394{
1395 int i;
1396
1397#if EV_USE_MONOTONIC
1398 if (expect_true (have_monotonic))
1399 {
1400 ev_tstamp odiff = rtmn_diff;
1401
1240 mn_now = get_clock (); 1402 mn_now = get_clock ();
1241 1403
1404 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1405 /* interpolate in the meantime */
1242 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1406 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1243 { 1407 {
1244 ev_rt_now = rtmn_diff + mn_now; 1408 ev_rt_now = rtmn_diff + mn_now;
1245 return 0; 1409 return;
1246 } 1410 }
1247 else 1411
1248 {
1249 now_floor = mn_now; 1412 now_floor = mn_now;
1250 ev_rt_now = ev_time (); 1413 ev_rt_now = ev_time ();
1251 return 1;
1252 }
1253}
1254 1414
1255void inline_size 1415 /* loop a few times, before making important decisions.
1256time_update (EV_P) 1416 * on the choice of "4": one iteration isn't enough,
1257{ 1417 * in case we get preempted during the calls to
1258 int i; 1418 * ev_time and get_clock. a second call is almost guaranteed
1259 1419 * to succeed in that case, though. and looping a few more times
1260#if EV_USE_MONOTONIC 1420 * doesn't hurt either as we only do this on time-jumps or
1261 if (expect_true (have_monotonic)) 1421 * in the unlikely event of having been preempted here.
1262 { 1422 */
1263 if (time_update_monotonic (EV_A)) 1423 for (i = 4; --i; )
1264 { 1424 {
1265 ev_tstamp odiff = rtmn_diff;
1266
1267 /* loop a few times, before making important decisions.
1268 * on the choice of "4": one iteration isn't enough,
1269 * in case we get preempted during the calls to
1270 * ev_time and get_clock. a second call is almost guarenteed
1271 * to succeed in that case, though. and looping a few more times
1272 * doesn't hurt either as we only do this on time-jumps or
1273 * in the unlikely event of getting preempted here.
1274 */
1275 for (i = 4; --i; )
1276 {
1277 rtmn_diff = ev_rt_now - mn_now; 1425 rtmn_diff = ev_rt_now - mn_now;
1278 1426
1279 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1427 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1280 return; /* all is well */ 1428 return; /* all is well */
1281 1429
1282 ev_rt_now = ev_time (); 1430 ev_rt_now = ev_time ();
1283 mn_now = get_clock (); 1431 mn_now = get_clock ();
1284 now_floor = mn_now; 1432 now_floor = mn_now;
1285 } 1433 }
1286 1434
1287# if EV_PERIODIC_ENABLE 1435# if EV_PERIODIC_ENABLE
1288 periodics_reschedule (EV_A); 1436 periodics_reschedule (EV_A);
1289# endif 1437# endif
1290 /* no timer adjustment, as the monotonic clock doesn't jump */ 1438 /* no timer adjustment, as the monotonic clock doesn't jump */
1291 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1439 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1292 }
1293 } 1440 }
1294 else 1441 else
1295#endif 1442#endif
1296 { 1443 {
1297 ev_rt_now = ev_time (); 1444 ev_rt_now = ev_time ();
1298 1445
1299 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))
1300 { 1447 {
1301#if EV_PERIODIC_ENABLE 1448#if EV_PERIODIC_ENABLE
1302 periodics_reschedule (EV_A); 1449 periodics_reschedule (EV_A);
1303#endif 1450#endif
1304
1305 /* adjust timers. this is easy, as the offset is the same for all */ 1451 /* adjust timers. this is easy, as the offset is the same for all of them */
1306 for (i = 0; i < timercnt; ++i) 1452 for (i = 0; i < timercnt; ++i)
1307 ((WT)timers [i])->at += ev_rt_now - mn_now; 1453 ((WT)timers [i])->at += ev_rt_now - mn_now;
1308 } 1454 }
1309 1455
1310 mn_now = ev_rt_now; 1456 mn_now = ev_rt_now;
1330{ 1476{
1331 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1477 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1332 ? EVUNLOOP_ONE 1478 ? EVUNLOOP_ONE
1333 : EVUNLOOP_CANCEL; 1479 : EVUNLOOP_CANCEL;
1334 1480
1335 while (activecnt) 1481 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1482
1483 do
1336 { 1484 {
1337 /* we might have forked, so reify kernel state if necessary */ 1485#ifndef _WIN32
1486 if (expect_false (curpid)) /* penalise the forking check even more */
1487 if (expect_false (getpid () != curpid))
1488 {
1489 curpid = getpid ();
1490 postfork = 1;
1491 }
1492#endif
1493
1338 #if EV_FORK_ENABLE 1494#if EV_FORK_ENABLE
1495 /* we might have forked, so queue fork handlers */
1339 if (expect_false (postfork)) 1496 if (expect_false (postfork))
1340 if (forkcnt) 1497 if (forkcnt)
1341 { 1498 {
1342 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1499 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1343 call_pending (EV_A); 1500 call_pending (EV_A);
1344 } 1501 }
1345 #endif 1502#endif
1346 1503
1347 /* queue check watchers (and execute them) */ 1504 /* queue prepare watchers (and execute them) */
1348 if (expect_false (preparecnt)) 1505 if (expect_false (preparecnt))
1349 { 1506 {
1350 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1507 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1351 call_pending (EV_A); 1508 call_pending (EV_A);
1352 } 1509 }
1353 1510
1511 if (expect_false (!activecnt))
1512 break;
1513
1354 /* we might have forked, so reify kernel state if necessary */ 1514 /* we might have forked, so reify kernel state if necessary */
1355 if (expect_false (postfork)) 1515 if (expect_false (postfork))
1356 loop_fork (EV_A); 1516 loop_fork (EV_A);
1357 1517
1358 /* update fd-related kernel structures */ 1518 /* update fd-related kernel structures */
1359 fd_reify (EV_A); 1519 fd_reify (EV_A);
1360 1520
1361 /* calculate blocking time */ 1521 /* calculate blocking time */
1362 { 1522 {
1363 double block; 1523 ev_tstamp waittime = 0.;
1524 ev_tstamp sleeptime = 0.;
1364 1525
1365 if (flags & EVLOOP_NONBLOCK || idlecnt) 1526 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1366 block = 0.; /* do not block at all */
1367 else
1368 { 1527 {
1369 /* update time to cancel out callback processing overhead */ 1528 /* update time to cancel out callback processing overhead */
1370#if EV_USE_MONOTONIC
1371 if (expect_true (have_monotonic))
1372 time_update_monotonic (EV_A); 1529 time_update (EV_A_ 1e100);
1373 else
1374#endif
1375 {
1376 ev_rt_now = ev_time ();
1377 mn_now = ev_rt_now;
1378 }
1379 1530
1380 block = MAX_BLOCKTIME; 1531 waittime = MAX_BLOCKTIME;
1381 1532
1382 if (timercnt) 1533 if (timercnt)
1383 { 1534 {
1384 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1535 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1385 if (block > to) block = to; 1536 if (waittime > to) waittime = to;
1386 } 1537 }
1387 1538
1388#if EV_PERIODIC_ENABLE 1539#if EV_PERIODIC_ENABLE
1389 if (periodiccnt) 1540 if (periodiccnt)
1390 { 1541 {
1391 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;
1392 if (block > to) block = to; 1543 if (waittime > to) waittime = to;
1393 } 1544 }
1394#endif 1545#endif
1395 1546
1396 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 }
1397 } 1560 }
1398 1561
1562 ++loop_count;
1399 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);
1400 } 1567 }
1401
1402 /* update ev_rt_now, do magic */
1403 time_update (EV_A);
1404 1568
1405 /* queue pending timers and reschedule them */ 1569 /* queue pending timers and reschedule them */
1406 timers_reify (EV_A); /* relative timers called last */ 1570 timers_reify (EV_A); /* relative timers called last */
1407#if EV_PERIODIC_ENABLE 1571#if EV_PERIODIC_ENABLE
1408 periodics_reify (EV_A); /* absolute timers called first */ 1572 periodics_reify (EV_A); /* absolute timers called first */
1409#endif 1573#endif
1410 1574
1575#if EV_IDLE_ENABLE
1411 /* queue idle watchers unless other events are pending */ 1576 /* queue idle watchers unless other events are pending */
1412 if (idlecnt && !any_pending (EV_A)) 1577 idle_reify (EV_A);
1413 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1578#endif
1414 1579
1415 /* queue check watchers, to be executed first */ 1580 /* queue check watchers, to be executed first */
1416 if (expect_false (checkcnt)) 1581 if (expect_false (checkcnt))
1417 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1582 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1418 1583
1419 call_pending (EV_A); 1584 call_pending (EV_A);
1420 1585
1421 if (expect_false (loop_done))
1422 break;
1423 } 1586 }
1587 while (expect_true (activecnt && !loop_done));
1424 1588
1425 if (loop_done == EVUNLOOP_ONE) 1589 if (loop_done == EVUNLOOP_ONE)
1426 loop_done = EVUNLOOP_CANCEL; 1590 loop_done = EVUNLOOP_CANCEL;
1427} 1591}
1428 1592
1455 head = &(*head)->next; 1619 head = &(*head)->next;
1456 } 1620 }
1457} 1621}
1458 1622
1459void inline_speed 1623void inline_speed
1460ev_clear_pending (EV_P_ W w) 1624clear_pending (EV_P_ W w)
1461{ 1625{
1462 if (w->pending) 1626 if (w->pending)
1463 { 1627 {
1464 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1628 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1465 w->pending = 0; 1629 w->pending = 0;
1466 } 1630 }
1467} 1631}
1468 1632
1633int
1634ev_clear_pending (EV_P_ void *w)
1635{
1636 W w_ = (W)w;
1637 int pending = w_->pending;
1638
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
1647 return 0;
1648}
1649
1650void inline_size
1651pri_adjust (EV_P_ W w)
1652{
1653 int pri = w->priority;
1654 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1655 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1656 w->priority = pri;
1657}
1658
1469void inline_speed 1659void inline_speed
1470ev_start (EV_P_ W w, int active) 1660ev_start (EV_P_ W w, int active)
1471{ 1661{
1472 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1662 pri_adjust (EV_A_ w);
1473 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1474
1475 w->active = active; 1663 w->active = active;
1476 ev_ref (EV_A); 1664 ev_ref (EV_A);
1477} 1665}
1478 1666
1479void inline_size 1667void inline_size
1483 w->active = 0; 1671 w->active = 0;
1484} 1672}
1485 1673
1486/*****************************************************************************/ 1674/*****************************************************************************/
1487 1675
1488void 1676void noinline
1489ev_io_start (EV_P_ ev_io *w) 1677ev_io_start (EV_P_ ev_io *w)
1490{ 1678{
1491 int fd = w->fd; 1679 int fd = w->fd;
1492 1680
1493 if (expect_false (ev_is_active (w))) 1681 if (expect_false (ev_is_active (w)))
1495 1683
1496 assert (("ev_io_start called with negative fd", fd >= 0)); 1684 assert (("ev_io_start called with negative fd", fd >= 0));
1497 1685
1498 ev_start (EV_A_ (W)w, 1); 1686 ev_start (EV_A_ (W)w, 1);
1499 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1687 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1500 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1688 wlist_add (&anfds[fd].head, (WL)w);
1501 1689
1502 fd_change (EV_A_ fd); 1690 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1691 w->events &= ~EV_IOFDSET;
1503} 1692}
1504 1693
1505void 1694void noinline
1506ev_io_stop (EV_P_ ev_io *w) 1695ev_io_stop (EV_P_ ev_io *w)
1507{ 1696{
1508 ev_clear_pending (EV_A_ (W)w); 1697 clear_pending (EV_A_ (W)w);
1509 if (expect_false (!ev_is_active (w))) 1698 if (expect_false (!ev_is_active (w)))
1510 return; 1699 return;
1511 1700
1512 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));
1513 1702
1514 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1703 wlist_del (&anfds[w->fd].head, (WL)w);
1515 ev_stop (EV_A_ (W)w); 1704 ev_stop (EV_A_ (W)w);
1516 1705
1517 fd_change (EV_A_ w->fd); 1706 fd_change (EV_A_ w->fd, 1);
1518} 1707}
1519 1708
1520void 1709void noinline
1521ev_timer_start (EV_P_ ev_timer *w) 1710ev_timer_start (EV_P_ ev_timer *w)
1522{ 1711{
1523 if (expect_false (ev_is_active (w))) 1712 if (expect_false (ev_is_active (w)))
1524 return; 1713 return;
1525 1714
1526 ((WT)w)->at += mn_now; 1715 ((WT)w)->at += mn_now;
1527 1716
1528 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.));
1529 1718
1530 ev_start (EV_A_ (W)w, ++timercnt); 1719 ev_start (EV_A_ (W)w, ++timercnt);
1531 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1720 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1532 timers [timercnt - 1] = w; 1721 timers [timercnt - 1] = (WT)w;
1533 upheap ((WT *)timers, timercnt - 1); 1722 upheap (timers, timercnt - 1);
1534 1723
1535 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1724 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1536} 1725}
1537 1726
1538void 1727void noinline
1539ev_timer_stop (EV_P_ ev_timer *w) 1728ev_timer_stop (EV_P_ ev_timer *w)
1540{ 1729{
1541 ev_clear_pending (EV_A_ (W)w); 1730 clear_pending (EV_A_ (W)w);
1542 if (expect_false (!ev_is_active (w))) 1731 if (expect_false (!ev_is_active (w)))
1543 return; 1732 return;
1544 1733
1545 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1734 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1546 1735
1547 { 1736 {
1548 int active = ((W)w)->active; 1737 int active = ((W)w)->active;
1549 1738
1550 if (expect_true (--active < --timercnt)) 1739 if (expect_true (--active < --timercnt))
1551 { 1740 {
1552 timers [active] = timers [timercnt]; 1741 timers [active] = timers [timercnt];
1553 adjustheap ((WT *)timers, timercnt, active); 1742 adjustheap (timers, timercnt, active);
1554 } 1743 }
1555 } 1744 }
1556 1745
1557 ((WT)w)->at -= mn_now; 1746 ((WT)w)->at -= mn_now;
1558 1747
1559 ev_stop (EV_A_ (W)w); 1748 ev_stop (EV_A_ (W)w);
1560} 1749}
1561 1750
1562void 1751void noinline
1563ev_timer_again (EV_P_ ev_timer *w) 1752ev_timer_again (EV_P_ ev_timer *w)
1564{ 1753{
1565 if (ev_is_active (w)) 1754 if (ev_is_active (w))
1566 { 1755 {
1567 if (w->repeat) 1756 if (w->repeat)
1568 { 1757 {
1569 ((WT)w)->at = mn_now + w->repeat; 1758 ((WT)w)->at = mn_now + w->repeat;
1570 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1759 adjustheap (timers, timercnt, ((W)w)->active - 1);
1571 } 1760 }
1572 else 1761 else
1573 ev_timer_stop (EV_A_ w); 1762 ev_timer_stop (EV_A_ w);
1574 } 1763 }
1575 else if (w->repeat) 1764 else if (w->repeat)
1578 ev_timer_start (EV_A_ w); 1767 ev_timer_start (EV_A_ w);
1579 } 1768 }
1580} 1769}
1581 1770
1582#if EV_PERIODIC_ENABLE 1771#if EV_PERIODIC_ENABLE
1583void 1772void noinline
1584ev_periodic_start (EV_P_ ev_periodic *w) 1773ev_periodic_start (EV_P_ ev_periodic *w)
1585{ 1774{
1586 if (expect_false (ev_is_active (w))) 1775 if (expect_false (ev_is_active (w)))
1587 return; 1776 return;
1588 1777
1590 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1779 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1591 else if (w->interval) 1780 else if (w->interval)
1592 { 1781 {
1593 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.));
1594 /* 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 */
1595 ((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;
1596 } 1785 }
1786 else
1787 ((WT)w)->at = w->offset;
1597 1788
1598 ev_start (EV_A_ (W)w, ++periodiccnt); 1789 ev_start (EV_A_ (W)w, ++periodiccnt);
1599 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1790 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1600 periodics [periodiccnt - 1] = w; 1791 periodics [periodiccnt - 1] = (WT)w;
1601 upheap ((WT *)periodics, periodiccnt - 1); 1792 upheap (periodics, periodiccnt - 1);
1602 1793
1603 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1794 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1604} 1795}
1605 1796
1606void 1797void noinline
1607ev_periodic_stop (EV_P_ ev_periodic *w) 1798ev_periodic_stop (EV_P_ ev_periodic *w)
1608{ 1799{
1609 ev_clear_pending (EV_A_ (W)w); 1800 clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w))) 1801 if (expect_false (!ev_is_active (w)))
1611 return; 1802 return;
1612 1803
1613 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1804 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1614 1805
1615 { 1806 {
1616 int active = ((W)w)->active; 1807 int active = ((W)w)->active;
1617 1808
1618 if (expect_true (--active < --periodiccnt)) 1809 if (expect_true (--active < --periodiccnt))
1619 { 1810 {
1620 periodics [active] = periodics [periodiccnt]; 1811 periodics [active] = periodics [periodiccnt];
1621 adjustheap ((WT *)periodics, periodiccnt, active); 1812 adjustheap (periodics, periodiccnt, active);
1622 } 1813 }
1623 } 1814 }
1624 1815
1625 ev_stop (EV_A_ (W)w); 1816 ev_stop (EV_A_ (W)w);
1626} 1817}
1627 1818
1628void 1819void noinline
1629ev_periodic_again (EV_P_ ev_periodic *w) 1820ev_periodic_again (EV_P_ ev_periodic *w)
1630{ 1821{
1631 /* TODO: use adjustheap and recalculation */ 1822 /* TODO: use adjustheap and recalculation */
1632 ev_periodic_stop (EV_A_ w); 1823 ev_periodic_stop (EV_A_ w);
1633 ev_periodic_start (EV_A_ w); 1824 ev_periodic_start (EV_A_ w);
1636 1827
1637#ifndef SA_RESTART 1828#ifndef SA_RESTART
1638# define SA_RESTART 0 1829# define SA_RESTART 0
1639#endif 1830#endif
1640 1831
1641void 1832void noinline
1642ev_signal_start (EV_P_ ev_signal *w) 1833ev_signal_start (EV_P_ ev_signal *w)
1643{ 1834{
1644#if EV_MULTIPLICITY 1835#if EV_MULTIPLICITY
1645 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));
1646#endif 1837#endif
1647 if (expect_false (ev_is_active (w))) 1838 if (expect_false (ev_is_active (w)))
1648 return; 1839 return;
1649 1840
1650 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));
1651 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
1652 ev_start (EV_A_ (W)w, 1); 1857 ev_start (EV_A_ (W)w, 1);
1653 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1654 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1858 wlist_add (&signals [w->signum - 1].head, (WL)w);
1655 1859
1656 if (!((WL)w)->next) 1860 if (!((WL)w)->next)
1657 { 1861 {
1658#if _WIN32 1862#if _WIN32
1659 signal (w->signum, sighandler); 1863 signal (w->signum, sighandler);
1665 sigaction (w->signum, &sa, 0); 1869 sigaction (w->signum, &sa, 0);
1666#endif 1870#endif
1667 } 1871 }
1668} 1872}
1669 1873
1670void 1874void noinline
1671ev_signal_stop (EV_P_ ev_signal *w) 1875ev_signal_stop (EV_P_ ev_signal *w)
1672{ 1876{
1673 ev_clear_pending (EV_A_ (W)w); 1877 clear_pending (EV_A_ (W)w);
1674 if (expect_false (!ev_is_active (w))) 1878 if (expect_false (!ev_is_active (w)))
1675 return; 1879 return;
1676 1880
1677 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1881 wlist_del (&signals [w->signum - 1].head, (WL)w);
1678 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1679 1883
1680 if (!signals [w->signum - 1].head) 1884 if (!signals [w->signum - 1].head)
1681 signal (w->signum, SIG_DFL); 1885 signal (w->signum, SIG_DFL);
1682} 1886}
1689#endif 1893#endif
1690 if (expect_false (ev_is_active (w))) 1894 if (expect_false (ev_is_active (w)))
1691 return; 1895 return;
1692 1896
1693 ev_start (EV_A_ (W)w, 1); 1897 ev_start (EV_A_ (W)w, 1);
1694 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1898 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1695} 1899}
1696 1900
1697void 1901void
1698ev_child_stop (EV_P_ ev_child *w) 1902ev_child_stop (EV_P_ ev_child *w)
1699{ 1903{
1700 ev_clear_pending (EV_A_ (W)w); 1904 clear_pending (EV_A_ (W)w);
1701 if (expect_false (!ev_is_active (w))) 1905 if (expect_false (!ev_is_active (w)))
1702 return; 1906 return;
1703 1907
1704 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1908 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1705 ev_stop (EV_A_ (W)w); 1909 ev_stop (EV_A_ (W)w);
1706} 1910}
1707 1911
1708#if EV_STAT_ENABLE 1912#if EV_STAT_ENABLE
1709 1913
1713# endif 1917# endif
1714 1918
1715#define DEF_STAT_INTERVAL 5.0074891 1919#define DEF_STAT_INTERVAL 5.0074891
1716#define MIN_STAT_INTERVAL 0.1074891 1920#define MIN_STAT_INTERVAL 0.1074891
1717 1921
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 1922static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719 1923
1720#if EV_USE_INOTIFY 1924#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE ((PATH_MAX + sizeof (struct inotify_event)) + 2048) 1925# define EV_INOTIFY_BUFSIZE 8192
1722 1926
1723static void noinline 1927static void noinline
1724infy_add (EV_P_ ev_stat *w) 1928infy_add (EV_P_ ev_stat *w)
1725{ 1929{
1726 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 1930 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1728 if (w->wd < 0) 1932 if (w->wd < 0)
1729 { 1933 {
1730 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 1934 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1731 1935
1732 /* monitor some parent directory for speedup hints */ 1936 /* monitor some parent directory for speedup hints */
1733 if (errno == ENOENT || errno == EACCES) 1937 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1734 { 1938 {
1735 char path [PATH_MAX]; 1939 char path [4096];
1736 strcpy (path, w->path); 1940 strcpy (path, w->path);
1737 1941
1738 do 1942 do
1739 { 1943 {
1740 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 1944 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1744 1948
1745 if (!pend) 1949 if (!pend)
1746 break; /* whoops, no '/', complain to your admin */ 1950 break; /* whoops, no '/', complain to your admin */
1747 1951
1748 *pend = 0; 1952 *pend = 0;
1749 w->wd = inotify_add_watch (fs_fd, path, IN_DELETE_SELF | IN_CREATE | IN_MOVED_TO | IN_MASK_ADD); 1953 w->wd = inotify_add_watch (fs_fd, path, mask);
1750 } 1954 }
1751 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 1955 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1752 } 1956 }
1753 } 1957 }
1754 else 1958 else
1759} 1963}
1760 1964
1761static void noinline 1965static void noinline
1762infy_del (EV_P_ ev_stat *w) 1966infy_del (EV_P_ ev_stat *w)
1763{ 1967{
1764 WL w_;
1765 int slot; 1968 int slot;
1766 int wd = w->wd; 1969 int wd = w->wd;
1767 1970
1768 if (wd < 0) 1971 if (wd < 0)
1769 return; 1972 return;
1798 { 2001 {
1799 w->wd = -1; 2002 w->wd = -1;
1800 infy_add (EV_A_ w); /* re-add, no matter what */ 2003 infy_add (EV_A_ w); /* re-add, no matter what */
1801 } 2004 }
1802 2005
1803 stat_timer_cb (EV_P_ &w->timer, 0); 2006 stat_timer_cb (EV_A_ &w->timer, 0);
1804 } 2007 }
1805 } 2008 }
1806 } 2009 }
1807} 2010}
1808 2011
1832 ev_set_priority (&fs_w, EV_MAXPRI); 2035 ev_set_priority (&fs_w, EV_MAXPRI);
1833 ev_io_start (EV_A_ &fs_w); 2036 ev_io_start (EV_A_ &fs_w);
1834 } 2037 }
1835} 2038}
1836 2039
2040void inline_size
2041infy_fork (EV_P)
2042{
2043 int slot;
2044
2045 if (fs_fd < 0)
2046 return;
2047
2048 close (fs_fd);
2049 fs_fd = inotify_init ();
2050
2051 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2052 {
2053 WL w_ = fs_hash [slot].head;
2054 fs_hash [slot].head = 0;
2055
2056 while (w_)
2057 {
2058 ev_stat *w = (ev_stat *)w_;
2059 w_ = w_->next; /* lets us add this watcher */
2060
2061 w->wd = -1;
2062
2063 if (fs_fd >= 0)
2064 infy_add (EV_A_ w); /* re-add, no matter what */
2065 else
2066 ev_timer_start (EV_A_ &w->timer);
2067 }
2068
2069 }
2070}
2071
1837#endif 2072#endif
1838 2073
1839void 2074void
1840ev_stat_stat (EV_P_ ev_stat *w) 2075ev_stat_stat (EV_P_ ev_stat *w)
1841{ 2076{
1843 w->attr.st_nlink = 0; 2078 w->attr.st_nlink = 0;
1844 else if (!w->attr.st_nlink) 2079 else if (!w->attr.st_nlink)
1845 w->attr.st_nlink = 1; 2080 w->attr.st_nlink = 1;
1846} 2081}
1847 2082
1848void noinline 2083static void noinline
1849stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2084stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1850{ 2085{
1851 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2086 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1852 2087
1853 /* we copy this here each the time so that */ 2088 /* we copy this here each the time so that */
1854 /* prev has the old value when the callback gets invoked */ 2089 /* prev has the old value when the callback gets invoked */
1855 w->prev = w->attr; 2090 w->prev = w->attr;
1856 ev_stat_stat (EV_A_ w); 2091 ev_stat_stat (EV_A_ w);
1857 2092
1858 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2093 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2094 if (
2095 w->prev.st_dev != w->attr.st_dev
2096 || w->prev.st_ino != w->attr.st_ino
2097 || w->prev.st_mode != w->attr.st_mode
2098 || w->prev.st_nlink != w->attr.st_nlink
2099 || w->prev.st_uid != w->attr.st_uid
2100 || w->prev.st_gid != w->attr.st_gid
2101 || w->prev.st_rdev != w->attr.st_rdev
2102 || w->prev.st_size != w->attr.st_size
2103 || w->prev.st_atime != w->attr.st_atime
2104 || w->prev.st_mtime != w->attr.st_mtime
2105 || w->prev.st_ctime != w->attr.st_ctime
1859 { 2106 ) {
1860 #if EV_USE_INOTIFY 2107 #if EV_USE_INOTIFY
1861 infy_del (EV_A_ w); 2108 infy_del (EV_A_ w);
1862 infy_add (EV_A_ w); 2109 infy_add (EV_A_ w);
1863 ev_stat_stat (EV_A_ w); /* avoid race... */ 2110 ev_stat_stat (EV_A_ w); /* avoid race... */
1864 #endif 2111 #endif
1898} 2145}
1899 2146
1900void 2147void
1901ev_stat_stop (EV_P_ ev_stat *w) 2148ev_stat_stop (EV_P_ ev_stat *w)
1902{ 2149{
1903 ev_clear_pending (EV_A_ (W)w); 2150 clear_pending (EV_A_ (W)w);
1904 if (expect_false (!ev_is_active (w))) 2151 if (expect_false (!ev_is_active (w)))
1905 return; 2152 return;
1906 2153
1907#if EV_USE_INOTIFY 2154#if EV_USE_INOTIFY
1908 infy_del (EV_A_ w); 2155 infy_del (EV_A_ w);
1911 2158
1912 ev_stop (EV_A_ (W)w); 2159 ev_stop (EV_A_ (W)w);
1913} 2160}
1914#endif 2161#endif
1915 2162
2163#if EV_IDLE_ENABLE
1916void 2164void
1917ev_idle_start (EV_P_ ev_idle *w) 2165ev_idle_start (EV_P_ ev_idle *w)
1918{ 2166{
1919 if (expect_false (ev_is_active (w))) 2167 if (expect_false (ev_is_active (w)))
1920 return; 2168 return;
1921 2169
2170 pri_adjust (EV_A_ (W)w);
2171
2172 {
2173 int active = ++idlecnt [ABSPRI (w)];
2174
2175 ++idleall;
1922 ev_start (EV_A_ (W)w, ++idlecnt); 2176 ev_start (EV_A_ (W)w, active);
2177
1923 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2178 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1924 idles [idlecnt - 1] = w; 2179 idles [ABSPRI (w)][active - 1] = w;
2180 }
1925} 2181}
1926 2182
1927void 2183void
1928ev_idle_stop (EV_P_ ev_idle *w) 2184ev_idle_stop (EV_P_ ev_idle *w)
1929{ 2185{
1930 ev_clear_pending (EV_A_ (W)w); 2186 clear_pending (EV_A_ (W)w);
1931 if (expect_false (!ev_is_active (w))) 2187 if (expect_false (!ev_is_active (w)))
1932 return; 2188 return;
1933 2189
1934 { 2190 {
1935 int active = ((W)w)->active; 2191 int active = ((W)w)->active;
1936 idles [active - 1] = idles [--idlecnt]; 2192
2193 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1937 ((W)idles [active - 1])->active = active; 2194 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2195
2196 ev_stop (EV_A_ (W)w);
2197 --idleall;
1938 } 2198 }
1939
1940 ev_stop (EV_A_ (W)w);
1941} 2199}
2200#endif
1942 2201
1943void 2202void
1944ev_prepare_start (EV_P_ ev_prepare *w) 2203ev_prepare_start (EV_P_ ev_prepare *w)
1945{ 2204{
1946 if (expect_false (ev_is_active (w))) 2205 if (expect_false (ev_is_active (w)))
1952} 2211}
1953 2212
1954void 2213void
1955ev_prepare_stop (EV_P_ ev_prepare *w) 2214ev_prepare_stop (EV_P_ ev_prepare *w)
1956{ 2215{
1957 ev_clear_pending (EV_A_ (W)w); 2216 clear_pending (EV_A_ (W)w);
1958 if (expect_false (!ev_is_active (w))) 2217 if (expect_false (!ev_is_active (w)))
1959 return; 2218 return;
1960 2219
1961 { 2220 {
1962 int active = ((W)w)->active; 2221 int active = ((W)w)->active;
1979} 2238}
1980 2239
1981void 2240void
1982ev_check_stop (EV_P_ ev_check *w) 2241ev_check_stop (EV_P_ ev_check *w)
1983{ 2242{
1984 ev_clear_pending (EV_A_ (W)w); 2243 clear_pending (EV_A_ (W)w);
1985 if (expect_false (!ev_is_active (w))) 2244 if (expect_false (!ev_is_active (w)))
1986 return; 2245 return;
1987 2246
1988 { 2247 {
1989 int active = ((W)w)->active; 2248 int active = ((W)w)->active;
1996 2255
1997#if EV_EMBED_ENABLE 2256#if EV_EMBED_ENABLE
1998void noinline 2257void noinline
1999ev_embed_sweep (EV_P_ ev_embed *w) 2258ev_embed_sweep (EV_P_ ev_embed *w)
2000{ 2259{
2001 ev_loop (w->loop, EVLOOP_NONBLOCK); 2260 ev_loop (w->other, EVLOOP_NONBLOCK);
2002} 2261}
2003 2262
2004static void 2263static void
2005embed_cb (EV_P_ ev_io *io, int revents) 2264embed_io_cb (EV_P_ ev_io *io, int revents)
2006{ 2265{
2007 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2266 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2008 2267
2009 if (ev_cb (w)) 2268 if (ev_cb (w))
2010 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2269 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2011 else 2270 else
2012 ev_embed_sweep (loop, w); 2271 ev_embed_sweep (loop, w);
2013} 2272}
2014 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
2015void 2282void
2016ev_embed_start (EV_P_ ev_embed *w) 2283ev_embed_start (EV_P_ ev_embed *w)
2017{ 2284{
2018 if (expect_false (ev_is_active (w))) 2285 if (expect_false (ev_is_active (w)))
2019 return; 2286 return;
2020 2287
2021 { 2288 {
2022 struct ev_loop *loop = w->loop; 2289 struct ev_loop *loop = w->other;
2023 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 ()));
2024 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2291 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2025 } 2292 }
2026 2293
2027 ev_set_priority (&w->io, ev_priority (w)); 2294 ev_set_priority (&w->io, ev_priority (w));
2028 ev_io_start (EV_A_ &w->io); 2295 ev_io_start (EV_A_ &w->io);
2029 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
2030 ev_start (EV_A_ (W)w, 1); 2301 ev_start (EV_A_ (W)w, 1);
2031} 2302}
2032 2303
2033void 2304void
2034ev_embed_stop (EV_P_ ev_embed *w) 2305ev_embed_stop (EV_P_ ev_embed *w)
2035{ 2306{
2036 ev_clear_pending (EV_A_ (W)w); 2307 clear_pending (EV_A_ (W)w);
2037 if (expect_false (!ev_is_active (w))) 2308 if (expect_false (!ev_is_active (w)))
2038 return; 2309 return;
2039 2310
2040 ev_io_stop (EV_A_ &w->io); 2311 ev_io_stop (EV_A_ &w->io);
2312 ev_prepare_stop (EV_A_ &w->prepare);
2041 2313
2042 ev_stop (EV_A_ (W)w); 2314 ev_stop (EV_A_ (W)w);
2043} 2315}
2044#endif 2316#endif
2045 2317
2056} 2328}
2057 2329
2058void 2330void
2059ev_fork_stop (EV_P_ ev_fork *w) 2331ev_fork_stop (EV_P_ ev_fork *w)
2060{ 2332{
2061 ev_clear_pending (EV_A_ (W)w); 2333 clear_pending (EV_A_ (W)w);
2062 if (expect_false (!ev_is_active (w))) 2334 if (expect_false (!ev_is_active (w)))
2063 return; 2335 return;
2064 2336
2065 { 2337 {
2066 int active = ((W)w)->active; 2338 int active = ((W)w)->active;
2134 ev_timer_set (&once->to, timeout, 0.); 2406 ev_timer_set (&once->to, timeout, 0.);
2135 ev_timer_start (EV_A_ &once->to); 2407 ev_timer_start (EV_A_ &once->to);
2136 } 2408 }
2137} 2409}
2138 2410
2411#if EV_MULTIPLICITY
2412 #include "ev_wrap.h"
2413#endif
2414
2139#ifdef __cplusplus 2415#ifdef __cplusplus
2140} 2416}
2141#endif 2417#endif
2142 2418

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines