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

Comparing libev/ev.c (file contents):
Revision 1.141 by root, Mon Nov 26 20:33:58 2007 UTC vs.
Revision 1.181 by root, Wed Dec 12 00:17:08 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
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
182# else
183# define EV_PID_HASHSIZE 16
184# endif
185#endif
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
161/**/ 195/**/
162 196
163#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
172 206
173#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 208# include <winsock.h>
175#endif 209#endif
176 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
177/**/ 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 */
178 230
179#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) */
180#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) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#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 */
183
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189 234
190#if __GNUC__ >= 3 235#if __GNUC__ >= 3
191# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL
194# define noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
195# define inline_speed static noinline
196# else
197# define noinline
198# define inline_speed static inline
199# endif
200#else 238#else
201# define expect(expr,value) (expr) 239# define expect(expr,value) (expr)
202# define inline_speed static
203# define inline_minimal static
204# define noinline 240# define noinline
241# if __STDC_VERSION__ < 199901L
242# define inline
243# endif
205#endif 244#endif
206 245
207#define expect_false(expr) expect ((expr) != 0, 0) 246#define expect_false(expr) expect ((expr) != 0, 0)
208#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
209 255
210#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 256#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
211#define ABSPRI(w) ((w)->priority - EV_MINPRI) 257#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
212 258
213#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 259#define EMPTY /* required for microsofts broken pseudo-c compiler */
214#define EMPTY2(a,b) /* used to suppress some warnings */ 260#define EMPTY2(a,b) /* used to suppress some warnings */
215 261
216typedef ev_watcher *W; 262typedef ev_watcher *W;
217typedef ev_watcher_list *WL; 263typedef ev_watcher_list *WL;
218typedef ev_watcher_time *WT; 264typedef ev_watcher_time *WT;
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 300ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 301{
256 alloc = cb; 302 alloc = cb;
257} 303}
258 304
259static void * 305inline_speed void *
260ev_realloc (void *ptr, long size) 306ev_realloc (void *ptr, long size)
261{ 307{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
263 309
264 if (!ptr && size) 310 if (!ptr && size)
288typedef struct 334typedef struct
289{ 335{
290 W w; 336 W w;
291 int events; 337 int events;
292} ANPENDING; 338} ANPENDING;
339
340#if EV_USE_INOTIFY
341typedef struct
342{
343 WL head;
344} ANFS;
345#endif
293 346
294#if EV_MULTIPLICITY 347#if EV_MULTIPLICITY
295 348
296 struct ev_loop 349 struct ev_loop
297 { 350 {
354{ 407{
355 return ev_rt_now; 408 return ev_rt_now;
356} 409}
357#endif 410#endif
358 411
359#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}
360 439
361#define array_needsize(type,base,cur,cnt,init) \ 440#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 441 if (expect_false ((cnt) > (cur))) \
363 { \ 442 { \
364 int newcnt = cur; \ 443 int ocur_ = (cur); \
365 do \ 444 (base) = (type *)array_realloc \
366 { \ 445 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 446 init ((base) + (ocur_), (cur) - ocur_); \
368 } \
369 while ((cnt) > newcnt); \
370 \
371 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
372 init (base + cur, newcnt - cur); \
373 cur = newcnt; \
374 } 447 }
375 448
449#if 0
376#define array_slim(type,stem) \ 450#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 451 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 452 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 453 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 454 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 455 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 456 }
457#endif
383 458
384#define array_free(stem, idx) \ 459#define array_free(stem, idx) \
385 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;
386 461
387/*****************************************************************************/ 462/*****************************************************************************/
388 463
389void noinline 464void noinline
390ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
391{ 466{
392 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
393 469
394 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
395 { 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_;
396 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
397 return;
398 } 478 }
399
400 w_->pending = ++pendingcnt [ABSPRI (w_)];
401 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
402 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
404} 479}
405 480
406void inline_size 481void inline_speed
407queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
408{ 483{
409 int i; 484 int i;
410 485
411 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
443} 518}
444 519
445void 520void
446ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 522{
523 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
449} 525}
450 526
451void inline_size 527void inline_size
452fd_reify (EV_P) 528fd_reify (EV_P)
453{ 529{
547static void noinline 623static void noinline
548fd_rearm_all (EV_P) 624fd_rearm_all (EV_P)
549{ 625{
550 int fd; 626 int fd;
551 627
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 628 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 629 if (anfds [fd].events)
555 { 630 {
556 anfds [fd].events = 0; 631 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 632 fd_change (EV_A_ fd);
563void inline_speed 638void inline_speed
564upheap (WT *heap, int k) 639upheap (WT *heap, int k)
565{ 640{
566 WT w = heap [k]; 641 WT w = heap [k];
567 642
568 while (k && heap [k >> 1]->at > w->at) 643 while (k)
569 { 644 {
645 int p = (k - 1) >> 1;
646
647 if (heap [p]->at <= w->at)
648 break;
649
570 heap [k] = heap [k >> 1]; 650 heap [k] = heap [p];
571 ((W)heap [k])->active = k + 1; 651 ((W)heap [k])->active = k + 1;
572 k >>= 1; 652 k = p;
573 } 653 }
574 654
575 heap [k] = w; 655 heap [k] = w;
576 ((W)heap [k])->active = k + 1; 656 ((W)heap [k])->active = k + 1;
577
578} 657}
579 658
580void inline_speed 659void inline_speed
581downheap (WT *heap, int N, int k) 660downheap (WT *heap, int N, int k)
582{ 661{
583 WT w = heap [k]; 662 WT w = heap [k];
584 663
585 while (k < (N >> 1)) 664 for (;;)
586 { 665 {
587 int j = k << 1; 666 int c = (k << 1) + 1;
588 667
589 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 668 if (c >= N)
590 ++j;
591
592 if (w->at <= heap [j]->at)
593 break; 669 break;
594 670
671 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
672 ? 1 : 0;
673
674 if (w->at <= heap [c]->at)
675 break;
676
595 heap [k] = heap [j]; 677 heap [k] = heap [c];
596 ((W)heap [k])->active = k + 1; 678 ((W)heap [k])->active = k + 1;
679
597 k = j; 680 k = c;
598 } 681 }
599 682
600 heap [k] = w; 683 heap [k] = w;
601 ((W)heap [k])->active = k + 1; 684 ((W)heap [k])->active = k + 1;
602} 685}
684 for (signum = signalmax; signum--; ) 767 for (signum = signalmax; signum--; )
685 if (signals [signum].gotsig) 768 if (signals [signum].gotsig)
686 ev_feed_signal_event (EV_A_ signum + 1); 769 ev_feed_signal_event (EV_A_ signum + 1);
687} 770}
688 771
689void inline_size 772void inline_speed
690fd_intern (int fd) 773fd_intern (int fd)
691{ 774{
692#ifdef _WIN32 775#ifdef _WIN32
693 int arg = 1; 776 int arg = 1;
694 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 777 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 792 ev_unref (EV_A); /* child watcher should not keep loop alive */
710} 793}
711 794
712/*****************************************************************************/ 795/*****************************************************************************/
713 796
714static ev_child *childs [PID_HASHSIZE]; 797static ev_child *childs [EV_PID_HASHSIZE];
715 798
716#ifndef _WIN32 799#ifndef _WIN32
717 800
718static ev_signal childev; 801static ev_signal childev;
802
803void inline_speed
804child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
805{
806 ev_child *w;
807
808 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
809 if (w->pid == pid || !w->pid)
810 {
811 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
812 w->rpid = pid;
813 w->rstatus = status;
814 ev_feed_event (EV_A_ (W)w, EV_CHILD);
815 }
816}
719 817
720#ifndef WCONTINUED 818#ifndef WCONTINUED
721# define WCONTINUED 0 819# define WCONTINUED 0
722#endif 820#endif
723 821
724void inline_speed
725child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
726{
727 ev_child *w;
728
729 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
730 if (w->pid == pid || !w->pid)
731 {
732 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
733 w->rpid = pid;
734 w->rstatus = status;
735 ev_feed_event (EV_A_ (W)w, EV_CHILD);
736 }
737}
738
739static void 822static void
740childcb (EV_P_ ev_signal *sw, int revents) 823childcb (EV_P_ ev_signal *sw, int revents)
741{ 824{
742 int pid, status; 825 int pid, status;
743 826
827 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
744 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 828 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
745 { 829 if (!WCONTINUED
830 || errno != EINVAL
831 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
832 return;
833
746 /* make sure we are called again until all childs have been reaped */ 834 /* make sure we are called again until all childs have been reaped */
747 /* we need to do it this way so that the callback gets called before we continue */ 835 /* we need to do it this way so that the callback gets called before we continue */
748 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 836 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
749 837
750 child_reap (EV_A_ sw, pid, pid, status); 838 child_reap (EV_A_ sw, pid, pid, status);
839 if (EV_PID_HASHSIZE > 1)
751 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 840 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
752 }
753} 841}
754 842
755#endif 843#endif
756 844
757/*****************************************************************************/ 845/*****************************************************************************/
840ev_backend (EV_P) 928ev_backend (EV_P)
841{ 929{
842 return backend; 930 return backend;
843} 931}
844 932
845static void 933unsigned int
934ev_loop_count (EV_P)
935{
936 return loop_count;
937}
938
939static void noinline
846loop_init (EV_P_ unsigned int flags) 940loop_init (EV_P_ unsigned int flags)
847{ 941{
848 if (!backend) 942 if (!backend)
849 { 943 {
850#if EV_USE_MONOTONIC 944#if EV_USE_MONOTONIC
858 ev_rt_now = ev_time (); 952 ev_rt_now = ev_time ();
859 mn_now = get_clock (); 953 mn_now = get_clock ();
860 now_floor = mn_now; 954 now_floor = mn_now;
861 rtmn_diff = ev_rt_now - mn_now; 955 rtmn_diff = ev_rt_now - mn_now;
862 956
957 /* pid check not overridable via env */
958#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid ();
961#endif
962
863 if (!(flags & EVFLAG_NOENV) 963 if (!(flags & EVFLAG_NOENV)
864 && !enable_secure () 964 && !enable_secure ()
865 && getenv ("LIBEV_FLAGS")) 965 && getenv ("LIBEV_FLAGS"))
866 flags = atoi (getenv ("LIBEV_FLAGS")); 966 flags = atoi (getenv ("LIBEV_FLAGS"));
867 967
868 if (!(flags & 0x0000ffffUL)) 968 if (!(flags & 0x0000ffffUL))
869 flags |= ev_recommended_backends (); 969 flags |= ev_recommended_backends ();
870 970
871 backend = 0; 971 backend = 0;
972 backend_fd = -1;
973#if EV_USE_INOTIFY
974 fs_fd = -2;
975#endif
976
872#if EV_USE_PORT 977#if EV_USE_PORT
873 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 978 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
874#endif 979#endif
875#if EV_USE_KQUEUE 980#if EV_USE_KQUEUE
876 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 981 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
888 ev_init (&sigev, sigcb); 993 ev_init (&sigev, sigcb);
889 ev_set_priority (&sigev, EV_MAXPRI); 994 ev_set_priority (&sigev, EV_MAXPRI);
890 } 995 }
891} 996}
892 997
893static void 998static void noinline
894loop_destroy (EV_P) 999loop_destroy (EV_P)
895{ 1000{
896 int i; 1001 int i;
1002
1003#if EV_USE_INOTIFY
1004 if (fs_fd >= 0)
1005 close (fs_fd);
1006#endif
1007
1008 if (backend_fd >= 0)
1009 close (backend_fd);
897 1010
898#if EV_USE_PORT 1011#if EV_USE_PORT
899 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1012 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
900#endif 1013#endif
901#if EV_USE_KQUEUE 1014#if EV_USE_KQUEUE
910#if EV_USE_SELECT 1023#if EV_USE_SELECT
911 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1024 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
912#endif 1025#endif
913 1026
914 for (i = NUMPRI; i--; ) 1027 for (i = NUMPRI; i--; )
1028 {
915 array_free (pending, [i]); 1029 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE
1031 array_free (idle, [i]);
1032#endif
1033 }
916 1034
917 /* have to use the microsoft-never-gets-it-right macro */ 1035 /* have to use the microsoft-never-gets-it-right macro */
918 array_free (fdchange, EMPTY0); 1036 array_free (fdchange, EMPTY);
919 array_free (timer, EMPTY0); 1037 array_free (timer, EMPTY);
920#if EV_PERIODIC_ENABLE 1038#if EV_PERIODIC_ENABLE
921 array_free (periodic, EMPTY0); 1039 array_free (periodic, EMPTY);
922#endif 1040#endif
923 array_free (idle, EMPTY0);
924 array_free (prepare, EMPTY0); 1041 array_free (prepare, EMPTY);
925 array_free (check, EMPTY0); 1042 array_free (check, EMPTY);
926 1043
927 backend = 0; 1044 backend = 0;
928} 1045}
929 1046
930static void 1047void inline_size infy_fork (EV_P);
1048
1049void inline_size
931loop_fork (EV_P) 1050loop_fork (EV_P)
932{ 1051{
933#if EV_USE_PORT 1052#if EV_USE_PORT
934 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1053 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
935#endif 1054#endif
936#if EV_USE_KQUEUE 1055#if EV_USE_KQUEUE
937 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1056 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
938#endif 1057#endif
939#if EV_USE_EPOLL 1058#if EV_USE_EPOLL
940 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1059 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1060#endif
1061#if EV_USE_INOTIFY
1062 infy_fork (EV_A);
941#endif 1063#endif
942 1064
943 if (ev_is_active (&sigev)) 1065 if (ev_is_active (&sigev))
944 { 1066 {
945 /* default loop */ 1067 /* default loop */
1061 postfork = 1; 1183 postfork = 1;
1062} 1184}
1063 1185
1064/*****************************************************************************/ 1186/*****************************************************************************/
1065 1187
1066int inline_size 1188void
1067any_pending (EV_P) 1189ev_invoke (EV_P_ void *w, int revents)
1068{ 1190{
1069 int pri; 1191 EV_CB_INVOKE ((W)w, revents);
1070
1071 for (pri = NUMPRI; pri--; )
1072 if (pendingcnt [pri])
1073 return 1;
1074
1075 return 0;
1076} 1192}
1077 1193
1078void inline_speed 1194void inline_speed
1079call_pending (EV_P) 1195call_pending (EV_P)
1080{ 1196{
1085 { 1201 {
1086 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1202 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1087 1203
1088 if (expect_true (p->w)) 1204 if (expect_true (p->w))
1089 { 1205 {
1090 assert (("non-pending watcher on pending list", p->w->pending)); 1206 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1091 1207
1092 p->w->pending = 0; 1208 p->w->pending = 0;
1093 EV_CB_INVOKE (p->w, p->events); 1209 EV_CB_INVOKE (p->w, p->events);
1094 } 1210 }
1095 } 1211 }
1098void inline_size 1214void inline_size
1099timers_reify (EV_P) 1215timers_reify (EV_P)
1100{ 1216{
1101 while (timercnt && ((WT)timers [0])->at <= mn_now) 1217 while (timercnt && ((WT)timers [0])->at <= mn_now)
1102 { 1218 {
1103 ev_timer *w = timers [0]; 1219 ev_timer *w = (ev_timer *)timers [0];
1104 1220
1105 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1221 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1106 1222
1107 /* first reschedule or stop timer */ 1223 /* first reschedule or stop timer */
1108 if (w->repeat) 1224 if (w->repeat)
1109 { 1225 {
1110 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1226 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1111 1227
1112 ((WT)w)->at += w->repeat; 1228 ((WT)w)->at += w->repeat;
1113 if (((WT)w)->at < mn_now) 1229 if (((WT)w)->at < mn_now)
1114 ((WT)w)->at = mn_now; 1230 ((WT)w)->at = mn_now;
1115 1231
1116 downheap ((WT *)timers, timercnt, 0); 1232 downheap (timers, timercnt, 0);
1117 } 1233 }
1118 else 1234 else
1119 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1235 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1120 1236
1121 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1237 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1126void inline_size 1242void inline_size
1127periodics_reify (EV_P) 1243periodics_reify (EV_P)
1128{ 1244{
1129 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1245 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1130 { 1246 {
1131 ev_periodic *w = periodics [0]; 1247 ev_periodic *w = (ev_periodic *)periodics [0];
1132 1248
1133 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1249 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1134 1250
1135 /* first reschedule or stop timer */ 1251 /* first reschedule or stop timer */
1136 if (w->reschedule_cb) 1252 if (w->reschedule_cb)
1137 { 1253 {
1138 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1254 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1139 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1255 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1140 downheap ((WT *)periodics, periodiccnt, 0); 1256 downheap (periodics, periodiccnt, 0);
1141 } 1257 }
1142 else if (w->interval) 1258 else if (w->interval)
1143 { 1259 {
1144 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1260 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1261 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1145 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1262 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1146 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1147 } 1264 }
1148 else 1265 else
1149 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1266 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1150 1267
1151 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1268 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1158 int i; 1275 int i;
1159 1276
1160 /* adjust periodics after time jump */ 1277 /* adjust periodics after time jump */
1161 for (i = 0; i < periodiccnt; ++i) 1278 for (i = 0; i < periodiccnt; ++i)
1162 { 1279 {
1163 ev_periodic *w = periodics [i]; 1280 ev_periodic *w = (ev_periodic *)periodics [i];
1164 1281
1165 if (w->reschedule_cb) 1282 if (w->reschedule_cb)
1166 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1283 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1167 else if (w->interval) 1284 else if (w->interval)
1168 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1285 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1169 } 1286 }
1170 1287
1171 /* now rebuild the heap */ 1288 /* now rebuild the heap */
1172 for (i = periodiccnt >> 1; i--; ) 1289 for (i = periodiccnt >> 1; i--; )
1173 downheap ((WT *)periodics, periodiccnt, i); 1290 downheap (periodics, periodiccnt, i);
1174} 1291}
1175#endif 1292#endif
1176 1293
1294#if EV_IDLE_ENABLE
1177int inline_size 1295void inline_size
1178time_update_monotonic (EV_P) 1296idle_reify (EV_P)
1179{ 1297{
1298 if (expect_false (idleall))
1299 {
1300 int pri;
1301
1302 for (pri = NUMPRI; pri--; )
1303 {
1304 if (pendingcnt [pri])
1305 break;
1306
1307 if (idlecnt [pri])
1308 {
1309 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1310 break;
1311 }
1312 }
1313 }
1314}
1315#endif
1316
1317void inline_speed
1318time_update (EV_P_ ev_tstamp max_block)
1319{
1320 int i;
1321
1322#if EV_USE_MONOTONIC
1323 if (expect_true (have_monotonic))
1324 {
1325 ev_tstamp odiff = rtmn_diff;
1326
1180 mn_now = get_clock (); 1327 mn_now = get_clock ();
1181 1328
1329 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1330 /* interpolate in the meantime */
1182 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1331 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1183 { 1332 {
1184 ev_rt_now = rtmn_diff + mn_now; 1333 ev_rt_now = rtmn_diff + mn_now;
1185 return 0; 1334 return;
1186 } 1335 }
1187 else 1336
1188 {
1189 now_floor = mn_now; 1337 now_floor = mn_now;
1190 ev_rt_now = ev_time (); 1338 ev_rt_now = ev_time ();
1191 return 1;
1192 }
1193}
1194 1339
1195void inline_size 1340 /* loop a few times, before making important decisions.
1196time_update (EV_P) 1341 * on the choice of "4": one iteration isn't enough,
1197{ 1342 * in case we get preempted during the calls to
1198 int i; 1343 * ev_time and get_clock. a second call is almost guaranteed
1199 1344 * to succeed in that case, though. and looping a few more times
1200#if EV_USE_MONOTONIC 1345 * doesn't hurt either as we only do this on time-jumps or
1201 if (expect_true (have_monotonic)) 1346 * in the unlikely event of having been preempted here.
1202 { 1347 */
1203 if (time_update_monotonic (EV_A)) 1348 for (i = 4; --i; )
1204 { 1349 {
1205 ev_tstamp odiff = rtmn_diff;
1206
1207 /* loop a few times, before making important decisions.
1208 * on the choice of "4": one iteration isn't enough,
1209 * in case we get preempted during the calls to
1210 * ev_time and get_clock. a second call is almost guarenteed
1211 * to succeed in that case, though. and looping a few more times
1212 * doesn't hurt either as we only do this on time-jumps or
1213 * in the unlikely event of getting preempted here.
1214 */
1215 for (i = 4; --i; )
1216 {
1217 rtmn_diff = ev_rt_now - mn_now; 1350 rtmn_diff = ev_rt_now - mn_now;
1218 1351
1219 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1352 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1220 return; /* all is well */ 1353 return; /* all is well */
1221 1354
1222 ev_rt_now = ev_time (); 1355 ev_rt_now = ev_time ();
1223 mn_now = get_clock (); 1356 mn_now = get_clock ();
1224 now_floor = mn_now; 1357 now_floor = mn_now;
1225 } 1358 }
1226 1359
1227# if EV_PERIODIC_ENABLE 1360# if EV_PERIODIC_ENABLE
1228 periodics_reschedule (EV_A); 1361 periodics_reschedule (EV_A);
1229# endif 1362# endif
1230 /* no timer adjustment, as the monotonic clock doesn't jump */ 1363 /* no timer adjustment, as the monotonic clock doesn't jump */
1231 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1364 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1232 }
1233 } 1365 }
1234 else 1366 else
1235#endif 1367#endif
1236 { 1368 {
1237 ev_rt_now = ev_time (); 1369 ev_rt_now = ev_time ();
1238 1370
1239 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1371 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1240 { 1372 {
1241#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1242 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1243#endif 1375#endif
1244
1245 /* adjust timers. this is easy, as the offset is the same for all */ 1376 /* adjust timers. this is easy, as the offset is the same for all of them */
1246 for (i = 0; i < timercnt; ++i) 1377 for (i = 0; i < timercnt; ++i)
1247 ((WT)timers [i])->at += ev_rt_now - mn_now; 1378 ((WT)timers [i])->at += ev_rt_now - mn_now;
1248 } 1379 }
1249 1380
1250 mn_now = ev_rt_now; 1381 mn_now = ev_rt_now;
1270{ 1401{
1271 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1402 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1272 ? EVUNLOOP_ONE 1403 ? EVUNLOOP_ONE
1273 : EVUNLOOP_CANCEL; 1404 : EVUNLOOP_CANCEL;
1274 1405
1275 while (activecnt) 1406 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1407
1408 do
1276 { 1409 {
1410#ifndef _WIN32
1411 if (expect_false (curpid)) /* penalise the forking check even more */
1412 if (expect_false (getpid () != curpid))
1413 {
1414 curpid = getpid ();
1415 postfork = 1;
1416 }
1417#endif
1418
1419#if EV_FORK_ENABLE
1420 /* we might have forked, so queue fork handlers */
1421 if (expect_false (postfork))
1422 if (forkcnt)
1423 {
1424 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1425 call_pending (EV_A);
1426 }
1427#endif
1428
1277 /* queue check watchers (and execute them) */ 1429 /* queue prepare watchers (and execute them) */
1278 if (expect_false (preparecnt)) 1430 if (expect_false (preparecnt))
1279 { 1431 {
1280 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1432 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1281 call_pending (EV_A); 1433 call_pending (EV_A);
1282 } 1434 }
1283 1435
1436 if (expect_false (!activecnt))
1437 break;
1438
1284 /* we might have forked, so reify kernel state if necessary */ 1439 /* we might have forked, so reify kernel state if necessary */
1285 if (expect_false (postfork)) 1440 if (expect_false (postfork))
1286 loop_fork (EV_A); 1441 loop_fork (EV_A);
1287 1442
1288 /* update fd-related kernel structures */ 1443 /* update fd-related kernel structures */
1289 fd_reify (EV_A); 1444 fd_reify (EV_A);
1290 1445
1291 /* calculate blocking time */ 1446 /* calculate blocking time */
1292 { 1447 {
1293 double block; 1448 ev_tstamp block;
1294 1449
1295 if (flags & EVLOOP_NONBLOCK || idlecnt) 1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1296 block = 0.; /* do not block at all */ 1451 block = 0.; /* do not block at all */
1297 else 1452 else
1298 { 1453 {
1299 /* update time to cancel out callback processing overhead */ 1454 /* update time to cancel out callback processing overhead */
1300#if EV_USE_MONOTONIC
1301 if (expect_true (have_monotonic))
1302 time_update_monotonic (EV_A); 1455 time_update (EV_A_ 1e100);
1303 else
1304#endif
1305 {
1306 ev_rt_now = ev_time ();
1307 mn_now = ev_rt_now;
1308 }
1309 1456
1310 block = MAX_BLOCKTIME; 1457 block = MAX_BLOCKTIME;
1311 1458
1312 if (timercnt) 1459 if (timercnt)
1313 { 1460 {
1324#endif 1471#endif
1325 1472
1326 if (expect_false (block < 0.)) block = 0.; 1473 if (expect_false (block < 0.)) block = 0.;
1327 } 1474 }
1328 1475
1476 ++loop_count;
1329 backend_poll (EV_A_ block); 1477 backend_poll (EV_A_ block);
1478
1479 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block);
1330 } 1481 }
1331
1332 /* update ev_rt_now, do magic */
1333 time_update (EV_A);
1334 1482
1335 /* queue pending timers and reschedule them */ 1483 /* queue pending timers and reschedule them */
1336 timers_reify (EV_A); /* relative timers called last */ 1484 timers_reify (EV_A); /* relative timers called last */
1337#if EV_PERIODIC_ENABLE 1485#if EV_PERIODIC_ENABLE
1338 periodics_reify (EV_A); /* absolute timers called first */ 1486 periodics_reify (EV_A); /* absolute timers called first */
1339#endif 1487#endif
1340 1488
1489#if EV_IDLE_ENABLE
1341 /* queue idle watchers unless other events are pending */ 1490 /* queue idle watchers unless other events are pending */
1342 if (idlecnt && !any_pending (EV_A)) 1491 idle_reify (EV_A);
1343 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1492#endif
1344 1493
1345 /* queue check watchers, to be executed first */ 1494 /* queue check watchers, to be executed first */
1346 if (expect_false (checkcnt)) 1495 if (expect_false (checkcnt))
1347 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1496 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1348 1497
1349 call_pending (EV_A); 1498 call_pending (EV_A);
1350 1499
1351 if (expect_false (loop_done))
1352 break;
1353 } 1500 }
1501 while (expect_true (activecnt && !loop_done));
1354 1502
1355 if (loop_done == EVUNLOOP_ONE) 1503 if (loop_done == EVUNLOOP_ONE)
1356 loop_done = EVUNLOOP_CANCEL; 1504 loop_done = EVUNLOOP_CANCEL;
1357} 1505}
1358 1506
1385 head = &(*head)->next; 1533 head = &(*head)->next;
1386 } 1534 }
1387} 1535}
1388 1536
1389void inline_speed 1537void inline_speed
1390ev_clear_pending (EV_P_ W w) 1538clear_pending (EV_P_ W w)
1391{ 1539{
1392 if (w->pending) 1540 if (w->pending)
1393 { 1541 {
1394 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1542 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1395 w->pending = 0; 1543 w->pending = 0;
1396 } 1544 }
1397} 1545}
1398 1546
1547int
1548ev_clear_pending (EV_P_ void *w)
1549{
1550 W w_ = (W)w;
1551 int pending = w_->pending;
1552
1553 if (expect_true (pending))
1554 {
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 w_->pending = 0;
1557 p->w = 0;
1558 return p->events;
1559 }
1560 else
1561 return 0;
1562}
1563
1564void inline_size
1565pri_adjust (EV_P_ W w)
1566{
1567 int pri = w->priority;
1568 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1569 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1570 w->priority = pri;
1571}
1572
1399void inline_speed 1573void inline_speed
1400ev_start (EV_P_ W w, int active) 1574ev_start (EV_P_ W w, int active)
1401{ 1575{
1402 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1576 pri_adjust (EV_A_ w);
1403 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1404
1405 w->active = active; 1577 w->active = active;
1406 ev_ref (EV_A); 1578 ev_ref (EV_A);
1407} 1579}
1408 1580
1409void inline_size 1581void inline_size
1413 w->active = 0; 1585 w->active = 0;
1414} 1586}
1415 1587
1416/*****************************************************************************/ 1588/*****************************************************************************/
1417 1589
1418void 1590void noinline
1419ev_io_start (EV_P_ ev_io *w) 1591ev_io_start (EV_P_ ev_io *w)
1420{ 1592{
1421 int fd = w->fd; 1593 int fd = w->fd;
1422 1594
1423 if (expect_false (ev_is_active (w))) 1595 if (expect_false (ev_is_active (w)))
1430 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1602 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1431 1603
1432 fd_change (EV_A_ fd); 1604 fd_change (EV_A_ fd);
1433} 1605}
1434 1606
1435void 1607void noinline
1436ev_io_stop (EV_P_ ev_io *w) 1608ev_io_stop (EV_P_ ev_io *w)
1437{ 1609{
1438 ev_clear_pending (EV_A_ (W)w); 1610 clear_pending (EV_A_ (W)w);
1439 if (expect_false (!ev_is_active (w))) 1611 if (expect_false (!ev_is_active (w)))
1440 return; 1612 return;
1441 1613
1442 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1443 1615
1445 ev_stop (EV_A_ (W)w); 1617 ev_stop (EV_A_ (W)w);
1446 1618
1447 fd_change (EV_A_ w->fd); 1619 fd_change (EV_A_ w->fd);
1448} 1620}
1449 1621
1450void 1622void noinline
1451ev_timer_start (EV_P_ ev_timer *w) 1623ev_timer_start (EV_P_ ev_timer *w)
1452{ 1624{
1453 if (expect_false (ev_is_active (w))) 1625 if (expect_false (ev_is_active (w)))
1454 return; 1626 return;
1455 1627
1456 ((WT)w)->at += mn_now; 1628 ((WT)w)->at += mn_now;
1457 1629
1458 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1630 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1459 1631
1460 ev_start (EV_A_ (W)w, ++timercnt); 1632 ev_start (EV_A_ (W)w, ++timercnt);
1461 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1633 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1462 timers [timercnt - 1] = w; 1634 timers [timercnt - 1] = (WT)w;
1463 upheap ((WT *)timers, timercnt - 1); 1635 upheap (timers, timercnt - 1);
1464 1636
1465 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1637 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1466} 1638}
1467 1639
1468void 1640void noinline
1469ev_timer_stop (EV_P_ ev_timer *w) 1641ev_timer_stop (EV_P_ ev_timer *w)
1470{ 1642{
1471 ev_clear_pending (EV_A_ (W)w); 1643 clear_pending (EV_A_ (W)w);
1472 if (expect_false (!ev_is_active (w))) 1644 if (expect_false (!ev_is_active (w)))
1473 return; 1645 return;
1474 1646
1475 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1647 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1476 1648
1649 {
1650 int active = ((W)w)->active;
1651
1477 if (expect_true (((W)w)->active < timercnt--)) 1652 if (expect_true (--active < --timercnt))
1478 { 1653 {
1479 timers [((W)w)->active - 1] = timers [timercnt]; 1654 timers [active] = timers [timercnt];
1480 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1655 adjustheap (timers, timercnt, active);
1481 } 1656 }
1657 }
1482 1658
1483 ((WT)w)->at -= mn_now; 1659 ((WT)w)->at -= mn_now;
1484 1660
1485 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1486} 1662}
1487 1663
1488void 1664void noinline
1489ev_timer_again (EV_P_ ev_timer *w) 1665ev_timer_again (EV_P_ ev_timer *w)
1490{ 1666{
1491 if (ev_is_active (w)) 1667 if (ev_is_active (w))
1492 { 1668 {
1493 if (w->repeat) 1669 if (w->repeat)
1494 { 1670 {
1495 ((WT)w)->at = mn_now + w->repeat; 1671 ((WT)w)->at = mn_now + w->repeat;
1496 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1672 adjustheap (timers, timercnt, ((W)w)->active - 1);
1497 } 1673 }
1498 else 1674 else
1499 ev_timer_stop (EV_A_ w); 1675 ev_timer_stop (EV_A_ w);
1500 } 1676 }
1501 else if (w->repeat) 1677 else if (w->repeat)
1504 ev_timer_start (EV_A_ w); 1680 ev_timer_start (EV_A_ w);
1505 } 1681 }
1506} 1682}
1507 1683
1508#if EV_PERIODIC_ENABLE 1684#if EV_PERIODIC_ENABLE
1509void 1685void noinline
1510ev_periodic_start (EV_P_ ev_periodic *w) 1686ev_periodic_start (EV_P_ ev_periodic *w)
1511{ 1687{
1512 if (expect_false (ev_is_active (w))) 1688 if (expect_false (ev_is_active (w)))
1513 return; 1689 return;
1514 1690
1516 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1692 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1517 else if (w->interval) 1693 else if (w->interval)
1518 { 1694 {
1519 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1695 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1520 /* this formula differs from the one in periodic_reify because we do not always round up */ 1696 /* this formula differs from the one in periodic_reify because we do not always round up */
1521 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1697 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1522 } 1698 }
1699 else
1700 ((WT)w)->at = w->offset;
1523 1701
1524 ev_start (EV_A_ (W)w, ++periodiccnt); 1702 ev_start (EV_A_ (W)w, ++periodiccnt);
1525 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1703 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1526 periodics [periodiccnt - 1] = w; 1704 periodics [periodiccnt - 1] = (WT)w;
1527 upheap ((WT *)periodics, periodiccnt - 1); 1705 upheap (periodics, periodiccnt - 1);
1528 1706
1529 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1707 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1530} 1708}
1531 1709
1532void 1710void noinline
1533ev_periodic_stop (EV_P_ ev_periodic *w) 1711ev_periodic_stop (EV_P_ ev_periodic *w)
1534{ 1712{
1535 ev_clear_pending (EV_A_ (W)w); 1713 clear_pending (EV_A_ (W)w);
1536 if (expect_false (!ev_is_active (w))) 1714 if (expect_false (!ev_is_active (w)))
1537 return; 1715 return;
1538 1716
1539 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1717 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1540 1718
1719 {
1720 int active = ((W)w)->active;
1721
1541 if (expect_true (((W)w)->active < periodiccnt--)) 1722 if (expect_true (--active < --periodiccnt))
1542 { 1723 {
1543 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1724 periodics [active] = periodics [periodiccnt];
1544 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1725 adjustheap (periodics, periodiccnt, active);
1545 } 1726 }
1727 }
1546 1728
1547 ev_stop (EV_A_ (W)w); 1729 ev_stop (EV_A_ (W)w);
1548} 1730}
1549 1731
1550void 1732void noinline
1551ev_periodic_again (EV_P_ ev_periodic *w) 1733ev_periodic_again (EV_P_ ev_periodic *w)
1552{ 1734{
1553 /* TODO: use adjustheap and recalculation */ 1735 /* TODO: use adjustheap and recalculation */
1554 ev_periodic_stop (EV_A_ w); 1736 ev_periodic_stop (EV_A_ w);
1555 ev_periodic_start (EV_A_ w); 1737 ev_periodic_start (EV_A_ w);
1556} 1738}
1557#endif 1739#endif
1558 1740
1559void
1560ev_idle_start (EV_P_ ev_idle *w)
1561{
1562 if (expect_false (ev_is_active (w)))
1563 return;
1564
1565 ev_start (EV_A_ (W)w, ++idlecnt);
1566 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1567 idles [idlecnt - 1] = w;
1568}
1569
1570void
1571ev_idle_stop (EV_P_ ev_idle *w)
1572{
1573 ev_clear_pending (EV_A_ (W)w);
1574 if (expect_false (!ev_is_active (w)))
1575 return;
1576
1577 {
1578 int active = ((W)w)->active;
1579 idles [active - 1] = idles [--idlecnt];
1580 ((W)idles [active - 1])->active = active;
1581 }
1582
1583 ev_stop (EV_A_ (W)w);
1584}
1585
1586void
1587ev_prepare_start (EV_P_ ev_prepare *w)
1588{
1589 if (expect_false (ev_is_active (w)))
1590 return;
1591
1592 ev_start (EV_A_ (W)w, ++preparecnt);
1593 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1594 prepares [preparecnt - 1] = w;
1595}
1596
1597void
1598ev_prepare_stop (EV_P_ ev_prepare *w)
1599{
1600 ev_clear_pending (EV_A_ (W)w);
1601 if (expect_false (!ev_is_active (w)))
1602 return;
1603
1604 {
1605 int active = ((W)w)->active;
1606 prepares [active - 1] = prepares [--preparecnt];
1607 ((W)prepares [active - 1])->active = active;
1608 }
1609
1610 ev_stop (EV_A_ (W)w);
1611}
1612
1613void
1614ev_check_start (EV_P_ ev_check *w)
1615{
1616 if (expect_false (ev_is_active (w)))
1617 return;
1618
1619 ev_start (EV_A_ (W)w, ++checkcnt);
1620 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1621 checks [checkcnt - 1] = w;
1622}
1623
1624void
1625ev_check_stop (EV_P_ ev_check *w)
1626{
1627 ev_clear_pending (EV_A_ (W)w);
1628 if (expect_false (!ev_is_active (w)))
1629 return;
1630
1631 {
1632 int active = ((W)w)->active;
1633 checks [active - 1] = checks [--checkcnt];
1634 ((W)checks [active - 1])->active = active;
1635 }
1636
1637 ev_stop (EV_A_ (W)w);
1638}
1639
1640#ifndef SA_RESTART 1741#ifndef SA_RESTART
1641# define SA_RESTART 0 1742# define SA_RESTART 0
1642#endif 1743#endif
1643 1744
1644void 1745void noinline
1645ev_signal_start (EV_P_ ev_signal *w) 1746ev_signal_start (EV_P_ ev_signal *w)
1646{ 1747{
1647#if EV_MULTIPLICITY 1748#if EV_MULTIPLICITY
1648 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1749 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1649#endif 1750#endif
1650 if (expect_false (ev_is_active (w))) 1751 if (expect_false (ev_is_active (w)))
1651 return; 1752 return;
1652 1753
1653 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1754 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1654 1755
1756 {
1757#ifndef _WIN32
1758 sigset_t full, prev;
1759 sigfillset (&full);
1760 sigprocmask (SIG_SETMASK, &full, &prev);
1761#endif
1762
1763 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1764
1765#ifndef _WIN32
1766 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif
1768 }
1769
1655 ev_start (EV_A_ (W)w, 1); 1770 ev_start (EV_A_ (W)w, 1);
1656 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1657 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1658 1772
1659 if (!((WL)w)->next) 1773 if (!((WL)w)->next)
1660 { 1774 {
1661#if _WIN32 1775#if _WIN32
1668 sigaction (w->signum, &sa, 0); 1782 sigaction (w->signum, &sa, 0);
1669#endif 1783#endif
1670 } 1784 }
1671} 1785}
1672 1786
1673void 1787void noinline
1674ev_signal_stop (EV_P_ ev_signal *w) 1788ev_signal_stop (EV_P_ ev_signal *w)
1675{ 1789{
1676 ev_clear_pending (EV_A_ (W)w); 1790 clear_pending (EV_A_ (W)w);
1677 if (expect_false (!ev_is_active (w))) 1791 if (expect_false (!ev_is_active (w)))
1678 return; 1792 return;
1679 1793
1680 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1681 ev_stop (EV_A_ (W)w); 1795 ev_stop (EV_A_ (W)w);
1692#endif 1806#endif
1693 if (expect_false (ev_is_active (w))) 1807 if (expect_false (ev_is_active (w)))
1694 return; 1808 return;
1695 1809
1696 ev_start (EV_A_ (W)w, 1); 1810 ev_start (EV_A_ (W)w, 1);
1697 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1811 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1698} 1812}
1699 1813
1700void 1814void
1701ev_child_stop (EV_P_ ev_child *w) 1815ev_child_stop (EV_P_ ev_child *w)
1702{ 1816{
1703 ev_clear_pending (EV_A_ (W)w); 1817 clear_pending (EV_A_ (W)w);
1704 if (expect_false (!ev_is_active (w))) 1818 if (expect_false (!ev_is_active (w)))
1705 return; 1819 return;
1706 1820
1707 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1822 ev_stop (EV_A_ (W)w);
1823}
1824
1825#if EV_STAT_ENABLE
1826
1827# ifdef _WIN32
1828# undef lstat
1829# define lstat(a,b) _stati64 (a,b)
1830# endif
1831
1832#define DEF_STAT_INTERVAL 5.0074891
1833#define MIN_STAT_INTERVAL 0.1074891
1834
1835static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1836
1837#if EV_USE_INOTIFY
1838# define EV_INOTIFY_BUFSIZE 8192
1839
1840static void noinline
1841infy_add (EV_P_ ev_stat *w)
1842{
1843 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);
1844
1845 if (w->wd < 0)
1846 {
1847 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1848
1849 /* monitor some parent directory for speedup hints */
1850 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1851 {
1852 char path [4096];
1853 strcpy (path, w->path);
1854
1855 do
1856 {
1857 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1858 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1859
1860 char *pend = strrchr (path, '/');
1861
1862 if (!pend)
1863 break; /* whoops, no '/', complain to your admin */
1864
1865 *pend = 0;
1866 w->wd = inotify_add_watch (fs_fd, path, mask);
1867 }
1868 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1869 }
1870 }
1871 else
1872 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1873
1874 if (w->wd >= 0)
1875 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1876}
1877
1878static void noinline
1879infy_del (EV_P_ ev_stat *w)
1880{
1881 int slot;
1882 int wd = w->wd;
1883
1884 if (wd < 0)
1885 return;
1886
1887 w->wd = -2;
1888 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1889 wlist_del (&fs_hash [slot].head, (WL)w);
1890
1891 /* remove this watcher, if others are watching it, they will rearm */
1892 inotify_rm_watch (fs_fd, wd);
1893}
1894
1895static void noinline
1896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1897{
1898 if (slot < 0)
1899 /* overflow, need to check for all hahs slots */
1900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1901 infy_wd (EV_A_ slot, wd, ev);
1902 else
1903 {
1904 WL w_;
1905
1906 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1907 {
1908 ev_stat *w = (ev_stat *)w_;
1909 w_ = w_->next; /* lets us remove this watcher and all before it */
1910
1911 if (w->wd == wd || wd == -1)
1912 {
1913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1914 {
1915 w->wd = -1;
1916 infy_add (EV_A_ w); /* re-add, no matter what */
1917 }
1918
1919 stat_timer_cb (EV_A_ &w->timer, 0);
1920 }
1921 }
1922 }
1923}
1924
1925static void
1926infy_cb (EV_P_ ev_io *w, int revents)
1927{
1928 char buf [EV_INOTIFY_BUFSIZE];
1929 struct inotify_event *ev = (struct inotify_event *)buf;
1930 int ofs;
1931 int len = read (fs_fd, buf, sizeof (buf));
1932
1933 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1934 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1935}
1936
1937void inline_size
1938infy_init (EV_P)
1939{
1940 if (fs_fd != -2)
1941 return;
1942
1943 fs_fd = inotify_init ();
1944
1945 if (fs_fd >= 0)
1946 {
1947 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1948 ev_set_priority (&fs_w, EV_MAXPRI);
1949 ev_io_start (EV_A_ &fs_w);
1950 }
1951}
1952
1953void inline_size
1954infy_fork (EV_P)
1955{
1956 int slot;
1957
1958 if (fs_fd < 0)
1959 return;
1960
1961 close (fs_fd);
1962 fs_fd = inotify_init ();
1963
1964 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1965 {
1966 WL w_ = fs_hash [slot].head;
1967 fs_hash [slot].head = 0;
1968
1969 while (w_)
1970 {
1971 ev_stat *w = (ev_stat *)w_;
1972 w_ = w_->next; /* lets us add this watcher */
1973
1974 w->wd = -1;
1975
1976 if (fs_fd >= 0)
1977 infy_add (EV_A_ w); /* re-add, no matter what */
1978 else
1979 ev_timer_start (EV_A_ &w->timer);
1980 }
1981
1982 }
1983}
1984
1985#endif
1986
1987void
1988ev_stat_stat (EV_P_ ev_stat *w)
1989{
1990 if (lstat (w->path, &w->attr) < 0)
1991 w->attr.st_nlink = 0;
1992 else if (!w->attr.st_nlink)
1993 w->attr.st_nlink = 1;
1994}
1995
1996static void noinline
1997stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1998{
1999 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2000
2001 /* we copy this here each the time so that */
2002 /* prev has the old value when the callback gets invoked */
2003 w->prev = w->attr;
2004 ev_stat_stat (EV_A_ w);
2005
2006 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2007 if (
2008 w->prev.st_dev != w->attr.st_dev
2009 || w->prev.st_ino != w->attr.st_ino
2010 || w->prev.st_mode != w->attr.st_mode
2011 || w->prev.st_nlink != w->attr.st_nlink
2012 || w->prev.st_uid != w->attr.st_uid
2013 || w->prev.st_gid != w->attr.st_gid
2014 || w->prev.st_rdev != w->attr.st_rdev
2015 || w->prev.st_size != w->attr.st_size
2016 || w->prev.st_atime != w->attr.st_atime
2017 || w->prev.st_mtime != w->attr.st_mtime
2018 || w->prev.st_ctime != w->attr.st_ctime
2019 ) {
2020 #if EV_USE_INOTIFY
2021 infy_del (EV_A_ w);
2022 infy_add (EV_A_ w);
2023 ev_stat_stat (EV_A_ w); /* avoid race... */
2024 #endif
2025
2026 ev_feed_event (EV_A_ w, EV_STAT);
2027 }
2028}
2029
2030void
2031ev_stat_start (EV_P_ ev_stat *w)
2032{
2033 if (expect_false (ev_is_active (w)))
2034 return;
2035
2036 /* since we use memcmp, we need to clear any padding data etc. */
2037 memset (&w->prev, 0, sizeof (ev_statdata));
2038 memset (&w->attr, 0, sizeof (ev_statdata));
2039
2040 ev_stat_stat (EV_A_ w);
2041
2042 if (w->interval < MIN_STAT_INTERVAL)
2043 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2044
2045 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
2046 ev_set_priority (&w->timer, ev_priority (w));
2047
2048#if EV_USE_INOTIFY
2049 infy_init (EV_A);
2050
2051 if (fs_fd >= 0)
2052 infy_add (EV_A_ w);
2053 else
2054#endif
2055 ev_timer_start (EV_A_ &w->timer);
2056
2057 ev_start (EV_A_ (W)w, 1);
2058}
2059
2060void
2061ev_stat_stop (EV_P_ ev_stat *w)
2062{
2063 clear_pending (EV_A_ (W)w);
2064 if (expect_false (!ev_is_active (w)))
2065 return;
2066
2067#if EV_USE_INOTIFY
2068 infy_del (EV_A_ w);
2069#endif
2070 ev_timer_stop (EV_A_ &w->timer);
2071
2072 ev_stop (EV_A_ (W)w);
2073}
2074#endif
2075
2076#if EV_IDLE_ENABLE
2077void
2078ev_idle_start (EV_P_ ev_idle *w)
2079{
2080 if (expect_false (ev_is_active (w)))
2081 return;
2082
2083 pri_adjust (EV_A_ (W)w);
2084
2085 {
2086 int active = ++idlecnt [ABSPRI (w)];
2087
2088 ++idleall;
2089 ev_start (EV_A_ (W)w, active);
2090
2091 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2092 idles [ABSPRI (w)][active - 1] = w;
2093 }
2094}
2095
2096void
2097ev_idle_stop (EV_P_ ev_idle *w)
2098{
2099 clear_pending (EV_A_ (W)w);
2100 if (expect_false (!ev_is_active (w)))
2101 return;
2102
2103 {
2104 int active = ((W)w)->active;
2105
2106 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2107 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2108
2109 ev_stop (EV_A_ (W)w);
2110 --idleall;
2111 }
2112}
2113#endif
2114
2115void
2116ev_prepare_start (EV_P_ ev_prepare *w)
2117{
2118 if (expect_false (ev_is_active (w)))
2119 return;
2120
2121 ev_start (EV_A_ (W)w, ++preparecnt);
2122 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2123 prepares [preparecnt - 1] = w;
2124}
2125
2126void
2127ev_prepare_stop (EV_P_ ev_prepare *w)
2128{
2129 clear_pending (EV_A_ (W)w);
2130 if (expect_false (!ev_is_active (w)))
2131 return;
2132
2133 {
2134 int active = ((W)w)->active;
2135 prepares [active - 1] = prepares [--preparecnt];
2136 ((W)prepares [active - 1])->active = active;
2137 }
2138
2139 ev_stop (EV_A_ (W)w);
2140}
2141
2142void
2143ev_check_start (EV_P_ ev_check *w)
2144{
2145 if (expect_false (ev_is_active (w)))
2146 return;
2147
2148 ev_start (EV_A_ (W)w, ++checkcnt);
2149 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2150 checks [checkcnt - 1] = w;
2151}
2152
2153void
2154ev_check_stop (EV_P_ ev_check *w)
2155{
2156 clear_pending (EV_A_ (W)w);
2157 if (expect_false (!ev_is_active (w)))
2158 return;
2159
2160 {
2161 int active = ((W)w)->active;
2162 checks [active - 1] = checks [--checkcnt];
2163 ((W)checks [active - 1])->active = active;
2164 }
2165
1708 ev_stop (EV_A_ (W)w); 2166 ev_stop (EV_A_ (W)w);
1709} 2167}
1710 2168
1711#if EV_EMBED_ENABLE 2169#if EV_EMBED_ENABLE
1712void noinline 2170void noinline
1745} 2203}
1746 2204
1747void 2205void
1748ev_embed_stop (EV_P_ ev_embed *w) 2206ev_embed_stop (EV_P_ ev_embed *w)
1749{ 2207{
1750 ev_clear_pending (EV_A_ (W)w); 2208 clear_pending (EV_A_ (W)w);
1751 if (expect_false (!ev_is_active (w))) 2209 if (expect_false (!ev_is_active (w)))
1752 return; 2210 return;
1753 2211
1754 ev_io_stop (EV_A_ &w->io); 2212 ev_io_stop (EV_A_ &w->io);
1755 2213
1756 ev_stop (EV_A_ (W)w); 2214 ev_stop (EV_A_ (W)w);
1757} 2215}
1758#endif 2216#endif
1759 2217
1760#if EV_STAT_ENABLE 2218#if EV_FORK_ENABLE
1761
1762# ifdef _WIN32
1763# define lstat(a,b) stat(a,b)
1764# endif
1765
1766void 2219void
1767ev_stat_stat (EV_P_ ev_stat *w)
1768{
1769 if (lstat (w->path, &w->attr) < 0)
1770 w->attr.st_nlink = 0;
1771 else if (!w->attr.st_nlink)
1772 w->attr.st_nlink = 1;
1773}
1774
1775static void
1776stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1777{
1778 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1779
1780 /* we copy this here each the time so that */
1781 /* prev has the old value when the callback gets invoked */
1782 w->prev = w->attr;
1783 ev_stat_stat (EV_A_ w);
1784
1785 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1786 ev_feed_event (EV_A_ w, EV_STAT);
1787}
1788
1789void
1790ev_stat_start (EV_P_ ev_stat *w) 2220ev_fork_start (EV_P_ ev_fork *w)
1791{ 2221{
1792 if (expect_false (ev_is_active (w))) 2222 if (expect_false (ev_is_active (w)))
1793 return; 2223 return;
1794 2224
1795 /* since we use memcmp, we need to clear any padding data etc. */
1796 memset (&w->prev, 0, sizeof (ev_statdata));
1797 memset (&w->attr, 0, sizeof (ev_statdata));
1798
1799 ev_stat_stat (EV_A_ w);
1800
1801 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1802 ev_set_priority (&w->timer, ev_priority (w));
1803 ev_timer_start (EV_A_ &w->timer);
1804
1805 ev_start (EV_A_ (W)w, 1); 2225 ev_start (EV_A_ (W)w, ++forkcnt);
2226 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2227 forks [forkcnt - 1] = w;
1806} 2228}
1807 2229
1808void 2230void
1809ev_stat_stop (EV_P_ ev_stat *w) 2231ev_fork_stop (EV_P_ ev_fork *w)
1810{ 2232{
1811 ev_clear_pending (EV_A_ (W)w); 2233 clear_pending (EV_A_ (W)w);
1812 if (expect_false (!ev_is_active (w))) 2234 if (expect_false (!ev_is_active (w)))
1813 return; 2235 return;
1814 2236
1815 ev_timer_stop (EV_A_ &w->timer); 2237 {
2238 int active = ((W)w)->active;
2239 forks [active - 1] = forks [--forkcnt];
2240 ((W)forks [active - 1])->active = active;
2241 }
1816 2242
1817 ev_stop (EV_A_ (W)w); 2243 ev_stop (EV_A_ (W)w);
1818} 2244}
1819#endif 2245#endif
1820 2246

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines