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

Comparing libev/ev.c (file contents):
Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC vs.
Revision 1.180 by root, Tue Dec 11 22:04:55 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines