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

Comparing libev/ev.c (file contents):
Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC vs.
Revision 1.188 by root, Thu Dec 20 07:12:57 2007 UTC

94# else 94# else
95# define EV_USE_PORT 0 95# define EV_USE_PORT 0
96# endif 96# endif
97# endif 97# endif
98 98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
105# endif
106
99#endif 107#endif
100 108
101#include <math.h> 109#include <math.h>
102#include <stdlib.h> 110#include <stdlib.h>
103#include <fcntl.h> 111#include <fcntl.h>
109#include <errno.h> 117#include <errno.h>
110#include <sys/types.h> 118#include <sys/types.h>
111#include <time.h> 119#include <time.h>
112 120
113#include <signal.h> 121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
114 128
115#ifndef _WIN32 129#ifndef _WIN32
116# include <sys/time.h> 130# include <sys/time.h>
117# include <sys/wait.h> 131# include <sys/wait.h>
118# include <unistd.h> 132# include <unistd.h>
156 170
157#ifndef EV_USE_PORT 171#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 172# define EV_USE_PORT 0
159#endif 173#endif
160 174
175#ifndef EV_USE_INOTIFY
176# define EV_USE_INOTIFY 0
177#endif
178
161#ifndef EV_PID_HASHSIZE 179#ifndef EV_PID_HASHSIZE
162# if EV_MINIMAL 180# if EV_MINIMAL
163# define EV_PID_HASHSIZE 1 181# define EV_PID_HASHSIZE 1
164# else 182# else
165# define EV_PID_HASHSIZE 16 183# define EV_PID_HASHSIZE 16
166# endif 184# endif
167#endif 185#endif
168 186
187#ifndef EV_INOTIFY_HASHSIZE
188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
193#endif
194
169/**/ 195/**/
170 196
171#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
172# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
173# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
176#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
177# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
179#endif 205#endif
180 206
207#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0
210#endif
211
212#if EV_USE_INOTIFY
213# include <sys/inotify.h>
214#endif
215
181#if EV_SELECT_IS_WINSOCKET 216#if EV_SELECT_IS_WINSOCKET
182# include <winsock.h> 217# include <winsock.h>
183#endif 218#endif
184 219
185/**/ 220/**/
186 221
222/*
223 * This is used to avoid floating point rounding problems.
224 * It is added to ev_rt_now when scheduling periodics
225 * to ensure progress, time-wise, even when rounding
226 * errors are against us.
227 * This value is good at least till the year 4000.
228 * Better solutions welcome.
229 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
231
187#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 232#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
188#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 233#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
189/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
190 235
191#ifdef EV_H
192# include EV_H
193#else
194# include "ev.h"
195#endif
196
197#if __GNUC__ >= 3 236#if __GNUC__ >= 4
198# define expect(expr,value) __builtin_expect ((expr),(value)) 237# define expect(expr,value) __builtin_expect ((expr),(value))
199# define inline_size static inline /* inline for codesize */
200# if EV_MINIMAL
201# define noinline __attribute__ ((noinline)) 238# define noinline __attribute__ ((noinline))
202# define inline_speed static noinline
203# else
204# define noinline
205# define inline_speed static inline
206# endif
207#else 239#else
208# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
209# define inline_speed static
210# define inline_size static
211# define noinline 241# define noinline
242# if __STDC_VERSION__ < 199901L
243# define inline
244# endif
212#endif 245#endif
213 246
214#define expect_false(expr) expect ((expr) != 0, 0) 247#define expect_false(expr) expect ((expr) != 0, 0)
215#define expect_true(expr) expect ((expr) != 0, 1) 248#define expect_true(expr) expect ((expr) != 0, 1)
249#define inline_size static inline
250
251#if EV_MINIMAL
252# define inline_speed static noinline
253#else
254# define inline_speed static inline
255#endif
216 256
217#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 257#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
218#define ABSPRI(w) ((w)->priority - EV_MINPRI) 258#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
219 259
220#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 260#define EMPTY /* required for microsofts broken pseudo-c compiler */
221#define EMPTY2(a,b) /* used to suppress some warnings */ 261#define EMPTY2(a,b) /* used to suppress some warnings */
222 262
223typedef ev_watcher *W; 263typedef ev_watcher *W;
224typedef ev_watcher_list *WL; 264typedef ev_watcher_list *WL;
225typedef ev_watcher_time *WT; 265typedef ev_watcher_time *WT;
261ev_set_allocator (void *(*cb)(void *ptr, long size)) 301ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 302{
263 alloc = cb; 303 alloc = cb;
264} 304}
265 305
266static void * 306inline_speed void *
267ev_realloc (void *ptr, long size) 307ev_realloc (void *ptr, long size)
268{ 308{
269 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 309 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
270 310
271 if (!ptr && size) 311 if (!ptr && size)
295typedef struct 335typedef struct
296{ 336{
297 W w; 337 W w;
298 int events; 338 int events;
299} ANPENDING; 339} ANPENDING;
340
341#if EV_USE_INOTIFY
342typedef struct
343{
344 WL head;
345} ANFS;
346#endif
300 347
301#if EV_MULTIPLICITY 348#if EV_MULTIPLICITY
302 349
303 struct ev_loop 350 struct ev_loop
304 { 351 {
361{ 408{
362 return ev_rt_now; 409 return ev_rt_now;
363} 410}
364#endif 411#endif
365 412
366#define array_roundsize(type,n) (((n) | 4) & ~3) 413int inline_size
414array_nextsize (int elem, int cur, int cnt)
415{
416 int ncur = cur + 1;
417
418 do
419 ncur <<= 1;
420 while (cnt > ncur);
421
422 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
423 if (elem * ncur > 4096)
424 {
425 ncur *= elem;
426 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
427 ncur = ncur - sizeof (void *) * 4;
428 ncur /= elem;
429 }
430
431 return ncur;
432}
433
434static noinline void *
435array_realloc (int elem, void *base, int *cur, int cnt)
436{
437 *cur = array_nextsize (elem, *cur, cnt);
438 return ev_realloc (base, elem * *cur);
439}
367 440
368#define array_needsize(type,base,cur,cnt,init) \ 441#define array_needsize(type,base,cur,cnt,init) \
369 if (expect_false ((cnt) > cur)) \ 442 if (expect_false ((cnt) > (cur))) \
370 { \ 443 { \
371 int newcnt = cur; \ 444 int ocur_ = (cur); \
372 do \ 445 (base) = (type *)array_realloc \
373 { \ 446 (sizeof (type), (base), &(cur), (cnt)); \
374 newcnt = array_roundsize (type, newcnt << 1); \ 447 init ((base) + (ocur_), (cur) - ocur_); \
375 } \
376 while ((cnt) > newcnt); \
377 \
378 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
379 init (base + cur, newcnt - cur); \
380 cur = newcnt; \
381 } 448 }
382 449
450#if 0
383#define array_slim(type,stem) \ 451#define array_slim(type,stem) \
384 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 452 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
385 { \ 453 { \
386 stem ## max = array_roundsize (stem ## cnt >> 1); \ 454 stem ## max = array_roundsize (stem ## cnt >> 1); \
387 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 455 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
388 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 456 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
389 } 457 }
458#endif
390 459
391#define array_free(stem, idx) \ 460#define array_free(stem, idx) \
392 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 461 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
393 462
394/*****************************************************************************/ 463/*****************************************************************************/
395 464
396void noinline 465void noinline
397ev_feed_event (EV_P_ void *w, int revents) 466ev_feed_event (EV_P_ void *w, int revents)
398{ 467{
399 W w_ = (W)w; 468 W w_ = (W)w;
469 int pri = ABSPRI (w_);
400 470
401 if (expect_false (w_->pending)) 471 if (expect_false (w_->pending))
472 pendings [pri][w_->pending - 1].events |= revents;
473 else
402 { 474 {
475 w_->pending = ++pendingcnt [pri];
476 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
477 pendings [pri][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 478 pendings [pri][w_->pending - 1].events = revents;
404 return;
405 } 479 }
406
407 w_->pending = ++pendingcnt [ABSPRI (w_)];
408 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
409 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
410 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
411} 480}
412 481
413void inline_size 482void inline_speed
414queue_events (EV_P_ W *events, int eventcnt, int type) 483queue_events (EV_P_ W *events, int eventcnt, int type)
415{ 484{
416 int i; 485 int i;
417 486
418 for (i = 0; i < eventcnt; ++i) 487 for (i = 0; i < eventcnt; ++i)
450} 519}
451 520
452void 521void
453ev_feed_fd_event (EV_P_ int fd, int revents) 522ev_feed_fd_event (EV_P_ int fd, int revents)
454{ 523{
524 if (fd >= 0 && fd < anfdmax)
455 fd_event (EV_A_ fd, revents); 525 fd_event (EV_A_ fd, revents);
456} 526}
457 527
458void inline_size 528void inline_size
459fd_reify (EV_P) 529fd_reify (EV_P)
460{ 530{
464 { 534 {
465 int fd = fdchanges [i]; 535 int fd = fdchanges [i];
466 ANFD *anfd = anfds + fd; 536 ANFD *anfd = anfds + fd;
467 ev_io *w; 537 ev_io *w;
468 538
469 int events = 0; 539 unsigned char events = 0;
470 540
471 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 541 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
472 events |= w->events; 542 events |= (unsigned char)w->events;
473 543
474#if EV_SELECT_IS_WINSOCKET 544#if EV_SELECT_IS_WINSOCKET
475 if (events) 545 if (events)
476 { 546 {
477 unsigned long argp; 547 unsigned long argp;
478 anfd->handle = _get_osfhandle (fd); 548 anfd->handle = _get_osfhandle (fd);
479 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
480 } 550 }
481#endif 551#endif
482 552
553 {
554 unsigned char o_events = anfd->events;
555 unsigned char o_reify = anfd->reify;
556
483 anfd->reify = 0; 557 anfd->reify = 0;
484
485 backend_modify (EV_A_ fd, anfd->events, events);
486 anfd->events = events; 558 anfd->events = events;
559
560 if (o_events != events || o_reify & EV_IOFDSET)
561 backend_modify (EV_A_ fd, o_events, events);
562 }
487 } 563 }
488 564
489 fdchangecnt = 0; 565 fdchangecnt = 0;
490} 566}
491 567
492void inline_size 568void inline_size
493fd_change (EV_P_ int fd) 569fd_change (EV_P_ int fd, int flags)
494{ 570{
495 if (expect_false (anfds [fd].reify)) 571 unsigned char reify = anfds [fd].reify;
496 return;
497
498 anfds [fd].reify = 1; 572 anfds [fd].reify |= flags;
499 573
574 if (expect_true (!reify))
575 {
500 ++fdchangecnt; 576 ++fdchangecnt;
501 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 577 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
502 fdchanges [fdchangecnt - 1] = fd; 578 fdchanges [fdchangecnt - 1] = fd;
579 }
503} 580}
504 581
505void inline_speed 582void inline_speed
506fd_kill (EV_P_ int fd) 583fd_kill (EV_P_ int fd)
507{ 584{
554static void noinline 631static void noinline
555fd_rearm_all (EV_P) 632fd_rearm_all (EV_P)
556{ 633{
557 int fd; 634 int fd;
558 635
559 /* this should be highly optimised to not do anything but set a flag */
560 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
561 if (anfds [fd].events) 637 if (anfds [fd].events)
562 { 638 {
563 anfds [fd].events = 0; 639 anfds [fd].events = 0;
564 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
565 } 641 }
566} 642}
567 643
568/*****************************************************************************/ 644/*****************************************************************************/
569 645
570void inline_speed 646void inline_speed
571upheap (WT *heap, int k) 647upheap (WT *heap, int k)
572{ 648{
573 WT w = heap [k]; 649 WT w = heap [k];
574 650
575 while (k && heap [k >> 1]->at > w->at) 651 while (k)
576 { 652 {
653 int p = (k - 1) >> 1;
654
655 if (heap [p]->at <= w->at)
656 break;
657
577 heap [k] = heap [k >> 1]; 658 heap [k] = heap [p];
578 ((W)heap [k])->active = k + 1; 659 ((W)heap [k])->active = k + 1;
579 k >>= 1; 660 k = p;
580 } 661 }
581 662
582 heap [k] = w; 663 heap [k] = w;
583 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
584
585} 665}
586 666
587void inline_speed 667void inline_speed
588downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
589{ 669{
590 WT w = heap [k]; 670 WT w = heap [k];
591 671
592 while (k < (N >> 1)) 672 for (;;)
593 { 673 {
594 int j = k << 1; 674 int c = (k << 1) + 1;
595 675
596 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 676 if (c >= N)
597 ++j;
598
599 if (w->at <= heap [j]->at)
600 break; 677 break;
601 678
679 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
680 ? 1 : 0;
681
682 if (w->at <= heap [c]->at)
683 break;
684
602 heap [k] = heap [j]; 685 heap [k] = heap [c];
603 ((W)heap [k])->active = k + 1; 686 ((W)heap [k])->active = k + 1;
687
604 k = j; 688 k = c;
605 } 689 }
606 690
607 heap [k] = w; 691 heap [k] = w;
608 ((W)heap [k])->active = k + 1; 692 ((W)heap [k])->active = k + 1;
609} 693}
691 for (signum = signalmax; signum--; ) 775 for (signum = signalmax; signum--; )
692 if (signals [signum].gotsig) 776 if (signals [signum].gotsig)
693 ev_feed_signal_event (EV_A_ signum + 1); 777 ev_feed_signal_event (EV_A_ signum + 1);
694} 778}
695 779
696void inline_size 780void inline_speed
697fd_intern (int fd) 781fd_intern (int fd)
698{ 782{
699#ifdef _WIN32 783#ifdef _WIN32
700 int arg = 1; 784 int arg = 1;
701 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 785 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
716 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
717} 801}
718 802
719/*****************************************************************************/ 803/*****************************************************************************/
720 804
721static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
722 806
723#ifndef _WIN32 807#ifndef _WIN32
724 808
725static ev_signal childev; 809static ev_signal childev;
726 810
730 ev_child *w; 814 ev_child *w;
731 815
732 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 816 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
733 if (w->pid == pid || !w->pid) 817 if (w->pid == pid || !w->pid)
734 { 818 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 819 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
736 w->rpid = pid; 820 w->rpid = pid;
737 w->rstatus = status; 821 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 822 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 823 }
740} 824}
741 825
742#ifndef WCONTINUED 826#ifndef WCONTINUED
852ev_backend (EV_P) 936ev_backend (EV_P)
853{ 937{
854 return backend; 938 return backend;
855} 939}
856 940
857static void 941unsigned int
942ev_loop_count (EV_P)
943{
944 return loop_count;
945}
946
947static void noinline
858loop_init (EV_P_ unsigned int flags) 948loop_init (EV_P_ unsigned int flags)
859{ 949{
860 if (!backend) 950 if (!backend)
861 { 951 {
862#if EV_USE_MONOTONIC 952#if EV_USE_MONOTONIC
870 ev_rt_now = ev_time (); 960 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 961 mn_now = get_clock ();
872 now_floor = mn_now; 962 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 963 rtmn_diff = ev_rt_now - mn_now;
874 964
965 /* pid check not overridable via env */
966#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid ();
969#endif
970
875 if (!(flags & EVFLAG_NOENV) 971 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 972 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 973 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 974 flags = atoi (getenv ("LIBEV_FLAGS"));
879 975
880 if (!(flags & 0x0000ffffUL)) 976 if (!(flags & 0x0000ffffUL))
881 flags |= ev_recommended_backends (); 977 flags |= ev_recommended_backends ();
882 978
883 backend = 0; 979 backend = 0;
980 backend_fd = -1;
981#if EV_USE_INOTIFY
982 fs_fd = -2;
983#endif
984
884#if EV_USE_PORT 985#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 986 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 987#endif
887#if EV_USE_KQUEUE 988#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 989 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
900 ev_init (&sigev, sigcb); 1001 ev_init (&sigev, sigcb);
901 ev_set_priority (&sigev, EV_MAXPRI); 1002 ev_set_priority (&sigev, EV_MAXPRI);
902 } 1003 }
903} 1004}
904 1005
905static void 1006static void noinline
906loop_destroy (EV_P) 1007loop_destroy (EV_P)
907{ 1008{
908 int i; 1009 int i;
1010
1011#if EV_USE_INOTIFY
1012 if (fs_fd >= 0)
1013 close (fs_fd);
1014#endif
1015
1016 if (backend_fd >= 0)
1017 close (backend_fd);
909 1018
910#if EV_USE_PORT 1019#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1020 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 1021#endif
913#if EV_USE_KQUEUE 1022#if EV_USE_KQUEUE
922#if EV_USE_SELECT 1031#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1032 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1033#endif
925 1034
926 for (i = NUMPRI; i--; ) 1035 for (i = NUMPRI; i--; )
1036 {
927 array_free (pending, [i]); 1037 array_free (pending, [i]);
1038#if EV_IDLE_ENABLE
1039 array_free (idle, [i]);
1040#endif
1041 }
1042
1043 ev_free (anfds); anfdmax = 0;
928 1044
929 /* have to use the microsoft-never-gets-it-right macro */ 1045 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1046 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1047 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1048#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1049 array_free (periodic, EMPTY);
934#endif 1050#endif
1051#if EV_FORK_ENABLE
935 array_free (idle, EMPTY0); 1052 array_free (fork, EMPTY);
1053#endif
936 array_free (prepare, EMPTY0); 1054 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1055 array_free (check, EMPTY);
938 1056
939 backend = 0; 1057 backend = 0;
940} 1058}
941 1059
942static void 1060void inline_size infy_fork (EV_P);
1061
1062void inline_size
943loop_fork (EV_P) 1063loop_fork (EV_P)
944{ 1064{
945#if EV_USE_PORT 1065#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1066 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 1067#endif
948#if EV_USE_KQUEUE 1068#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1069 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1070#endif
951#if EV_USE_EPOLL 1071#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1072 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1073#endif
1074#if EV_USE_INOTIFY
1075 infy_fork (EV_A);
953#endif 1076#endif
954 1077
955 if (ev_is_active (&sigev)) 1078 if (ev_is_active (&sigev))
956 { 1079 {
957 /* default loop */ 1080 /* default loop */
1073 postfork = 1; 1196 postfork = 1;
1074} 1197}
1075 1198
1076/*****************************************************************************/ 1199/*****************************************************************************/
1077 1200
1078int inline_size 1201void
1079any_pending (EV_P) 1202ev_invoke (EV_P_ void *w, int revents)
1080{ 1203{
1081 int pri; 1204 EV_CB_INVOKE ((W)w, revents);
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088} 1205}
1089 1206
1090void inline_speed 1207void inline_speed
1091call_pending (EV_P) 1208call_pending (EV_P)
1092{ 1209{
1097 { 1214 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1215 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1216
1100 if (expect_true (p->w)) 1217 if (expect_true (p->w))
1101 { 1218 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1219 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1220
1104 p->w->pending = 0; 1221 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1222 EV_CB_INVOKE (p->w, p->events);
1106 } 1223 }
1107 } 1224 }
1110void inline_size 1227void inline_size
1111timers_reify (EV_P) 1228timers_reify (EV_P)
1112{ 1229{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1230 while (timercnt && ((WT)timers [0])->at <= mn_now)
1114 { 1231 {
1115 ev_timer *w = timers [0]; 1232 ev_timer *w = (ev_timer *)timers [0];
1116 1233
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1235
1119 /* first reschedule or stop timer */ 1236 /* first reschedule or stop timer */
1120 if (w->repeat) 1237 if (w->repeat)
1121 { 1238 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1239 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1123 1240
1124 ((WT)w)->at += w->repeat; 1241 ((WT)w)->at += w->repeat;
1125 if (((WT)w)->at < mn_now) 1242 if (((WT)w)->at < mn_now)
1126 ((WT)w)->at = mn_now; 1243 ((WT)w)->at = mn_now;
1127 1244
1128 downheap ((WT *)timers, timercnt, 0); 1245 downheap (timers, timercnt, 0);
1129 } 1246 }
1130 else 1247 else
1131 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1132 1249
1133 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1138void inline_size 1255void inline_size
1139periodics_reify (EV_P) 1256periodics_reify (EV_P)
1140{ 1257{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1142 { 1259 {
1143 ev_periodic *w = periodics [0]; 1260 ev_periodic *w = (ev_periodic *)periodics [0];
1144 1261
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1263
1147 /* first reschedule or stop timer */ 1264 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1265 if (w->reschedule_cb)
1149 { 1266 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1267 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1151 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1268 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1152 downheap ((WT *)periodics, periodiccnt, 0); 1269 downheap (periodics, periodiccnt, 0);
1153 } 1270 }
1154 else if (w->interval) 1271 else if (w->interval)
1155 { 1272 {
1156 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1273 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1274 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1157 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1275 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1158 downheap ((WT *)periodics, periodiccnt, 0); 1276 downheap (periodics, periodiccnt, 0);
1159 } 1277 }
1160 else 1278 else
1161 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1162 1280
1163 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1170 int i; 1288 int i;
1171 1289
1172 /* adjust periodics after time jump */ 1290 /* adjust periodics after time jump */
1173 for (i = 0; i < periodiccnt; ++i) 1291 for (i = 0; i < periodiccnt; ++i)
1174 { 1292 {
1175 ev_periodic *w = periodics [i]; 1293 ev_periodic *w = (ev_periodic *)periodics [i];
1176 1294
1177 if (w->reschedule_cb) 1295 if (w->reschedule_cb)
1178 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1179 else if (w->interval) 1297 else if (w->interval)
1180 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1298 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1181 } 1299 }
1182 1300
1183 /* now rebuild the heap */ 1301 /* now rebuild the heap */
1184 for (i = periodiccnt >> 1; i--; ) 1302 for (i = periodiccnt >> 1; i--; )
1185 downheap ((WT *)periodics, periodiccnt, i); 1303 downheap (periodics, periodiccnt, i);
1186} 1304}
1187#endif 1305#endif
1188 1306
1307#if EV_IDLE_ENABLE
1189int inline_size 1308void inline_size
1190time_update_monotonic (EV_P) 1309idle_reify (EV_P)
1191{ 1310{
1311 if (expect_false (idleall))
1312 {
1313 int pri;
1314
1315 for (pri = NUMPRI; pri--; )
1316 {
1317 if (pendingcnt [pri])
1318 break;
1319
1320 if (idlecnt [pri])
1321 {
1322 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1323 break;
1324 }
1325 }
1326 }
1327}
1328#endif
1329
1330void inline_speed
1331time_update (EV_P_ ev_tstamp max_block)
1332{
1333 int i;
1334
1335#if EV_USE_MONOTONIC
1336 if (expect_true (have_monotonic))
1337 {
1338 ev_tstamp odiff = rtmn_diff;
1339
1192 mn_now = get_clock (); 1340 mn_now = get_clock ();
1193 1341
1342 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1343 /* interpolate in the meantime */
1194 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1344 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1195 { 1345 {
1196 ev_rt_now = rtmn_diff + mn_now; 1346 ev_rt_now = rtmn_diff + mn_now;
1197 return 0; 1347 return;
1198 } 1348 }
1199 else 1349
1200 {
1201 now_floor = mn_now; 1350 now_floor = mn_now;
1202 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1203 return 1;
1204 }
1205}
1206 1352
1207void inline_size 1353 /* loop a few times, before making important decisions.
1208time_update (EV_P) 1354 * on the choice of "4": one iteration isn't enough,
1209{ 1355 * in case we get preempted during the calls to
1210 int i; 1356 * ev_time and get_clock. a second call is almost guaranteed
1211 1357 * to succeed in that case, though. and looping a few more times
1212#if EV_USE_MONOTONIC 1358 * doesn't hurt either as we only do this on time-jumps or
1213 if (expect_true (have_monotonic)) 1359 * in the unlikely event of having been preempted here.
1214 { 1360 */
1215 if (time_update_monotonic (EV_A)) 1361 for (i = 4; --i; )
1216 { 1362 {
1217 ev_tstamp odiff = rtmn_diff;
1218
1219 /* loop a few times, before making important decisions.
1220 * on the choice of "4": one iteration isn't enough,
1221 * in case we get preempted during the calls to
1222 * ev_time and get_clock. a second call is almost guarenteed
1223 * to succeed in that case, though. and looping a few more times
1224 * doesn't hurt either as we only do this on time-jumps or
1225 * in the unlikely event of getting preempted here.
1226 */
1227 for (i = 4; --i; )
1228 {
1229 rtmn_diff = ev_rt_now - mn_now; 1363 rtmn_diff = ev_rt_now - mn_now;
1230 1364
1231 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1365 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1232 return; /* all is well */ 1366 return; /* all is well */
1233 1367
1234 ev_rt_now = ev_time (); 1368 ev_rt_now = ev_time ();
1235 mn_now = get_clock (); 1369 mn_now = get_clock ();
1236 now_floor = mn_now; 1370 now_floor = mn_now;
1237 } 1371 }
1238 1372
1239# if EV_PERIODIC_ENABLE 1373# if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1241# endif 1375# endif
1242 /* no timer adjustment, as the monotonic clock doesn't jump */ 1376 /* no timer adjustment, as the monotonic clock doesn't jump */
1243 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1377 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1244 }
1245 } 1378 }
1246 else 1379 else
1247#endif 1380#endif
1248 { 1381 {
1249 ev_rt_now = ev_time (); 1382 ev_rt_now = ev_time ();
1250 1383
1251 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1384 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1252 { 1385 {
1253#if EV_PERIODIC_ENABLE 1386#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1387 periodics_reschedule (EV_A);
1255#endif 1388#endif
1256
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1389 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1390 for (i = 0; i < timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1391 ((WT)timers [i])->at += ev_rt_now - mn_now;
1260 } 1392 }
1261 1393
1262 mn_now = ev_rt_now; 1394 mn_now = ev_rt_now;
1282{ 1414{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1415 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1284 ? EVUNLOOP_ONE 1416 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL; 1417 : EVUNLOOP_CANCEL;
1286 1418
1287 while (activecnt) 1419 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1420
1421 do
1288 { 1422 {
1289 /* we might have forked, so reify kernel state if necessary */ 1423#ifndef _WIN32
1424 if (expect_false (curpid)) /* penalise the forking check even more */
1425 if (expect_false (getpid () != curpid))
1426 {
1427 curpid = getpid ();
1428 postfork = 1;
1429 }
1430#endif
1431
1290 #if EV_FORK_ENABLE 1432#if EV_FORK_ENABLE
1433 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1434 if (expect_false (postfork))
1292 if (forkcnt) 1435 if (forkcnt)
1293 { 1436 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1437 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1438 call_pending (EV_A);
1296 } 1439 }
1297 #endif 1440#endif
1298 1441
1299 /* queue check watchers (and execute them) */ 1442 /* queue prepare watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1443 if (expect_false (preparecnt))
1301 { 1444 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1445 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1446 call_pending (EV_A);
1304 } 1447 }
1305 1448
1449 if (expect_false (!activecnt))
1450 break;
1451
1306 /* we might have forked, so reify kernel state if necessary */ 1452 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1453 if (expect_false (postfork))
1308 loop_fork (EV_A); 1454 loop_fork (EV_A);
1309 1455
1310 /* update fd-related kernel structures */ 1456 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1457 fd_reify (EV_A);
1312 1458
1313 /* calculate blocking time */ 1459 /* calculate blocking time */
1314 { 1460 {
1315 double block; 1461 ev_tstamp block;
1316 1462
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1318 block = 0.; /* do not block at all */ 1464 block = 0.; /* do not block at all */
1319 else 1465 else
1320 { 1466 {
1321 /* update time to cancel out callback processing overhead */ 1467 /* update time to cancel out callback processing overhead */
1322#if EV_USE_MONOTONIC
1323 if (expect_true (have_monotonic))
1324 time_update_monotonic (EV_A); 1468 time_update (EV_A_ 1e100);
1325 else
1326#endif
1327 {
1328 ev_rt_now = ev_time ();
1329 mn_now = ev_rt_now;
1330 }
1331 1469
1332 block = MAX_BLOCKTIME; 1470 block = MAX_BLOCKTIME;
1333 1471
1334 if (timercnt) 1472 if (timercnt)
1335 { 1473 {
1346#endif 1484#endif
1347 1485
1348 if (expect_false (block < 0.)) block = 0.; 1486 if (expect_false (block < 0.)) block = 0.;
1349 } 1487 }
1350 1488
1489 ++loop_count;
1351 backend_poll (EV_A_ block); 1490 backend_poll (EV_A_ block);
1491
1492 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block);
1352 } 1494 }
1353
1354 /* update ev_rt_now, do magic */
1355 time_update (EV_A);
1356 1495
1357 /* queue pending timers and reschedule them */ 1496 /* queue pending timers and reschedule them */
1358 timers_reify (EV_A); /* relative timers called last */ 1497 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1498#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1499 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1500#endif
1362 1501
1502#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1503 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1504 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1505#endif
1366 1506
1367 /* queue check watchers, to be executed first */ 1507 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1508 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1509 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1510
1371 call_pending (EV_A); 1511 call_pending (EV_A);
1372 1512
1373 if (expect_false (loop_done))
1374 break;
1375 } 1513 }
1514 while (expect_true (activecnt && !loop_done));
1376 1515
1377 if (loop_done == EVUNLOOP_ONE) 1516 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1517 loop_done = EVUNLOOP_CANCEL;
1379} 1518}
1380 1519
1407 head = &(*head)->next; 1546 head = &(*head)->next;
1408 } 1547 }
1409} 1548}
1410 1549
1411void inline_speed 1550void inline_speed
1412ev_clear_pending (EV_P_ W w) 1551clear_pending (EV_P_ W w)
1413{ 1552{
1414 if (w->pending) 1553 if (w->pending)
1415 { 1554 {
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1555 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1556 w->pending = 0;
1418 } 1557 }
1419} 1558}
1420 1559
1560int
1561ev_clear_pending (EV_P_ void *w)
1562{
1563 W w_ = (W)w;
1564 int pending = w_->pending;
1565
1566 if (expect_true (pending))
1567 {
1568 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1569 w_->pending = 0;
1570 p->w = 0;
1571 return p->events;
1572 }
1573 else
1574 return 0;
1575}
1576
1577void inline_size
1578pri_adjust (EV_P_ W w)
1579{
1580 int pri = w->priority;
1581 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1582 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1583 w->priority = pri;
1584}
1585
1421void inline_speed 1586void inline_speed
1422ev_start (EV_P_ W w, int active) 1587ev_start (EV_P_ W w, int active)
1423{ 1588{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1589 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1590 w->active = active;
1428 ev_ref (EV_A); 1591 ev_ref (EV_A);
1429} 1592}
1430 1593
1431void inline_size 1594void inline_size
1435 w->active = 0; 1598 w->active = 0;
1436} 1599}
1437 1600
1438/*****************************************************************************/ 1601/*****************************************************************************/
1439 1602
1440void 1603void noinline
1441ev_io_start (EV_P_ ev_io *w) 1604ev_io_start (EV_P_ ev_io *w)
1442{ 1605{
1443 int fd = w->fd; 1606 int fd = w->fd;
1444 1607
1445 if (expect_false (ev_is_active (w))) 1608 if (expect_false (ev_is_active (w)))
1447 1610
1448 assert (("ev_io_start called with negative fd", fd >= 0)); 1611 assert (("ev_io_start called with negative fd", fd >= 0));
1449 1612
1450 ev_start (EV_A_ (W)w, 1); 1613 ev_start (EV_A_ (W)w, 1);
1451 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1614 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1452 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1615 wlist_add (&anfds[fd].head, (WL)w);
1453 1616
1454 fd_change (EV_A_ fd); 1617 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1618 w->events &= ~EV_IOFDSET;
1455} 1619}
1456 1620
1457void 1621void noinline
1458ev_io_stop (EV_P_ ev_io *w) 1622ev_io_stop (EV_P_ ev_io *w)
1459{ 1623{
1460 ev_clear_pending (EV_A_ (W)w); 1624 clear_pending (EV_A_ (W)w);
1461 if (expect_false (!ev_is_active (w))) 1625 if (expect_false (!ev_is_active (w)))
1462 return; 1626 return;
1463 1627
1464 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1628 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1465 1629
1466 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1630 wlist_del (&anfds[w->fd].head, (WL)w);
1467 ev_stop (EV_A_ (W)w); 1631 ev_stop (EV_A_ (W)w);
1468 1632
1469 fd_change (EV_A_ w->fd); 1633 fd_change (EV_A_ w->fd, 1);
1470} 1634}
1471 1635
1472void 1636void noinline
1473ev_timer_start (EV_P_ ev_timer *w) 1637ev_timer_start (EV_P_ ev_timer *w)
1474{ 1638{
1475 if (expect_false (ev_is_active (w))) 1639 if (expect_false (ev_is_active (w)))
1476 return; 1640 return;
1477 1641
1478 ((WT)w)->at += mn_now; 1642 ((WT)w)->at += mn_now;
1479 1643
1480 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1644 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1481 1645
1482 ev_start (EV_A_ (W)w, ++timercnt); 1646 ev_start (EV_A_ (W)w, ++timercnt);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1484 timers [timercnt - 1] = w; 1648 timers [timercnt - 1] = (WT)w;
1485 upheap ((WT *)timers, timercnt - 1); 1649 upheap (timers, timercnt - 1);
1486 1650
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1488} 1652}
1489 1653
1490void 1654void noinline
1491ev_timer_stop (EV_P_ ev_timer *w) 1655ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1656{
1493 ev_clear_pending (EV_A_ (W)w); 1657 clear_pending (EV_A_ (W)w);
1494 if (expect_false (!ev_is_active (w))) 1658 if (expect_false (!ev_is_active (w)))
1495 return; 1659 return;
1496 1660
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1498 1662
1663 {
1664 int active = ((W)w)->active;
1665
1499 if (expect_true (((W)w)->active < timercnt--)) 1666 if (expect_true (--active < --timercnt))
1500 { 1667 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 1668 timers [active] = timers [timercnt];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1669 adjustheap (timers, timercnt, active);
1503 } 1670 }
1671 }
1504 1672
1505 ((WT)w)->at -= mn_now; 1673 ((WT)w)->at -= mn_now;
1506 1674
1507 ev_stop (EV_A_ (W)w); 1675 ev_stop (EV_A_ (W)w);
1508} 1676}
1509 1677
1510void 1678void noinline
1511ev_timer_again (EV_P_ ev_timer *w) 1679ev_timer_again (EV_P_ ev_timer *w)
1512{ 1680{
1513 if (ev_is_active (w)) 1681 if (ev_is_active (w))
1514 { 1682 {
1515 if (w->repeat) 1683 if (w->repeat)
1516 { 1684 {
1517 ((WT)w)->at = mn_now + w->repeat; 1685 ((WT)w)->at = mn_now + w->repeat;
1518 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1686 adjustheap (timers, timercnt, ((W)w)->active - 1);
1519 } 1687 }
1520 else 1688 else
1521 ev_timer_stop (EV_A_ w); 1689 ev_timer_stop (EV_A_ w);
1522 } 1690 }
1523 else if (w->repeat) 1691 else if (w->repeat)
1526 ev_timer_start (EV_A_ w); 1694 ev_timer_start (EV_A_ w);
1527 } 1695 }
1528} 1696}
1529 1697
1530#if EV_PERIODIC_ENABLE 1698#if EV_PERIODIC_ENABLE
1531void 1699void noinline
1532ev_periodic_start (EV_P_ ev_periodic *w) 1700ev_periodic_start (EV_P_ ev_periodic *w)
1533{ 1701{
1534 if (expect_false (ev_is_active (w))) 1702 if (expect_false (ev_is_active (w)))
1535 return; 1703 return;
1536 1704
1538 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1706 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1539 else if (w->interval) 1707 else if (w->interval)
1540 { 1708 {
1541 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1709 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1542 /* this formula differs from the one in periodic_reify because we do not always round up */ 1710 /* this formula differs from the one in periodic_reify because we do not always round up */
1543 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1711 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1544 } 1712 }
1713 else
1714 ((WT)w)->at = w->offset;
1545 1715
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 1716 ev_start (EV_A_ (W)w, ++periodiccnt);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 1718 periodics [periodiccnt - 1] = (WT)w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 1719 upheap (periodics, periodiccnt - 1);
1550 1720
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1552} 1722}
1553 1723
1554void 1724void noinline
1555ev_periodic_stop (EV_P_ ev_periodic *w) 1725ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 1726{
1557 ev_clear_pending (EV_A_ (W)w); 1727 clear_pending (EV_A_ (W)w);
1558 if (expect_false (!ev_is_active (w))) 1728 if (expect_false (!ev_is_active (w)))
1559 return; 1729 return;
1560 1730
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1562 1732
1733 {
1734 int active = ((W)w)->active;
1735
1563 if (expect_true (((W)w)->active < periodiccnt--)) 1736 if (expect_true (--active < --periodiccnt))
1564 { 1737 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1738 periodics [active] = periodics [periodiccnt];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1739 adjustheap (periodics, periodiccnt, active);
1567 } 1740 }
1741 }
1568 1742
1569 ev_stop (EV_A_ (W)w); 1743 ev_stop (EV_A_ (W)w);
1570} 1744}
1571 1745
1572void 1746void noinline
1573ev_periodic_again (EV_P_ ev_periodic *w) 1747ev_periodic_again (EV_P_ ev_periodic *w)
1574{ 1748{
1575 /* TODO: use adjustheap and recalculation */ 1749 /* TODO: use adjustheap and recalculation */
1576 ev_periodic_stop (EV_A_ w); 1750 ev_periodic_stop (EV_A_ w);
1577 ev_periodic_start (EV_A_ w); 1751 ev_periodic_start (EV_A_ w);
1580 1754
1581#ifndef SA_RESTART 1755#ifndef SA_RESTART
1582# define SA_RESTART 0 1756# define SA_RESTART 0
1583#endif 1757#endif
1584 1758
1585void 1759void noinline
1586ev_signal_start (EV_P_ ev_signal *w) 1760ev_signal_start (EV_P_ ev_signal *w)
1587{ 1761{
1588#if EV_MULTIPLICITY 1762#if EV_MULTIPLICITY
1589 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1763 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1590#endif 1764#endif
1591 if (expect_false (ev_is_active (w))) 1765 if (expect_false (ev_is_active (w)))
1592 return; 1766 return;
1593 1767
1594 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1595 1769
1770 {
1771#ifndef _WIN32
1772 sigset_t full, prev;
1773 sigfillset (&full);
1774 sigprocmask (SIG_SETMASK, &full, &prev);
1775#endif
1776
1777 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1778
1779#ifndef _WIN32
1780 sigprocmask (SIG_SETMASK, &prev, 0);
1781#endif
1782 }
1783
1596 ev_start (EV_A_ (W)w, 1); 1784 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1598 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1785 wlist_add (&signals [w->signum - 1].head, (WL)w);
1599 1786
1600 if (!((WL)w)->next) 1787 if (!((WL)w)->next)
1601 { 1788 {
1602#if _WIN32 1789#if _WIN32
1603 signal (w->signum, sighandler); 1790 signal (w->signum, sighandler);
1609 sigaction (w->signum, &sa, 0); 1796 sigaction (w->signum, &sa, 0);
1610#endif 1797#endif
1611 } 1798 }
1612} 1799}
1613 1800
1614void 1801void noinline
1615ev_signal_stop (EV_P_ ev_signal *w) 1802ev_signal_stop (EV_P_ ev_signal *w)
1616{ 1803{
1617 ev_clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1618 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1619 return; 1806 return;
1620 1807
1621 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1808 wlist_del (&signals [w->signum - 1].head, (WL)w);
1622 ev_stop (EV_A_ (W)w); 1809 ev_stop (EV_A_ (W)w);
1623 1810
1624 if (!signals [w->signum - 1].head) 1811 if (!signals [w->signum - 1].head)
1625 signal (w->signum, SIG_DFL); 1812 signal (w->signum, SIG_DFL);
1626} 1813}
1633#endif 1820#endif
1634 if (expect_false (ev_is_active (w))) 1821 if (expect_false (ev_is_active (w)))
1635 return; 1822 return;
1636 1823
1637 ev_start (EV_A_ (W)w, 1); 1824 ev_start (EV_A_ (W)w, 1);
1638 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1825 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1639} 1826}
1640 1827
1641void 1828void
1642ev_child_stop (EV_P_ ev_child *w) 1829ev_child_stop (EV_P_ ev_child *w)
1643{ 1830{
1644 ev_clear_pending (EV_A_ (W)w); 1831 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1832 if (expect_false (!ev_is_active (w)))
1646 return; 1833 return;
1647 1834
1648 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1835 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1649 ev_stop (EV_A_ (W)w); 1836 ev_stop (EV_A_ (W)w);
1650} 1837}
1651 1838
1652#if EV_STAT_ENABLE 1839#if EV_STAT_ENABLE
1653 1840
1657# endif 1844# endif
1658 1845
1659#define DEF_STAT_INTERVAL 5.0074891 1846#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 1847#define MIN_STAT_INTERVAL 0.1074891
1661 1848
1849static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1850
1851#if EV_USE_INOTIFY
1852# define EV_INOTIFY_BUFSIZE 8192
1853
1854static void noinline
1855infy_add (EV_P_ ev_stat *w)
1856{
1857 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);
1858
1859 if (w->wd < 0)
1860 {
1861 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1862
1863 /* monitor some parent directory for speedup hints */
1864 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1865 {
1866 char path [4096];
1867 strcpy (path, w->path);
1868
1869 do
1870 {
1871 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1872 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1873
1874 char *pend = strrchr (path, '/');
1875
1876 if (!pend)
1877 break; /* whoops, no '/', complain to your admin */
1878
1879 *pend = 0;
1880 w->wd = inotify_add_watch (fs_fd, path, mask);
1881 }
1882 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1883 }
1884 }
1885 else
1886 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1887
1888 if (w->wd >= 0)
1889 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1890}
1891
1892static void noinline
1893infy_del (EV_P_ ev_stat *w)
1894{
1895 int slot;
1896 int wd = w->wd;
1897
1898 if (wd < 0)
1899 return;
1900
1901 w->wd = -2;
1902 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1903 wlist_del (&fs_hash [slot].head, (WL)w);
1904
1905 /* remove this watcher, if others are watching it, they will rearm */
1906 inotify_rm_watch (fs_fd, wd);
1907}
1908
1909static void noinline
1910infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1911{
1912 if (slot < 0)
1913 /* overflow, need to check for all hahs slots */
1914 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1915 infy_wd (EV_A_ slot, wd, ev);
1916 else
1917 {
1918 WL w_;
1919
1920 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1921 {
1922 ev_stat *w = (ev_stat *)w_;
1923 w_ = w_->next; /* lets us remove this watcher and all before it */
1924
1925 if (w->wd == wd || wd == -1)
1926 {
1927 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1928 {
1929 w->wd = -1;
1930 infy_add (EV_A_ w); /* re-add, no matter what */
1931 }
1932
1933 stat_timer_cb (EV_A_ &w->timer, 0);
1934 }
1935 }
1936 }
1937}
1938
1939static void
1940infy_cb (EV_P_ ev_io *w, int revents)
1941{
1942 char buf [EV_INOTIFY_BUFSIZE];
1943 struct inotify_event *ev = (struct inotify_event *)buf;
1944 int ofs;
1945 int len = read (fs_fd, buf, sizeof (buf));
1946
1947 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1948 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1949}
1950
1951void inline_size
1952infy_init (EV_P)
1953{
1954 if (fs_fd != -2)
1955 return;
1956
1957 fs_fd = inotify_init ();
1958
1959 if (fs_fd >= 0)
1960 {
1961 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1962 ev_set_priority (&fs_w, EV_MAXPRI);
1963 ev_io_start (EV_A_ &fs_w);
1964 }
1965}
1966
1967void inline_size
1968infy_fork (EV_P)
1969{
1970 int slot;
1971
1972 if (fs_fd < 0)
1973 return;
1974
1975 close (fs_fd);
1976 fs_fd = inotify_init ();
1977
1978 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1979 {
1980 WL w_ = fs_hash [slot].head;
1981 fs_hash [slot].head = 0;
1982
1983 while (w_)
1984 {
1985 ev_stat *w = (ev_stat *)w_;
1986 w_ = w_->next; /* lets us add this watcher */
1987
1988 w->wd = -1;
1989
1990 if (fs_fd >= 0)
1991 infy_add (EV_A_ w); /* re-add, no matter what */
1992 else
1993 ev_timer_start (EV_A_ &w->timer);
1994 }
1995
1996 }
1997}
1998
1999#endif
2000
1662void 2001void
1663ev_stat_stat (EV_P_ ev_stat *w) 2002ev_stat_stat (EV_P_ ev_stat *w)
1664{ 2003{
1665 if (lstat (w->path, &w->attr) < 0) 2004 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 2005 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 2006 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 2007 w->attr.st_nlink = 1;
1669} 2008}
1670 2009
1671static void 2010static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2011stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 2012{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2013 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 2014
1676 /* we copy this here each the time so that */ 2015 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 2016 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 2017 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 2018 ev_stat_stat (EV_A_ w);
1680 2019
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2020 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2021 if (
2022 w->prev.st_dev != w->attr.st_dev
2023 || w->prev.st_ino != w->attr.st_ino
2024 || w->prev.st_mode != w->attr.st_mode
2025 || w->prev.st_nlink != w->attr.st_nlink
2026 || w->prev.st_uid != w->attr.st_uid
2027 || w->prev.st_gid != w->attr.st_gid
2028 || w->prev.st_rdev != w->attr.st_rdev
2029 || w->prev.st_size != w->attr.st_size
2030 || w->prev.st_atime != w->attr.st_atime
2031 || w->prev.st_mtime != w->attr.st_mtime
2032 || w->prev.st_ctime != w->attr.st_ctime
2033 ) {
2034 #if EV_USE_INOTIFY
2035 infy_del (EV_A_ w);
2036 infy_add (EV_A_ w);
2037 ev_stat_stat (EV_A_ w); /* avoid race... */
2038 #endif
2039
1682 ev_feed_event (EV_A_ w, EV_STAT); 2040 ev_feed_event (EV_A_ w, EV_STAT);
2041 }
1683} 2042}
1684 2043
1685void 2044void
1686ev_stat_start (EV_P_ ev_stat *w) 2045ev_stat_start (EV_P_ ev_stat *w)
1687{ 2046{
1697 if (w->interval < MIN_STAT_INTERVAL) 2056 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2057 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 2058
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2059 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 2060 ev_set_priority (&w->timer, ev_priority (w));
2061
2062#if EV_USE_INOTIFY
2063 infy_init (EV_A);
2064
2065 if (fs_fd >= 0)
2066 infy_add (EV_A_ w);
2067 else
2068#endif
1702 ev_timer_start (EV_A_ &w->timer); 2069 ev_timer_start (EV_A_ &w->timer);
1703 2070
1704 ev_start (EV_A_ (W)w, 1); 2071 ev_start (EV_A_ (W)w, 1);
1705} 2072}
1706 2073
1707void 2074void
1708ev_stat_stop (EV_P_ ev_stat *w) 2075ev_stat_stop (EV_P_ ev_stat *w)
1709{ 2076{
1710 ev_clear_pending (EV_A_ (W)w); 2077 clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 2078 if (expect_false (!ev_is_active (w)))
1712 return; 2079 return;
1713 2080
2081#if EV_USE_INOTIFY
2082 infy_del (EV_A_ w);
2083#endif
1714 ev_timer_stop (EV_A_ &w->timer); 2084 ev_timer_stop (EV_A_ &w->timer);
1715 2085
1716 ev_stop (EV_A_ (W)w); 2086 ev_stop (EV_A_ (W)w);
1717} 2087}
1718#endif 2088#endif
1719 2089
2090#if EV_IDLE_ENABLE
1720void 2091void
1721ev_idle_start (EV_P_ ev_idle *w) 2092ev_idle_start (EV_P_ ev_idle *w)
1722{ 2093{
1723 if (expect_false (ev_is_active (w))) 2094 if (expect_false (ev_is_active (w)))
1724 return; 2095 return;
1725 2096
2097 pri_adjust (EV_A_ (W)w);
2098
2099 {
2100 int active = ++idlecnt [ABSPRI (w)];
2101
2102 ++idleall;
1726 ev_start (EV_A_ (W)w, ++idlecnt); 2103 ev_start (EV_A_ (W)w, active);
2104
1727 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2105 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1728 idles [idlecnt - 1] = w; 2106 idles [ABSPRI (w)][active - 1] = w;
2107 }
1729} 2108}
1730 2109
1731void 2110void
1732ev_idle_stop (EV_P_ ev_idle *w) 2111ev_idle_stop (EV_P_ ev_idle *w)
1733{ 2112{
1734 ev_clear_pending (EV_A_ (W)w); 2113 clear_pending (EV_A_ (W)w);
1735 if (expect_false (!ev_is_active (w))) 2114 if (expect_false (!ev_is_active (w)))
1736 return; 2115 return;
1737 2116
1738 { 2117 {
1739 int active = ((W)w)->active; 2118 int active = ((W)w)->active;
1740 idles [active - 1] = idles [--idlecnt]; 2119
2120 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1741 ((W)idles [active - 1])->active = active; 2121 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2122
2123 ev_stop (EV_A_ (W)w);
2124 --idleall;
1742 } 2125 }
1743
1744 ev_stop (EV_A_ (W)w);
1745} 2126}
2127#endif
1746 2128
1747void 2129void
1748ev_prepare_start (EV_P_ ev_prepare *w) 2130ev_prepare_start (EV_P_ ev_prepare *w)
1749{ 2131{
1750 if (expect_false (ev_is_active (w))) 2132 if (expect_false (ev_is_active (w)))
1756} 2138}
1757 2139
1758void 2140void
1759ev_prepare_stop (EV_P_ ev_prepare *w) 2141ev_prepare_stop (EV_P_ ev_prepare *w)
1760{ 2142{
1761 ev_clear_pending (EV_A_ (W)w); 2143 clear_pending (EV_A_ (W)w);
1762 if (expect_false (!ev_is_active (w))) 2144 if (expect_false (!ev_is_active (w)))
1763 return; 2145 return;
1764 2146
1765 { 2147 {
1766 int active = ((W)w)->active; 2148 int active = ((W)w)->active;
1783} 2165}
1784 2166
1785void 2167void
1786ev_check_stop (EV_P_ ev_check *w) 2168ev_check_stop (EV_P_ ev_check *w)
1787{ 2169{
1788 ev_clear_pending (EV_A_ (W)w); 2170 clear_pending (EV_A_ (W)w);
1789 if (expect_false (!ev_is_active (w))) 2171 if (expect_false (!ev_is_active (w)))
1790 return; 2172 return;
1791 2173
1792 { 2174 {
1793 int active = ((W)w)->active; 2175 int active = ((W)w)->active;
1800 2182
1801#if EV_EMBED_ENABLE 2183#if EV_EMBED_ENABLE
1802void noinline 2184void noinline
1803ev_embed_sweep (EV_P_ ev_embed *w) 2185ev_embed_sweep (EV_P_ ev_embed *w)
1804{ 2186{
1805 ev_loop (w->loop, EVLOOP_NONBLOCK); 2187 ev_loop (w->other, EVLOOP_NONBLOCK);
1806} 2188}
1807 2189
1808static void 2190static void
1809embed_cb (EV_P_ ev_io *io, int revents) 2191embed_cb (EV_P_ ev_io *io, int revents)
1810{ 2192{
1821{ 2203{
1822 if (expect_false (ev_is_active (w))) 2204 if (expect_false (ev_is_active (w)))
1823 return; 2205 return;
1824 2206
1825 { 2207 {
1826 struct ev_loop *loop = w->loop; 2208 struct ev_loop *loop = w->other;
1827 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2209 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1828 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2210 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1829 } 2211 }
1830 2212
1831 ev_set_priority (&w->io, ev_priority (w)); 2213 ev_set_priority (&w->io, ev_priority (w));
1835} 2217}
1836 2218
1837void 2219void
1838ev_embed_stop (EV_P_ ev_embed *w) 2220ev_embed_stop (EV_P_ ev_embed *w)
1839{ 2221{
1840 ev_clear_pending (EV_A_ (W)w); 2222 clear_pending (EV_A_ (W)w);
1841 if (expect_false (!ev_is_active (w))) 2223 if (expect_false (!ev_is_active (w)))
1842 return; 2224 return;
1843 2225
1844 ev_io_stop (EV_A_ &w->io); 2226 ev_io_stop (EV_A_ &w->io);
1845 2227
1860} 2242}
1861 2243
1862void 2244void
1863ev_fork_stop (EV_P_ ev_fork *w) 2245ev_fork_stop (EV_P_ ev_fork *w)
1864{ 2246{
1865 ev_clear_pending (EV_A_ (W)w); 2247 clear_pending (EV_A_ (W)w);
1866 if (expect_false (!ev_is_active (w))) 2248 if (expect_false (!ev_is_active (w)))
1867 return; 2249 return;
1868 2250
1869 { 2251 {
1870 int active = ((W)w)->active; 2252 int active = ((W)w)->active;
1938 ev_timer_set (&once->to, timeout, 0.); 2320 ev_timer_set (&once->to, timeout, 0.);
1939 ev_timer_start (EV_A_ &once->to); 2321 ev_timer_start (EV_A_ &once->to);
1940 } 2322 }
1941} 2323}
1942 2324
2325#if EV_MULTIPLICITY
2326 #include "ev_wrap.h"
2327#endif
2328
1943#ifdef __cplusplus 2329#ifdef __cplusplus
1944} 2330}
1945#endif 2331#endif
1946 2332

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines