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.178 by root, Tue Dec 11 18:36:11 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_size
414queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
415{ 483{
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);
691 for (signum = signalmax; signum--; ) 759 for (signum = signalmax; signum--; )
692 if (signals [signum].gotsig) 760 if (signals [signum].gotsig)
693 ev_feed_signal_event (EV_A_ signum + 1); 761 ev_feed_signal_event (EV_A_ signum + 1);
694} 762}
695 763
696void inline_size 764void inline_speed
697fd_intern (int fd) 765fd_intern (int fd)
698{ 766{
699#ifdef _WIN32 767#ifdef _WIN32
700 int arg = 1; 768 int arg = 1;
701 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 769 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
730 ev_child *w; 798 ev_child *w;
731 799
732 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 800 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
733 if (w->pid == pid || !w->pid) 801 if (w->pid == pid || !w->pid)
734 { 802 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 803 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
736 w->rpid = pid; 804 w->rpid = pid;
737 w->rstatus = status; 805 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 806 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 807 }
740} 808}
741 809
742#ifndef WCONTINUED 810#ifndef WCONTINUED
852ev_backend (EV_P) 920ev_backend (EV_P)
853{ 921{
854 return backend; 922 return backend;
855} 923}
856 924
857static void 925unsigned int
926ev_loop_count (EV_P)
927{
928 return loop_count;
929}
930
931static void noinline
858loop_init (EV_P_ unsigned int flags) 932loop_init (EV_P_ unsigned int flags)
859{ 933{
860 if (!backend) 934 if (!backend)
861 { 935 {
862#if EV_USE_MONOTONIC 936#if EV_USE_MONOTONIC
870 ev_rt_now = ev_time (); 944 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 945 mn_now = get_clock ();
872 now_floor = mn_now; 946 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 947 rtmn_diff = ev_rt_now - mn_now;
874 948
949 /* pid check not overridable via env */
950#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid ();
953#endif
954
875 if (!(flags & EVFLAG_NOENV) 955 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 956 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 957 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 958 flags = atoi (getenv ("LIBEV_FLAGS"));
879 959
880 if (!(flags & 0x0000ffffUL)) 960 if (!(flags & 0x0000ffffUL))
881 flags |= ev_recommended_backends (); 961 flags |= ev_recommended_backends ();
882 962
883 backend = 0; 963 backend = 0;
964 backend_fd = -1;
965#if EV_USE_INOTIFY
966 fs_fd = -2;
967#endif
968
884#if EV_USE_PORT 969#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 970 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 971#endif
887#if EV_USE_KQUEUE 972#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 973 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
900 ev_init (&sigev, sigcb); 985 ev_init (&sigev, sigcb);
901 ev_set_priority (&sigev, EV_MAXPRI); 986 ev_set_priority (&sigev, EV_MAXPRI);
902 } 987 }
903} 988}
904 989
905static void 990static void noinline
906loop_destroy (EV_P) 991loop_destroy (EV_P)
907{ 992{
908 int i; 993 int i;
994
995#if EV_USE_INOTIFY
996 if (fs_fd >= 0)
997 close (fs_fd);
998#endif
999
1000 if (backend_fd >= 0)
1001 close (backend_fd);
909 1002
910#if EV_USE_PORT 1003#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1004 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 1005#endif
913#if EV_USE_KQUEUE 1006#if EV_USE_KQUEUE
922#if EV_USE_SELECT 1015#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1016 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1017#endif
925 1018
926 for (i = NUMPRI; i--; ) 1019 for (i = NUMPRI; i--; )
1020 {
927 array_free (pending, [i]); 1021 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE
1023 array_free (idle, [i]);
1024#endif
1025 }
928 1026
929 /* have to use the microsoft-never-gets-it-right macro */ 1027 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1028 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1029 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1030#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1031 array_free (periodic, EMPTY);
934#endif 1032#endif
935 array_free (idle, EMPTY0);
936 array_free (prepare, EMPTY0); 1033 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1034 array_free (check, EMPTY);
938 1035
939 backend = 0; 1036 backend = 0;
940} 1037}
941 1038
942static void 1039void inline_size infy_fork (EV_P);
1040
1041void inline_size
943loop_fork (EV_P) 1042loop_fork (EV_P)
944{ 1043{
945#if EV_USE_PORT 1044#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1045 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 1046#endif
948#if EV_USE_KQUEUE 1047#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1048 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1049#endif
951#if EV_USE_EPOLL 1050#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1051 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1052#endif
1053#if EV_USE_INOTIFY
1054 infy_fork (EV_A);
953#endif 1055#endif
954 1056
955 if (ev_is_active (&sigev)) 1057 if (ev_is_active (&sigev))
956 { 1058 {
957 /* default loop */ 1059 /* default loop */
1073 postfork = 1; 1175 postfork = 1;
1074} 1176}
1075 1177
1076/*****************************************************************************/ 1178/*****************************************************************************/
1077 1179
1078int inline_size 1180void
1079any_pending (EV_P) 1181ev_invoke (EV_P_ void *w, int revents)
1080{ 1182{
1081 int pri; 1183 EV_CB_INVOKE ((W)w, revents);
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088} 1184}
1089 1185
1090void inline_speed 1186void inline_speed
1091call_pending (EV_P) 1187call_pending (EV_P)
1092{ 1188{
1097 { 1193 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1194 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1195
1100 if (expect_true (p->w)) 1196 if (expect_true (p->w))
1101 { 1197 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1198 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1199
1104 p->w->pending = 0; 1200 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1201 EV_CB_INVOKE (p->w, p->events);
1106 } 1202 }
1107 } 1203 }
1112{ 1208{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1209 while (timercnt && ((WT)timers [0])->at <= mn_now)
1114 { 1210 {
1115 ev_timer *w = timers [0]; 1211 ev_timer *w = timers [0];
1116 1212
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1214
1119 /* first reschedule or stop timer */ 1215 /* first reschedule or stop timer */
1120 if (w->repeat) 1216 if (w->repeat)
1121 { 1217 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1218 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1140{ 1236{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1142 { 1238 {
1143 ev_periodic *w = periodics [0]; 1239 ev_periodic *w = periodics [0];
1144 1240
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1242
1147 /* first reschedule or stop timer */ 1243 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1244 if (w->reschedule_cb)
1149 { 1245 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1246 ((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)); 1247 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1152 downheap ((WT *)periodics, periodiccnt, 0); 1248 downheap ((WT *)periodics, periodiccnt, 0);
1153 } 1249 }
1154 else if (w->interval) 1250 else if (w->interval)
1155 { 1251 {
1156 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1252 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1253 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)); 1254 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); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1159 } 1256 }
1160 else 1257 else
1161 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1175 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1176 1273
1177 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1178 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1179 else if (w->interval) 1276 else if (w->interval)
1180 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1181 } 1278 }
1182 1279
1183 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1184 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1185 downheap ((WT *)periodics, periodiccnt, i); 1282 downheap ((WT *)periodics, periodiccnt, i);
1186} 1283}
1187#endif 1284#endif
1188 1285
1286#if EV_IDLE_ENABLE
1189int inline_size 1287void inline_size
1190time_update_monotonic (EV_P) 1288idle_reify (EV_P)
1191{ 1289{
1290 if (expect_false (idleall))
1291 {
1292 int pri;
1293
1294 for (pri = NUMPRI; pri--; )
1295 {
1296 if (pendingcnt [pri])
1297 break;
1298
1299 if (idlecnt [pri])
1300 {
1301 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1302 break;
1303 }
1304 }
1305 }
1306}
1307#endif
1308
1309void inline_speed
1310time_update (EV_P_ ev_tstamp max_block)
1311{
1312 int i;
1313
1314#if EV_USE_MONOTONIC
1315 if (expect_true (have_monotonic))
1316 {
1317 ev_tstamp odiff = rtmn_diff;
1318
1192 mn_now = get_clock (); 1319 mn_now = get_clock ();
1193 1320
1321 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1322 /* interpolate in the meantime */
1194 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1323 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1195 { 1324 {
1196 ev_rt_now = rtmn_diff + mn_now; 1325 ev_rt_now = rtmn_diff + mn_now;
1197 return 0; 1326 return;
1198 } 1327 }
1199 else 1328
1200 {
1201 now_floor = mn_now; 1329 now_floor = mn_now;
1202 ev_rt_now = ev_time (); 1330 ev_rt_now = ev_time ();
1203 return 1;
1204 }
1205}
1206 1331
1207void inline_size 1332 /* loop a few times, before making important decisions.
1208time_update (EV_P) 1333 * on the choice of "4": one iteration isn't enough,
1209{ 1334 * in case we get preempted during the calls to
1210 int i; 1335 * ev_time and get_clock. a second call is almost guaranteed
1211 1336 * to succeed in that case, though. and looping a few more times
1212#if EV_USE_MONOTONIC 1337 * doesn't hurt either as we only do this on time-jumps or
1213 if (expect_true (have_monotonic)) 1338 * in the unlikely event of having been preempted here.
1214 { 1339 */
1215 if (time_update_monotonic (EV_A)) 1340 for (i = 4; --i; )
1216 { 1341 {
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; 1342 rtmn_diff = ev_rt_now - mn_now;
1230 1343
1231 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1344 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1232 return; /* all is well */ 1345 return; /* all is well */
1233 1346
1234 ev_rt_now = ev_time (); 1347 ev_rt_now = ev_time ();
1235 mn_now = get_clock (); 1348 mn_now = get_clock ();
1236 now_floor = mn_now; 1349 now_floor = mn_now;
1237 } 1350 }
1238 1351
1239# if EV_PERIODIC_ENABLE 1352# if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1353 periodics_reschedule (EV_A);
1241# endif 1354# endif
1242 /* no timer adjustment, as the monotonic clock doesn't jump */ 1355 /* no timer adjustment, as the monotonic clock doesn't jump */
1243 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1356 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1244 }
1245 } 1357 }
1246 else 1358 else
1247#endif 1359#endif
1248 { 1360 {
1249 ev_rt_now = ev_time (); 1361 ev_rt_now = ev_time ();
1250 1362
1251 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1363 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1252 { 1364 {
1253#if EV_PERIODIC_ENABLE 1365#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1366 periodics_reschedule (EV_A);
1255#endif 1367#endif
1256
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1368 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1369 for (i = 0; i < timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1370 ((WT)timers [i])->at += ev_rt_now - mn_now;
1260 } 1371 }
1261 1372
1262 mn_now = ev_rt_now; 1373 mn_now = ev_rt_now;
1282{ 1393{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1394 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1284 ? EVUNLOOP_ONE 1395 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL; 1396 : EVUNLOOP_CANCEL;
1286 1397
1287 while (activecnt) 1398 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1399
1400 do
1288 { 1401 {
1289 /* we might have forked, so reify kernel state if necessary */ 1402#ifndef _WIN32
1403 if (expect_false (curpid)) /* penalise the forking check even more */
1404 if (expect_false (getpid () != curpid))
1405 {
1406 curpid = getpid ();
1407 postfork = 1;
1408 }
1409#endif
1410
1290 #if EV_FORK_ENABLE 1411#if EV_FORK_ENABLE
1412 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1413 if (expect_false (postfork))
1292 if (forkcnt) 1414 if (forkcnt)
1293 { 1415 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1416 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1417 call_pending (EV_A);
1296 } 1418 }
1297 #endif 1419#endif
1298 1420
1299 /* queue check watchers (and execute them) */ 1421 /* queue prepare watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1422 if (expect_false (preparecnt))
1301 { 1423 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1424 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1425 call_pending (EV_A);
1304 } 1426 }
1305 1427
1428 if (expect_false (!activecnt))
1429 break;
1430
1306 /* we might have forked, so reify kernel state if necessary */ 1431 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1432 if (expect_false (postfork))
1308 loop_fork (EV_A); 1433 loop_fork (EV_A);
1309 1434
1310 /* update fd-related kernel structures */ 1435 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1436 fd_reify (EV_A);
1312 1437
1313 /* calculate blocking time */ 1438 /* calculate blocking time */
1314 { 1439 {
1315 double block; 1440 ev_tstamp block;
1316 1441
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1318 block = 0.; /* do not block at all */ 1443 block = 0.; /* do not block at all */
1319 else 1444 else
1320 { 1445 {
1321 /* update time to cancel out callback processing overhead */ 1446 /* 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); 1447 time_update (EV_A_ 1e100);
1325 else
1326#endif
1327 {
1328 ev_rt_now = ev_time ();
1329 mn_now = ev_rt_now;
1330 }
1331 1448
1332 block = MAX_BLOCKTIME; 1449 block = MAX_BLOCKTIME;
1333 1450
1334 if (timercnt) 1451 if (timercnt)
1335 { 1452 {
1346#endif 1463#endif
1347 1464
1348 if (expect_false (block < 0.)) block = 0.; 1465 if (expect_false (block < 0.)) block = 0.;
1349 } 1466 }
1350 1467
1468 ++loop_count;
1351 backend_poll (EV_A_ block); 1469 backend_poll (EV_A_ block);
1470
1471 /* update ev_rt_now, do magic */
1472 time_update (EV_A_ block);
1352 } 1473 }
1353
1354 /* update ev_rt_now, do magic */
1355 time_update (EV_A);
1356 1474
1357 /* queue pending timers and reschedule them */ 1475 /* queue pending timers and reschedule them */
1358 timers_reify (EV_A); /* relative timers called last */ 1476 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1477#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1478 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1479#endif
1362 1480
1481#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1482 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1483 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1484#endif
1366 1485
1367 /* queue check watchers, to be executed first */ 1486 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1487 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1488 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1489
1371 call_pending (EV_A); 1490 call_pending (EV_A);
1372 1491
1373 if (expect_false (loop_done))
1374 break;
1375 } 1492 }
1493 while (expect_true (activecnt && !loop_done));
1376 1494
1377 if (loop_done == EVUNLOOP_ONE) 1495 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1496 loop_done = EVUNLOOP_CANCEL;
1379} 1497}
1380 1498
1407 head = &(*head)->next; 1525 head = &(*head)->next;
1408 } 1526 }
1409} 1527}
1410 1528
1411void inline_speed 1529void inline_speed
1412ev_clear_pending (EV_P_ W w) 1530clear_pending (EV_P_ W w)
1413{ 1531{
1414 if (w->pending) 1532 if (w->pending)
1415 { 1533 {
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1534 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1535 w->pending = 0;
1418 } 1536 }
1419} 1537}
1420 1538
1539int
1540ev_clear_pending (EV_P_ void *w)
1541{
1542 W w_ = (W)w;
1543 int pending = w_->pending;
1544
1545 if (expect_true (pending))
1546 {
1547 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1548 w_->pending = 0;
1549 p->w = 0;
1550 return p->events;
1551 }
1552 else
1553 return 0;
1554}
1555
1556void inline_size
1557pri_adjust (EV_P_ W w)
1558{
1559 int pri = w->priority;
1560 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1561 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1562 w->priority = pri;
1563}
1564
1421void inline_speed 1565void inline_speed
1422ev_start (EV_P_ W w, int active) 1566ev_start (EV_P_ W w, int active)
1423{ 1567{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1568 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1569 w->active = active;
1428 ev_ref (EV_A); 1570 ev_ref (EV_A);
1429} 1571}
1430 1572
1431void inline_size 1573void inline_size
1435 w->active = 0; 1577 w->active = 0;
1436} 1578}
1437 1579
1438/*****************************************************************************/ 1580/*****************************************************************************/
1439 1581
1440void 1582void noinline
1441ev_io_start (EV_P_ ev_io *w) 1583ev_io_start (EV_P_ ev_io *w)
1442{ 1584{
1443 int fd = w->fd; 1585 int fd = w->fd;
1444 1586
1445 if (expect_false (ev_is_active (w))) 1587 if (expect_false (ev_is_active (w)))
1452 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1594 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1453 1595
1454 fd_change (EV_A_ fd); 1596 fd_change (EV_A_ fd);
1455} 1597}
1456 1598
1457void 1599void noinline
1458ev_io_stop (EV_P_ ev_io *w) 1600ev_io_stop (EV_P_ ev_io *w)
1459{ 1601{
1460 ev_clear_pending (EV_A_ (W)w); 1602 clear_pending (EV_A_ (W)w);
1461 if (expect_false (!ev_is_active (w))) 1603 if (expect_false (!ev_is_active (w)))
1462 return; 1604 return;
1463 1605
1464 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1606 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1465 1607
1467 ev_stop (EV_A_ (W)w); 1609 ev_stop (EV_A_ (W)w);
1468 1610
1469 fd_change (EV_A_ w->fd); 1611 fd_change (EV_A_ w->fd);
1470} 1612}
1471 1613
1472void 1614void noinline
1473ev_timer_start (EV_P_ ev_timer *w) 1615ev_timer_start (EV_P_ ev_timer *w)
1474{ 1616{
1475 if (expect_false (ev_is_active (w))) 1617 if (expect_false (ev_is_active (w)))
1476 return; 1618 return;
1477 1619
1482 ev_start (EV_A_ (W)w, ++timercnt); 1624 ev_start (EV_A_ (W)w, ++timercnt);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1625 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1484 timers [timercnt - 1] = w; 1626 timers [timercnt - 1] = w;
1485 upheap ((WT *)timers, timercnt - 1); 1627 upheap ((WT *)timers, timercnt - 1);
1486 1628
1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1630}
1631
1632void noinline
1633ev_timer_stop (EV_P_ ev_timer *w)
1634{
1635 clear_pending (EV_A_ (W)w);
1636 if (expect_false (!ev_is_active (w)))
1637 return;
1638
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1488}
1489 1640
1490void 1641 {
1491ev_timer_stop (EV_P_ ev_timer *w) 1642 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 1643
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1498
1499 if (expect_true (((W)w)->active < timercnt--)) 1644 if (expect_true (--active < --timercnt))
1500 { 1645 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 1646 timers [active] = timers [timercnt];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1647 adjustheap ((WT *)timers, timercnt, active);
1503 } 1648 }
1649 }
1504 1650
1505 ((WT)w)->at -= mn_now; 1651 ((WT)w)->at -= mn_now;
1506 1652
1507 ev_stop (EV_A_ (W)w); 1653 ev_stop (EV_A_ (W)w);
1508} 1654}
1509 1655
1510void 1656void noinline
1511ev_timer_again (EV_P_ ev_timer *w) 1657ev_timer_again (EV_P_ ev_timer *w)
1512{ 1658{
1513 if (ev_is_active (w)) 1659 if (ev_is_active (w))
1514 { 1660 {
1515 if (w->repeat) 1661 if (w->repeat)
1526 ev_timer_start (EV_A_ w); 1672 ev_timer_start (EV_A_ w);
1527 } 1673 }
1528} 1674}
1529 1675
1530#if EV_PERIODIC_ENABLE 1676#if EV_PERIODIC_ENABLE
1531void 1677void noinline
1532ev_periodic_start (EV_P_ ev_periodic *w) 1678ev_periodic_start (EV_P_ ev_periodic *w)
1533{ 1679{
1534 if (expect_false (ev_is_active (w))) 1680 if (expect_false (ev_is_active (w)))
1535 return; 1681 return;
1536 1682
1538 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1684 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1539 else if (w->interval) 1685 else if (w->interval)
1540 { 1686 {
1541 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1687 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 */ 1688 /* 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; 1689 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1544 } 1690 }
1691 else
1692 ((WT)w)->at = w->offset;
1545 1693
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 1694 ev_start (EV_A_ (W)w, ++periodiccnt);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 1696 periodics [periodiccnt - 1] = w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 1697 upheap ((WT *)periodics, periodiccnt - 1);
1550 1698
1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1700}
1701
1702void noinline
1703ev_periodic_stop (EV_P_ ev_periodic *w)
1704{
1705 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w)))
1707 return;
1708
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1552}
1553 1710
1554void 1711 {
1555ev_periodic_stop (EV_P_ ev_periodic *w) 1712 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 1713
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1562
1563 if (expect_true (((W)w)->active < periodiccnt--)) 1714 if (expect_true (--active < --periodiccnt))
1564 { 1715 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1716 periodics [active] = periodics [periodiccnt];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1717 adjustheap ((WT *)periodics, periodiccnt, active);
1567 } 1718 }
1719 }
1568 1720
1569 ev_stop (EV_A_ (W)w); 1721 ev_stop (EV_A_ (W)w);
1570} 1722}
1571 1723
1572void 1724void noinline
1573ev_periodic_again (EV_P_ ev_periodic *w) 1725ev_periodic_again (EV_P_ ev_periodic *w)
1574{ 1726{
1575 /* TODO: use adjustheap and recalculation */ 1727 /* TODO: use adjustheap and recalculation */
1576 ev_periodic_stop (EV_A_ w); 1728 ev_periodic_stop (EV_A_ w);
1577 ev_periodic_start (EV_A_ w); 1729 ev_periodic_start (EV_A_ w);
1580 1732
1581#ifndef SA_RESTART 1733#ifndef SA_RESTART
1582# define SA_RESTART 0 1734# define SA_RESTART 0
1583#endif 1735#endif
1584 1736
1585void 1737void noinline
1586ev_signal_start (EV_P_ ev_signal *w) 1738ev_signal_start (EV_P_ ev_signal *w)
1587{ 1739{
1588#if EV_MULTIPLICITY 1740#if EV_MULTIPLICITY
1589 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1741 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1590#endif 1742#endif
1609 sigaction (w->signum, &sa, 0); 1761 sigaction (w->signum, &sa, 0);
1610#endif 1762#endif
1611 } 1763 }
1612} 1764}
1613 1765
1614void 1766void noinline
1615ev_signal_stop (EV_P_ ev_signal *w) 1767ev_signal_stop (EV_P_ ev_signal *w)
1616{ 1768{
1617 ev_clear_pending (EV_A_ (W)w); 1769 clear_pending (EV_A_ (W)w);
1618 if (expect_false (!ev_is_active (w))) 1770 if (expect_false (!ev_is_active (w)))
1619 return; 1771 return;
1620 1772
1621 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1622 ev_stop (EV_A_ (W)w); 1774 ev_stop (EV_A_ (W)w);
1639} 1791}
1640 1792
1641void 1793void
1642ev_child_stop (EV_P_ ev_child *w) 1794ev_child_stop (EV_P_ ev_child *w)
1643{ 1795{
1644 ev_clear_pending (EV_A_ (W)w); 1796 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1797 if (expect_false (!ev_is_active (w)))
1646 return; 1798 return;
1647 1799
1648 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1800 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1649 ev_stop (EV_A_ (W)w); 1801 ev_stop (EV_A_ (W)w);
1657# endif 1809# endif
1658 1810
1659#define DEF_STAT_INTERVAL 5.0074891 1811#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 1812#define MIN_STAT_INTERVAL 0.1074891
1661 1813
1814static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1815
1816#if EV_USE_INOTIFY
1817# define EV_INOTIFY_BUFSIZE 8192
1818
1819static void noinline
1820infy_add (EV_P_ ev_stat *w)
1821{
1822 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);
1823
1824 if (w->wd < 0)
1825 {
1826 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1827
1828 /* monitor some parent directory for speedup hints */
1829 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1830 {
1831 char path [4096];
1832 strcpy (path, w->path);
1833
1834 do
1835 {
1836 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1837 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1838
1839 char *pend = strrchr (path, '/');
1840
1841 if (!pend)
1842 break; /* whoops, no '/', complain to your admin */
1843
1844 *pend = 0;
1845 w->wd = inotify_add_watch (fs_fd, path, mask);
1846 }
1847 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1848 }
1849 }
1850 else
1851 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1852
1853 if (w->wd >= 0)
1854 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1855}
1856
1857static void noinline
1858infy_del (EV_P_ ev_stat *w)
1859{
1860 int slot;
1861 int wd = w->wd;
1862
1863 if (wd < 0)
1864 return;
1865
1866 w->wd = -2;
1867 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1868 wlist_del (&fs_hash [slot].head, (WL)w);
1869
1870 /* remove this watcher, if others are watching it, they will rearm */
1871 inotify_rm_watch (fs_fd, wd);
1872}
1873
1874static void noinline
1875infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1876{
1877 if (slot < 0)
1878 /* overflow, need to check for all hahs slots */
1879 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1880 infy_wd (EV_A_ slot, wd, ev);
1881 else
1882 {
1883 WL w_;
1884
1885 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1886 {
1887 ev_stat *w = (ev_stat *)w_;
1888 w_ = w_->next; /* lets us remove this watcher and all before it */
1889
1890 if (w->wd == wd || wd == -1)
1891 {
1892 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1893 {
1894 w->wd = -1;
1895 infy_add (EV_A_ w); /* re-add, no matter what */
1896 }
1897
1898 stat_timer_cb (EV_A_ &w->timer, 0);
1899 }
1900 }
1901 }
1902}
1903
1904static void
1905infy_cb (EV_P_ ev_io *w, int revents)
1906{
1907 char buf [EV_INOTIFY_BUFSIZE];
1908 struct inotify_event *ev = (struct inotify_event *)buf;
1909 int ofs;
1910 int len = read (fs_fd, buf, sizeof (buf));
1911
1912 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1913 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1914}
1915
1916void inline_size
1917infy_init (EV_P)
1918{
1919 if (fs_fd != -2)
1920 return;
1921
1922 fs_fd = inotify_init ();
1923
1924 if (fs_fd >= 0)
1925 {
1926 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1927 ev_set_priority (&fs_w, EV_MAXPRI);
1928 ev_io_start (EV_A_ &fs_w);
1929 }
1930}
1931
1932void inline_size
1933infy_fork (EV_P)
1934{
1935 int slot;
1936
1937 if (fs_fd < 0)
1938 return;
1939
1940 close (fs_fd);
1941 fs_fd = inotify_init ();
1942
1943 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1944 {
1945 WL w_ = fs_hash [slot].head;
1946 fs_hash [slot].head = 0;
1947
1948 while (w_)
1949 {
1950 ev_stat *w = (ev_stat *)w_;
1951 w_ = w_->next; /* lets us add this watcher */
1952
1953 w->wd = -1;
1954
1955 if (fs_fd >= 0)
1956 infy_add (EV_A_ w); /* re-add, no matter what */
1957 else
1958 ev_timer_start (EV_A_ &w->timer);
1959 }
1960
1961 }
1962}
1963
1964#endif
1965
1662void 1966void
1663ev_stat_stat (EV_P_ ev_stat *w) 1967ev_stat_stat (EV_P_ ev_stat *w)
1664{ 1968{
1665 if (lstat (w->path, &w->attr) < 0) 1969 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 1970 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 1971 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 1972 w->attr.st_nlink = 1;
1669} 1973}
1670 1974
1671static void 1975static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1976stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 1977{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1978 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 1979
1676 /* we copy this here each the time so that */ 1980 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 1981 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 1982 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 1983 ev_stat_stat (EV_A_ w);
1680 1984
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1985 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1986 if (
1987 w->prev.st_dev != w->attr.st_dev
1988 || w->prev.st_ino != w->attr.st_ino
1989 || w->prev.st_mode != w->attr.st_mode
1990 || w->prev.st_nlink != w->attr.st_nlink
1991 || w->prev.st_uid != w->attr.st_uid
1992 || w->prev.st_gid != w->attr.st_gid
1993 || w->prev.st_rdev != w->attr.st_rdev
1994 || w->prev.st_size != w->attr.st_size
1995 || w->prev.st_atime != w->attr.st_atime
1996 || w->prev.st_mtime != w->attr.st_mtime
1997 || w->prev.st_ctime != w->attr.st_ctime
1998 ) {
1999 #if EV_USE_INOTIFY
2000 infy_del (EV_A_ w);
2001 infy_add (EV_A_ w);
2002 ev_stat_stat (EV_A_ w); /* avoid race... */
2003 #endif
2004
1682 ev_feed_event (EV_A_ w, EV_STAT); 2005 ev_feed_event (EV_A_ w, EV_STAT);
2006 }
1683} 2007}
1684 2008
1685void 2009void
1686ev_stat_start (EV_P_ ev_stat *w) 2010ev_stat_start (EV_P_ ev_stat *w)
1687{ 2011{
1697 if (w->interval < MIN_STAT_INTERVAL) 2021 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2022 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 2023
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2024 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 2025 ev_set_priority (&w->timer, ev_priority (w));
2026
2027#if EV_USE_INOTIFY
2028 infy_init (EV_A);
2029
2030 if (fs_fd >= 0)
2031 infy_add (EV_A_ w);
2032 else
2033#endif
1702 ev_timer_start (EV_A_ &w->timer); 2034 ev_timer_start (EV_A_ &w->timer);
1703 2035
1704 ev_start (EV_A_ (W)w, 1); 2036 ev_start (EV_A_ (W)w, 1);
1705} 2037}
1706 2038
1707void 2039void
1708ev_stat_stop (EV_P_ ev_stat *w) 2040ev_stat_stop (EV_P_ ev_stat *w)
1709{ 2041{
1710 ev_clear_pending (EV_A_ (W)w); 2042 clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 2043 if (expect_false (!ev_is_active (w)))
1712 return; 2044 return;
1713 2045
2046#if EV_USE_INOTIFY
2047 infy_del (EV_A_ w);
2048#endif
1714 ev_timer_stop (EV_A_ &w->timer); 2049 ev_timer_stop (EV_A_ &w->timer);
1715 2050
1716 ev_stop (EV_A_ (W)w); 2051 ev_stop (EV_A_ (W)w);
1717} 2052}
1718#endif 2053#endif
1719 2054
2055#if EV_IDLE_ENABLE
1720void 2056void
1721ev_idle_start (EV_P_ ev_idle *w) 2057ev_idle_start (EV_P_ ev_idle *w)
1722{ 2058{
1723 if (expect_false (ev_is_active (w))) 2059 if (expect_false (ev_is_active (w)))
1724 return; 2060 return;
1725 2061
2062 pri_adjust (EV_A_ (W)w);
2063
2064 {
2065 int active = ++idlecnt [ABSPRI (w)];
2066
2067 ++idleall;
1726 ev_start (EV_A_ (W)w, ++idlecnt); 2068 ev_start (EV_A_ (W)w, active);
2069
1727 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2070 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1728 idles [idlecnt - 1] = w; 2071 idles [ABSPRI (w)][active - 1] = w;
2072 }
1729} 2073}
1730 2074
1731void 2075void
1732ev_idle_stop (EV_P_ ev_idle *w) 2076ev_idle_stop (EV_P_ ev_idle *w)
1733{ 2077{
1734 ev_clear_pending (EV_A_ (W)w); 2078 clear_pending (EV_A_ (W)w);
1735 if (expect_false (!ev_is_active (w))) 2079 if (expect_false (!ev_is_active (w)))
1736 return; 2080 return;
1737 2081
1738 { 2082 {
1739 int active = ((W)w)->active; 2083 int active = ((W)w)->active;
1740 idles [active - 1] = idles [--idlecnt]; 2084
2085 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1741 ((W)idles [active - 1])->active = active; 2086 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2087
2088 ev_stop (EV_A_ (W)w);
2089 --idleall;
1742 } 2090 }
1743
1744 ev_stop (EV_A_ (W)w);
1745} 2091}
2092#endif
1746 2093
1747void 2094void
1748ev_prepare_start (EV_P_ ev_prepare *w) 2095ev_prepare_start (EV_P_ ev_prepare *w)
1749{ 2096{
1750 if (expect_false (ev_is_active (w))) 2097 if (expect_false (ev_is_active (w)))
1756} 2103}
1757 2104
1758void 2105void
1759ev_prepare_stop (EV_P_ ev_prepare *w) 2106ev_prepare_stop (EV_P_ ev_prepare *w)
1760{ 2107{
1761 ev_clear_pending (EV_A_ (W)w); 2108 clear_pending (EV_A_ (W)w);
1762 if (expect_false (!ev_is_active (w))) 2109 if (expect_false (!ev_is_active (w)))
1763 return; 2110 return;
1764 2111
1765 { 2112 {
1766 int active = ((W)w)->active; 2113 int active = ((W)w)->active;
1783} 2130}
1784 2131
1785void 2132void
1786ev_check_stop (EV_P_ ev_check *w) 2133ev_check_stop (EV_P_ ev_check *w)
1787{ 2134{
1788 ev_clear_pending (EV_A_ (W)w); 2135 clear_pending (EV_A_ (W)w);
1789 if (expect_false (!ev_is_active (w))) 2136 if (expect_false (!ev_is_active (w)))
1790 return; 2137 return;
1791 2138
1792 { 2139 {
1793 int active = ((W)w)->active; 2140 int active = ((W)w)->active;
1835} 2182}
1836 2183
1837void 2184void
1838ev_embed_stop (EV_P_ ev_embed *w) 2185ev_embed_stop (EV_P_ ev_embed *w)
1839{ 2186{
1840 ev_clear_pending (EV_A_ (W)w); 2187 clear_pending (EV_A_ (W)w);
1841 if (expect_false (!ev_is_active (w))) 2188 if (expect_false (!ev_is_active (w)))
1842 return; 2189 return;
1843 2190
1844 ev_io_stop (EV_A_ &w->io); 2191 ev_io_stop (EV_A_ &w->io);
1845 2192
1860} 2207}
1861 2208
1862void 2209void
1863ev_fork_stop (EV_P_ ev_fork *w) 2210ev_fork_stop (EV_P_ ev_fork *w)
1864{ 2211{
1865 ev_clear_pending (EV_A_ (W)w); 2212 clear_pending (EV_A_ (W)w);
1866 if (expect_false (!ev_is_active (w))) 2213 if (expect_false (!ev_is_active (w)))
1867 return; 2214 return;
1868 2215
1869 { 2216 {
1870 int active = ((W)w)->active; 2217 int active = ((W)w)->active;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines