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

Comparing libev/ev.c (file contents):
Revision 1.151 by root, Tue Nov 27 19:59:08 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
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;
253 perror (msg); 292 perror (msg);
254 abort (); 293 abort ();
255 } 294 }
256} 295}
257 296
258static void *(*alloc)(void *ptr, size_t size) = realloc; 297static void *(*alloc)(void *ptr, long size);
259 298
260void 299void
261ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 300ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 301{
263 alloc = cb; 302 alloc = cb;
264} 303}
265 304
266inline_speed void * 305inline_speed void *
267ev_realloc (void *ptr, size_t size) 306ev_realloc (void *ptr, long size)
268{ 307{
269 ptr = alloc (ptr, size); 308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
270 309
271 if (!ptr && size) 310 if (!ptr && size)
272 { 311 {
273 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size); 312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
274 abort (); 313 abort ();
275 } 314 }
276 315
277 return ptr; 316 return ptr;
278} 317}
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{
554static void noinline 623static void noinline
555fd_rearm_all (EV_P) 624fd_rearm_all (EV_P)
556{ 625{
557 int fd; 626 int fd;
558 627
559 /* this should be highly optimised to not do anything but set a flag */
560 for (fd = 0; fd < anfdmax; ++fd) 628 for (fd = 0; fd < anfdmax; ++fd)
561 if (anfds [fd].events) 629 if (anfds [fd].events)
562 { 630 {
563 anfds [fd].events = 0; 631 anfds [fd].events = 0;
564 fd_change (EV_A_ fd); 632 fd_change (EV_A_ fd);
570void inline_speed 638void inline_speed
571upheap (WT *heap, int k) 639upheap (WT *heap, int k)
572{ 640{
573 WT w = heap [k]; 641 WT w = heap [k];
574 642
575 while (k && heap [k >> 1]->at > w->at) 643 while (k)
576 { 644 {
645 int p = (k - 1) >> 1;
646
647 if (heap [p]->at <= w->at)
648 break;
649
577 heap [k] = heap [k >> 1]; 650 heap [k] = heap [p];
578 ((W)heap [k])->active = k + 1; 651 ((W)heap [k])->active = k + 1;
579 k >>= 1; 652 k = p;
580 } 653 }
581 654
582 heap [k] = w; 655 heap [k] = w;
583 ((W)heap [k])->active = k + 1; 656 ((W)heap [k])->active = k + 1;
584
585} 657}
586 658
587void inline_speed 659void inline_speed
588downheap (WT *heap, int N, int k) 660downheap (WT *heap, int N, int k)
589{ 661{
590 WT w = heap [k]; 662 WT w = heap [k];
591 663
592 while (k < (N >> 1)) 664 for (;;)
593 { 665 {
594 int j = k << 1; 666 int c = (k << 1) + 1;
595 667
596 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 668 if (c >= N)
597 ++j;
598
599 if (w->at <= heap [j]->at)
600 break; 669 break;
601 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
602 heap [k] = heap [j]; 677 heap [k] = heap [c];
603 ((W)heap [k])->active = k + 1; 678 ((W)heap [k])->active = k + 1;
679
604 k = j; 680 k = c;
605 } 681 }
606 682
607 heap [k] = w; 683 heap [k] = w;
608 ((W)heap [k])->active = k + 1; 684 ((W)heap [k])->active = k + 1;
609} 685}
691 for (signum = signalmax; signum--; ) 767 for (signum = signalmax; signum--; )
692 if (signals [signum].gotsig) 768 if (signals [signum].gotsig)
693 ev_feed_signal_event (EV_A_ signum + 1); 769 ev_feed_signal_event (EV_A_ signum + 1);
694} 770}
695 771
696void inline_size 772void inline_speed
697fd_intern (int fd) 773fd_intern (int fd)
698{ 774{
699#ifdef _WIN32 775#ifdef _WIN32
700 int arg = 1; 776 int arg = 1;
701 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 777 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
730 ev_child *w; 806 ev_child *w;
731 807
732 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 808 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
733 if (w->pid == pid || !w->pid) 809 if (w->pid == pid || !w->pid)
734 { 810 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 811 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
736 w->rpid = pid; 812 w->rpid = pid;
737 w->rstatus = status; 813 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 814 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 815 }
740} 816}
741 817
742#ifndef WCONTINUED 818#ifndef WCONTINUED
852ev_backend (EV_P) 928ev_backend (EV_P)
853{ 929{
854 return backend; 930 return backend;
855} 931}
856 932
933unsigned int
934ev_loop_count (EV_P)
935{
936 return loop_count;
937}
938
857static void noinline 939static void noinline
858loop_init (EV_P_ unsigned int flags) 940loop_init (EV_P_ unsigned int flags)
859{ 941{
860 if (!backend) 942 if (!backend)
861 { 943 {
870 ev_rt_now = ev_time (); 952 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 953 mn_now = get_clock ();
872 now_floor = mn_now; 954 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 955 rtmn_diff = ev_rt_now - mn_now;
874 956
957 /* pid check not overridable via env */
958#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid ();
961#endif
962
875 if (!(flags & EVFLAG_NOENV) 963 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 964 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 965 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 966 flags = atoi (getenv ("LIBEV_FLAGS"));
879 967
880 if (!(flags & 0x0000ffffUL)) 968 if (!(flags & 0x0000ffffUL))
881 flags |= ev_recommended_backends (); 969 flags |= ev_recommended_backends ();
882 970
883 backend = 0; 971 backend = 0;
972 backend_fd = -1;
973#if EV_USE_INOTIFY
974 fs_fd = -2;
975#endif
976
884#if EV_USE_PORT 977#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 978 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 979#endif
887#if EV_USE_KQUEUE 980#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 981 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
905static void noinline 998static void noinline
906loop_destroy (EV_P) 999loop_destroy (EV_P)
907{ 1000{
908 int i; 1001 int i;
909 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);
1010
910#if EV_USE_PORT 1011#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1012 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 1013#endif
913#if EV_USE_KQUEUE 1014#if EV_USE_KQUEUE
914 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1015 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
922#if EV_USE_SELECT 1023#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1024 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1025#endif
925 1026
926 for (i = NUMPRI; i--; ) 1027 for (i = NUMPRI; i--; )
1028 {
927 array_free (pending, [i]); 1029 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE
1031 array_free (idle, [i]);
1032#endif
1033 }
928 1034
929 /* have to use the microsoft-never-gets-it-right macro */ 1035 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1036 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1037 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1038#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1039 array_free (periodic, EMPTY);
934#endif 1040#endif
935 array_free (idle, EMPTY0);
936 array_free (prepare, EMPTY0); 1041 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1042 array_free (check, EMPTY);
938 1043
939 backend = 0; 1044 backend = 0;
940} 1045}
1046
1047void inline_size infy_fork (EV_P);
941 1048
942void inline_size 1049void inline_size
943loop_fork (EV_P) 1050loop_fork (EV_P)
944{ 1051{
945#if EV_USE_PORT 1052#if EV_USE_PORT
948#if EV_USE_KQUEUE 1055#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1056 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1057#endif
951#if EV_USE_EPOLL 1058#if EV_USE_EPOLL
952 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);
953#endif 1063#endif
954 1064
955 if (ev_is_active (&sigev)) 1065 if (ev_is_active (&sigev))
956 { 1066 {
957 /* default loop */ 1067 /* default loop */
1073 postfork = 1; 1183 postfork = 1;
1074} 1184}
1075 1185
1076/*****************************************************************************/ 1186/*****************************************************************************/
1077 1187
1078int inline_size 1188void
1079any_pending (EV_P) 1189ev_invoke (EV_P_ void *w, int revents)
1080{ 1190{
1081 int pri; 1191 EV_CB_INVOKE ((W)w, revents);
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088} 1192}
1089 1193
1090void inline_speed 1194void inline_speed
1091call_pending (EV_P) 1195call_pending (EV_P)
1092{ 1196{
1110void inline_size 1214void inline_size
1111timers_reify (EV_P) 1215timers_reify (EV_P)
1112{ 1216{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1217 while (timercnt && ((WT)timers [0])->at <= mn_now)
1114 { 1218 {
1115 ev_timer *w = timers [0]; 1219 ev_timer *w = (ev_timer *)timers [0];
1116 1220
1117 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1221 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1222
1119 /* first reschedule or stop timer */ 1223 /* first reschedule or stop timer */
1120 if (w->repeat) 1224 if (w->repeat)
1123 1227
1124 ((WT)w)->at += w->repeat; 1228 ((WT)w)->at += w->repeat;
1125 if (((WT)w)->at < mn_now) 1229 if (((WT)w)->at < mn_now)
1126 ((WT)w)->at = mn_now; 1230 ((WT)w)->at = mn_now;
1127 1231
1128 downheap ((WT *)timers, timercnt, 0); 1232 downheap (timers, timercnt, 0);
1129 } 1233 }
1130 else 1234 else
1131 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1235 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1132 1236
1133 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1237 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1138void inline_size 1242void inline_size
1139periodics_reify (EV_P) 1243periodics_reify (EV_P)
1140{ 1244{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1245 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1142 { 1246 {
1143 ev_periodic *w = periodics [0]; 1247 ev_periodic *w = (ev_periodic *)periodics [0];
1144 1248
1145 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1249 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1250
1147 /* first reschedule or stop timer */ 1251 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1252 if (w->reschedule_cb)
1149 { 1253 {
1150 ((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);
1151 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));
1152 downheap ((WT *)periodics, periodiccnt, 0); 1256 downheap (periodics, periodiccnt, 0);
1153 } 1257 }
1154 else if (w->interval) 1258 else if (w->interval)
1155 { 1259 {
1156 ((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;
1157 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));
1158 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1159 } 1264 }
1160 else 1265 else
1161 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1266 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1162 1267
1163 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1268 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1170 int i; 1275 int i;
1171 1276
1172 /* adjust periodics after time jump */ 1277 /* adjust periodics after time jump */
1173 for (i = 0; i < periodiccnt; ++i) 1278 for (i = 0; i < periodiccnt; ++i)
1174 { 1279 {
1175 ev_periodic *w = periodics [i]; 1280 ev_periodic *w = (ev_periodic *)periodics [i];
1176 1281
1177 if (w->reschedule_cb) 1282 if (w->reschedule_cb)
1178 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1283 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1179 else if (w->interval) 1284 else if (w->interval)
1180 ((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;
1181 } 1286 }
1182 1287
1183 /* now rebuild the heap */ 1288 /* now rebuild the heap */
1184 for (i = periodiccnt >> 1; i--; ) 1289 for (i = periodiccnt >> 1; i--; )
1185 downheap ((WT *)periodics, periodiccnt, i); 1290 downheap (periodics, periodiccnt, i);
1186} 1291}
1187#endif 1292#endif
1188 1293
1294#if EV_IDLE_ENABLE
1189int inline_size 1295void inline_size
1190time_update_monotonic (EV_P) 1296idle_reify (EV_P)
1191{ 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
1192 mn_now = get_clock (); 1327 mn_now = get_clock ();
1193 1328
1329 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1330 /* interpolate in the meantime */
1194 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1331 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1195 { 1332 {
1196 ev_rt_now = rtmn_diff + mn_now; 1333 ev_rt_now = rtmn_diff + mn_now;
1197 return 0; 1334 return;
1198 } 1335 }
1199 else 1336
1200 {
1201 now_floor = mn_now; 1337 now_floor = mn_now;
1202 ev_rt_now = ev_time (); 1338 ev_rt_now = ev_time ();
1203 return 1;
1204 }
1205}
1206 1339
1207void inline_size 1340 /* loop a few times, before making important decisions.
1208time_update (EV_P) 1341 * on the choice of "4": one iteration isn't enough,
1209{ 1342 * in case we get preempted during the calls to
1210 int i; 1343 * ev_time and get_clock. a second call is almost guaranteed
1211 1344 * to succeed in that case, though. and looping a few more times
1212#if EV_USE_MONOTONIC 1345 * doesn't hurt either as we only do this on time-jumps or
1213 if (expect_true (have_monotonic)) 1346 * in the unlikely event of having been preempted here.
1214 { 1347 */
1215 if (time_update_monotonic (EV_A)) 1348 for (i = 4; --i; )
1216 { 1349 {
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; 1350 rtmn_diff = ev_rt_now - mn_now;
1230 1351
1231 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1352 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1232 return; /* all is well */ 1353 return; /* all is well */
1233 1354
1234 ev_rt_now = ev_time (); 1355 ev_rt_now = ev_time ();
1235 mn_now = get_clock (); 1356 mn_now = get_clock ();
1236 now_floor = mn_now; 1357 now_floor = mn_now;
1237 } 1358 }
1238 1359
1239# if EV_PERIODIC_ENABLE 1360# if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1361 periodics_reschedule (EV_A);
1241# endif 1362# endif
1242 /* no timer adjustment, as the monotonic clock doesn't jump */ 1363 /* no timer adjustment, as the monotonic clock doesn't jump */
1243 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1364 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1244 }
1245 } 1365 }
1246 else 1366 else
1247#endif 1367#endif
1248 { 1368 {
1249 ev_rt_now = ev_time (); 1369 ev_rt_now = ev_time ();
1250 1370
1251 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))
1252 { 1372 {
1253#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1255#endif 1375#endif
1256
1257 /* 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 */
1258 for (i = 0; i < timercnt; ++i) 1377 for (i = 0; i < timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1378 ((WT)timers [i])->at += ev_rt_now - mn_now;
1260 } 1379 }
1261 1380
1262 mn_now = ev_rt_now; 1381 mn_now = ev_rt_now;
1282{ 1401{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1402 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1284 ? EVUNLOOP_ONE 1403 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL; 1404 : EVUNLOOP_CANCEL;
1286 1405
1287 while (activecnt) 1406 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1407
1408 do
1288 { 1409 {
1289 /* we might have forked, so reify kernel state if necessary */ 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
1290 #if EV_FORK_ENABLE 1419#if EV_FORK_ENABLE
1420 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1421 if (expect_false (postfork))
1292 if (forkcnt) 1422 if (forkcnt)
1293 { 1423 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1424 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1425 call_pending (EV_A);
1296 } 1426 }
1297 #endif 1427#endif
1298 1428
1299 /* queue check watchers (and execute them) */ 1429 /* queue prepare watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1430 if (expect_false (preparecnt))
1301 { 1431 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1432 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1433 call_pending (EV_A);
1304 } 1434 }
1305 1435
1436 if (expect_false (!activecnt))
1437 break;
1438
1306 /* we might have forked, so reify kernel state if necessary */ 1439 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1440 if (expect_false (postfork))
1308 loop_fork (EV_A); 1441 loop_fork (EV_A);
1309 1442
1310 /* update fd-related kernel structures */ 1443 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1444 fd_reify (EV_A);
1312 1445
1313 /* calculate blocking time */ 1446 /* calculate blocking time */
1314 { 1447 {
1315 double block; 1448 ev_tstamp block;
1316 1449
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1318 block = 0.; /* do not block at all */ 1451 block = 0.; /* do not block at all */
1319 else 1452 else
1320 { 1453 {
1321 /* update time to cancel out callback processing overhead */ 1454 /* 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); 1455 time_update (EV_A_ 1e100);
1325 else
1326#endif
1327 {
1328 ev_rt_now = ev_time ();
1329 mn_now = ev_rt_now;
1330 }
1331 1456
1332 block = MAX_BLOCKTIME; 1457 block = MAX_BLOCKTIME;
1333 1458
1334 if (timercnt) 1459 if (timercnt)
1335 { 1460 {
1346#endif 1471#endif
1347 1472
1348 if (expect_false (block < 0.)) block = 0.; 1473 if (expect_false (block < 0.)) block = 0.;
1349 } 1474 }
1350 1475
1476 ++loop_count;
1351 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);
1352 } 1481 }
1353
1354 /* update ev_rt_now, do magic */
1355 time_update (EV_A);
1356 1482
1357 /* queue pending timers and reschedule them */ 1483 /* queue pending timers and reschedule them */
1358 timers_reify (EV_A); /* relative timers called last */ 1484 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1485#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1486 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1487#endif
1362 1488
1489#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1490 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1491 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1492#endif
1366 1493
1367 /* queue check watchers, to be executed first */ 1494 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1495 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1496 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1497
1371 call_pending (EV_A); 1498 call_pending (EV_A);
1372 1499
1373 if (expect_false (loop_done))
1374 break;
1375 } 1500 }
1501 while (expect_true (activecnt && !loop_done));
1376 1502
1377 if (loop_done == EVUNLOOP_ONE) 1503 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1504 loop_done = EVUNLOOP_CANCEL;
1379} 1505}
1380 1506
1407 head = &(*head)->next; 1533 head = &(*head)->next;
1408 } 1534 }
1409} 1535}
1410 1536
1411void inline_speed 1537void inline_speed
1412ev_clear_pending (EV_P_ W w) 1538clear_pending (EV_P_ W w)
1413{ 1539{
1414 if (w->pending) 1540 if (w->pending)
1415 { 1541 {
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1542 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1543 w->pending = 0;
1418 } 1544 }
1419} 1545}
1420 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
1421void inline_speed 1573void inline_speed
1422ev_start (EV_P_ W w, int active) 1574ev_start (EV_P_ W w, int active)
1423{ 1575{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1576 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1577 w->active = active;
1428 ev_ref (EV_A); 1578 ev_ref (EV_A);
1429} 1579}
1430 1580
1431void inline_size 1581void inline_size
1435 w->active = 0; 1585 w->active = 0;
1436} 1586}
1437 1587
1438/*****************************************************************************/ 1588/*****************************************************************************/
1439 1589
1440void 1590void noinline
1441ev_io_start (EV_P_ ev_io *w) 1591ev_io_start (EV_P_ ev_io *w)
1442{ 1592{
1443 int fd = w->fd; 1593 int fd = w->fd;
1444 1594
1445 if (expect_false (ev_is_active (w))) 1595 if (expect_false (ev_is_active (w)))
1452 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1602 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1453 1603
1454 fd_change (EV_A_ fd); 1604 fd_change (EV_A_ fd);
1455} 1605}
1456 1606
1457void 1607void noinline
1458ev_io_stop (EV_P_ ev_io *w) 1608ev_io_stop (EV_P_ ev_io *w)
1459{ 1609{
1460 ev_clear_pending (EV_A_ (W)w); 1610 clear_pending (EV_A_ (W)w);
1461 if (expect_false (!ev_is_active (w))) 1611 if (expect_false (!ev_is_active (w)))
1462 return; 1612 return;
1463 1613
1464 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));
1465 1615
1467 ev_stop (EV_A_ (W)w); 1617 ev_stop (EV_A_ (W)w);
1468 1618
1469 fd_change (EV_A_ w->fd); 1619 fd_change (EV_A_ w->fd);
1470} 1620}
1471 1621
1472void 1622void noinline
1473ev_timer_start (EV_P_ ev_timer *w) 1623ev_timer_start (EV_P_ ev_timer *w)
1474{ 1624{
1475 if (expect_false (ev_is_active (w))) 1625 if (expect_false (ev_is_active (w)))
1476 return; 1626 return;
1477 1627
1478 ((WT)w)->at += mn_now; 1628 ((WT)w)->at += mn_now;
1479 1629
1480 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.));
1481 1631
1482 ev_start (EV_A_ (W)w, ++timercnt); 1632 ev_start (EV_A_ (W)w, ++timercnt);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1633 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1484 timers [timercnt - 1] = w; 1634 timers [timercnt - 1] = (WT)w;
1485 upheap ((WT *)timers, timercnt - 1); 1635 upheap (timers, timercnt - 1);
1486 1636
1487 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1637 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1488} 1638}
1489 1639
1490void 1640void noinline
1491ev_timer_stop (EV_P_ ev_timer *w) 1641ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1642{
1493 ev_clear_pending (EV_A_ (W)w); 1643 clear_pending (EV_A_ (W)w);
1494 if (expect_false (!ev_is_active (w))) 1644 if (expect_false (!ev_is_active (w)))
1495 return; 1645 return;
1496 1646
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1647 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1498 1648
1499 { 1649 {
1500 int active = ((W)w)->active; 1650 int active = ((W)w)->active;
1501 1651
1502 if (expect_true (--active < --timercnt)) 1652 if (expect_true (--active < --timercnt))
1503 { 1653 {
1504 timers [active] = timers [timercnt]; 1654 timers [active] = timers [timercnt];
1505 adjustheap ((WT *)timers, timercnt, active); 1655 adjustheap (timers, timercnt, active);
1506 } 1656 }
1507 } 1657 }
1508 1658
1509 ((WT)w)->at -= mn_now; 1659 ((WT)w)->at -= mn_now;
1510 1660
1511 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1512} 1662}
1513 1663
1514void 1664void noinline
1515ev_timer_again (EV_P_ ev_timer *w) 1665ev_timer_again (EV_P_ ev_timer *w)
1516{ 1666{
1517 if (ev_is_active (w)) 1667 if (ev_is_active (w))
1518 { 1668 {
1519 if (w->repeat) 1669 if (w->repeat)
1520 { 1670 {
1521 ((WT)w)->at = mn_now + w->repeat; 1671 ((WT)w)->at = mn_now + w->repeat;
1522 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1672 adjustheap (timers, timercnt, ((W)w)->active - 1);
1523 } 1673 }
1524 else 1674 else
1525 ev_timer_stop (EV_A_ w); 1675 ev_timer_stop (EV_A_ w);
1526 } 1676 }
1527 else if (w->repeat) 1677 else if (w->repeat)
1530 ev_timer_start (EV_A_ w); 1680 ev_timer_start (EV_A_ w);
1531 } 1681 }
1532} 1682}
1533 1683
1534#if EV_PERIODIC_ENABLE 1684#if EV_PERIODIC_ENABLE
1535void 1685void noinline
1536ev_periodic_start (EV_P_ ev_periodic *w) 1686ev_periodic_start (EV_P_ ev_periodic *w)
1537{ 1687{
1538 if (expect_false (ev_is_active (w))) 1688 if (expect_false (ev_is_active (w)))
1539 return; 1689 return;
1540 1690
1542 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1692 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1543 else if (w->interval) 1693 else if (w->interval)
1544 { 1694 {
1545 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.));
1546 /* 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 */
1547 ((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;
1548 } 1698 }
1699 else
1700 ((WT)w)->at = w->offset;
1549 1701
1550 ev_start (EV_A_ (W)w, ++periodiccnt); 1702 ev_start (EV_A_ (W)w, ++periodiccnt);
1551 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1703 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1552 periodics [periodiccnt - 1] = w; 1704 periodics [periodiccnt - 1] = (WT)w;
1553 upheap ((WT *)periodics, periodiccnt - 1); 1705 upheap (periodics, periodiccnt - 1);
1554 1706
1555 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1707 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1556} 1708}
1557 1709
1558void 1710void noinline
1559ev_periodic_stop (EV_P_ ev_periodic *w) 1711ev_periodic_stop (EV_P_ ev_periodic *w)
1560{ 1712{
1561 ev_clear_pending (EV_A_ (W)w); 1713 clear_pending (EV_A_ (W)w);
1562 if (expect_false (!ev_is_active (w))) 1714 if (expect_false (!ev_is_active (w)))
1563 return; 1715 return;
1564 1716
1565 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1717 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1566 1718
1567 { 1719 {
1568 int active = ((W)w)->active; 1720 int active = ((W)w)->active;
1569 1721
1570 if (expect_true (--active < --periodiccnt)) 1722 if (expect_true (--active < --periodiccnt))
1571 { 1723 {
1572 periodics [active] = periodics [periodiccnt]; 1724 periodics [active] = periodics [periodiccnt];
1573 adjustheap ((WT *)periodics, periodiccnt, active); 1725 adjustheap (periodics, periodiccnt, active);
1574 } 1726 }
1575 } 1727 }
1576 1728
1577 ev_stop (EV_A_ (W)w); 1729 ev_stop (EV_A_ (W)w);
1578} 1730}
1579 1731
1580void 1732void noinline
1581ev_periodic_again (EV_P_ ev_periodic *w) 1733ev_periodic_again (EV_P_ ev_periodic *w)
1582{ 1734{
1583 /* TODO: use adjustheap and recalculation */ 1735 /* TODO: use adjustheap and recalculation */
1584 ev_periodic_stop (EV_A_ w); 1736 ev_periodic_stop (EV_A_ w);
1585 ev_periodic_start (EV_A_ w); 1737 ev_periodic_start (EV_A_ w);
1588 1740
1589#ifndef SA_RESTART 1741#ifndef SA_RESTART
1590# define SA_RESTART 0 1742# define SA_RESTART 0
1591#endif 1743#endif
1592 1744
1593void 1745void noinline
1594ev_signal_start (EV_P_ ev_signal *w) 1746ev_signal_start (EV_P_ ev_signal *w)
1595{ 1747{
1596#if EV_MULTIPLICITY 1748#if EV_MULTIPLICITY
1597 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));
1598#endif 1750#endif
1599 if (expect_false (ev_is_active (w))) 1751 if (expect_false (ev_is_active (w)))
1600 return; 1752 return;
1601 1753
1602 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));
1603 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
1604 ev_start (EV_A_ (W)w, 1); 1770 ev_start (EV_A_ (W)w, 1);
1605 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1606 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1607 1772
1608 if (!((WL)w)->next) 1773 if (!((WL)w)->next)
1609 { 1774 {
1610#if _WIN32 1775#if _WIN32
1617 sigaction (w->signum, &sa, 0); 1782 sigaction (w->signum, &sa, 0);
1618#endif 1783#endif
1619 } 1784 }
1620} 1785}
1621 1786
1622void 1787void noinline
1623ev_signal_stop (EV_P_ ev_signal *w) 1788ev_signal_stop (EV_P_ ev_signal *w)
1624{ 1789{
1625 ev_clear_pending (EV_A_ (W)w); 1790 clear_pending (EV_A_ (W)w);
1626 if (expect_false (!ev_is_active (w))) 1791 if (expect_false (!ev_is_active (w)))
1627 return; 1792 return;
1628 1793
1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1630 ev_stop (EV_A_ (W)w); 1795 ev_stop (EV_A_ (W)w);
1647} 1812}
1648 1813
1649void 1814void
1650ev_child_stop (EV_P_ ev_child *w) 1815ev_child_stop (EV_P_ ev_child *w)
1651{ 1816{
1652 ev_clear_pending (EV_A_ (W)w); 1817 clear_pending (EV_A_ (W)w);
1653 if (expect_false (!ev_is_active (w))) 1818 if (expect_false (!ev_is_active (w)))
1654 return; 1819 return;
1655 1820
1656 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1657 ev_stop (EV_A_ (W)w); 1822 ev_stop (EV_A_ (W)w);
1665# endif 1830# endif
1666 1831
1667#define DEF_STAT_INTERVAL 5.0074891 1832#define DEF_STAT_INTERVAL 5.0074891
1668#define MIN_STAT_INTERVAL 0.1074891 1833#define MIN_STAT_INTERVAL 0.1074891
1669 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
1670void 1987void
1671ev_stat_stat (EV_P_ ev_stat *w) 1988ev_stat_stat (EV_P_ ev_stat *w)
1672{ 1989{
1673 if (lstat (w->path, &w->attr) < 0) 1990 if (lstat (w->path, &w->attr) < 0)
1674 w->attr.st_nlink = 0; 1991 w->attr.st_nlink = 0;
1675 else if (!w->attr.st_nlink) 1992 else if (!w->attr.st_nlink)
1676 w->attr.st_nlink = 1; 1993 w->attr.st_nlink = 1;
1677} 1994}
1678 1995
1679static void 1996static void noinline
1680stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1997stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1681{ 1998{
1682 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1999 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1683 2000
1684 /* we copy this here each the time so that */ 2001 /* we copy this here each the time so that */
1685 /* prev has the old value when the callback gets invoked */ 2002 /* prev has the old value when the callback gets invoked */
1686 w->prev = w->attr; 2003 w->prev = w->attr;
1687 ev_stat_stat (EV_A_ w); 2004 ev_stat_stat (EV_A_ w);
1688 2005
1689 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 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
1690 ev_feed_event (EV_A_ w, EV_STAT); 2026 ev_feed_event (EV_A_ w, EV_STAT);
2027 }
1691} 2028}
1692 2029
1693void 2030void
1694ev_stat_start (EV_P_ ev_stat *w) 2031ev_stat_start (EV_P_ ev_stat *w)
1695{ 2032{
1705 if (w->interval < MIN_STAT_INTERVAL) 2042 if (w->interval < MIN_STAT_INTERVAL)
1706 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2043 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1707 2044
1708 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2045 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1709 ev_set_priority (&w->timer, ev_priority (w)); 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
1710 ev_timer_start (EV_A_ &w->timer); 2055 ev_timer_start (EV_A_ &w->timer);
1711 2056
1712 ev_start (EV_A_ (W)w, 1); 2057 ev_start (EV_A_ (W)w, 1);
1713} 2058}
1714 2059
1715void 2060void
1716ev_stat_stop (EV_P_ ev_stat *w) 2061ev_stat_stop (EV_P_ ev_stat *w)
1717{ 2062{
1718 ev_clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1719 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1720 return; 2065 return;
1721 2066
2067#if EV_USE_INOTIFY
2068 infy_del (EV_A_ w);
2069#endif
1722 ev_timer_stop (EV_A_ &w->timer); 2070 ev_timer_stop (EV_A_ &w->timer);
1723 2071
1724 ev_stop (EV_A_ (W)w); 2072 ev_stop (EV_A_ (W)w);
1725} 2073}
1726#endif 2074#endif
1727 2075
2076#if EV_IDLE_ENABLE
1728void 2077void
1729ev_idle_start (EV_P_ ev_idle *w) 2078ev_idle_start (EV_P_ ev_idle *w)
1730{ 2079{
1731 if (expect_false (ev_is_active (w))) 2080 if (expect_false (ev_is_active (w)))
1732 return; 2081 return;
1733 2082
2083 pri_adjust (EV_A_ (W)w);
2084
2085 {
2086 int active = ++idlecnt [ABSPRI (w)];
2087
2088 ++idleall;
1734 ev_start (EV_A_ (W)w, ++idlecnt); 2089 ev_start (EV_A_ (W)w, active);
2090
1735 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2091 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1736 idles [idlecnt - 1] = w; 2092 idles [ABSPRI (w)][active - 1] = w;
2093 }
1737} 2094}
1738 2095
1739void 2096void
1740ev_idle_stop (EV_P_ ev_idle *w) 2097ev_idle_stop (EV_P_ ev_idle *w)
1741{ 2098{
1742 ev_clear_pending (EV_A_ (W)w); 2099 clear_pending (EV_A_ (W)w);
1743 if (expect_false (!ev_is_active (w))) 2100 if (expect_false (!ev_is_active (w)))
1744 return; 2101 return;
1745 2102
1746 { 2103 {
1747 int active = ((W)w)->active; 2104 int active = ((W)w)->active;
1748 idles [active - 1] = idles [--idlecnt]; 2105
2106 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1749 ((W)idles [active - 1])->active = active; 2107 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2108
2109 ev_stop (EV_A_ (W)w);
2110 --idleall;
1750 } 2111 }
1751
1752 ev_stop (EV_A_ (W)w);
1753} 2112}
2113#endif
1754 2114
1755void 2115void
1756ev_prepare_start (EV_P_ ev_prepare *w) 2116ev_prepare_start (EV_P_ ev_prepare *w)
1757{ 2117{
1758 if (expect_false (ev_is_active (w))) 2118 if (expect_false (ev_is_active (w)))
1764} 2124}
1765 2125
1766void 2126void
1767ev_prepare_stop (EV_P_ ev_prepare *w) 2127ev_prepare_stop (EV_P_ ev_prepare *w)
1768{ 2128{
1769 ev_clear_pending (EV_A_ (W)w); 2129 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 2130 if (expect_false (!ev_is_active (w)))
1771 return; 2131 return;
1772 2132
1773 { 2133 {
1774 int active = ((W)w)->active; 2134 int active = ((W)w)->active;
1791} 2151}
1792 2152
1793void 2153void
1794ev_check_stop (EV_P_ ev_check *w) 2154ev_check_stop (EV_P_ ev_check *w)
1795{ 2155{
1796 ev_clear_pending (EV_A_ (W)w); 2156 clear_pending (EV_A_ (W)w);
1797 if (expect_false (!ev_is_active (w))) 2157 if (expect_false (!ev_is_active (w)))
1798 return; 2158 return;
1799 2159
1800 { 2160 {
1801 int active = ((W)w)->active; 2161 int active = ((W)w)->active;
1843} 2203}
1844 2204
1845void 2205void
1846ev_embed_stop (EV_P_ ev_embed *w) 2206ev_embed_stop (EV_P_ ev_embed *w)
1847{ 2207{
1848 ev_clear_pending (EV_A_ (W)w); 2208 clear_pending (EV_A_ (W)w);
1849 if (expect_false (!ev_is_active (w))) 2209 if (expect_false (!ev_is_active (w)))
1850 return; 2210 return;
1851 2211
1852 ev_io_stop (EV_A_ &w->io); 2212 ev_io_stop (EV_A_ &w->io);
1853 2213
1868} 2228}
1869 2229
1870void 2230void
1871ev_fork_stop (EV_P_ ev_fork *w) 2231ev_fork_stop (EV_P_ ev_fork *w)
1872{ 2232{
1873 ev_clear_pending (EV_A_ (W)w); 2233 clear_pending (EV_A_ (W)w);
1874 if (expect_false (!ev_is_active (w))) 2234 if (expect_false (!ev_is_active (w)))
1875 return; 2235 return;
1876 2236
1877 { 2237 {
1878 int active = ((W)w)->active; 2238 int active = ((W)w)->active;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines