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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines