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

Comparing libev/ev.c (file contents):
Revision 1.146 by root, Tue Nov 27 09:17:51 2007 UTC vs.
Revision 1.177 by root, Tue Dec 11 15:06:50 2007 UTC

94# else 94# else
95# define EV_USE_PORT 0 95# define EV_USE_PORT 0
96# endif 96# endif
97# endif 97# endif
98 98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
105# endif
106
99#endif 107#endif
100 108
101#include <math.h> 109#include <math.h>
102#include <stdlib.h> 110#include <stdlib.h>
103#include <fcntl.h> 111#include <fcntl.h>
109#include <errno.h> 117#include <errno.h>
110#include <sys/types.h> 118#include <sys/types.h>
111#include <time.h> 119#include <time.h>
112 120
113#include <signal.h> 121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
114 128
115#ifndef _WIN32 129#ifndef _WIN32
116# include <sys/time.h> 130# include <sys/time.h>
117# include <sys/wait.h> 131# include <sys/wait.h>
118# include <unistd.h> 132# include <unistd.h>
156 170
157#ifndef EV_USE_PORT 171#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 172# define EV_USE_PORT 0
159#endif 173#endif
160 174
175#ifndef EV_USE_INOTIFY
176# define EV_USE_INOTIFY 0
177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
182# else
183# define EV_PID_HASHSIZE 16
184# endif
185#endif
186
187#ifndef EV_INOTIFY_HASHSIZE
188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
193#endif
194
161/**/ 195/**/
162 196
163#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
172 206
173#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 208# include <winsock.h>
175#endif 209#endif
176 210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
177/**/ 219/**/
220
221/*
222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding
225 * errors are against us.
226 * This value is good at least till the year 4000.
227 * Better solutions welcome.
228 */
229#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
178 230
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
183
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189 234
190#if __GNUC__ >= 3 235#if __GNUC__ >= 3
191# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL
194# define noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
195# define inline_speed static noinline
196# else
197# define noinline
198# define inline_speed static inline
199# endif
200#else 238#else
201# define expect(expr,value) (expr) 239# define expect(expr,value) (expr)
202# define inline_speed static
203# define inline_size static
204# define noinline 240# define noinline
241# if __STDC_VERSION__ < 199901L
242# define inline
243# endif
205#endif 244#endif
206 245
207#define expect_false(expr) expect ((expr) != 0, 0) 246#define expect_false(expr) expect ((expr) != 0, 0)
208#define expect_true(expr) expect ((expr) != 0, 1) 247#define expect_true(expr) expect ((expr) != 0, 1)
248#define inline_size static inline
249
250#if EV_MINIMAL
251# define inline_speed static noinline
252#else
253# define inline_speed static inline
254#endif
209 255
210#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 256#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
211#define ABSPRI(w) ((w)->priority - EV_MINPRI) 257#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
212 258
213#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 259#define EMPTY /* required for microsofts broken pseudo-c compiler */
214#define EMPTY2(a,b) /* used to suppress some warnings */ 260#define EMPTY2(a,b) /* used to suppress some warnings */
215 261
216typedef ev_watcher *W; 262typedef ev_watcher *W;
217typedef ev_watcher_list *WL; 263typedef ev_watcher_list *WL;
218typedef ev_watcher_time *WT; 264typedef ev_watcher_time *WT;
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 300ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 301{
256 alloc = cb; 302 alloc = cb;
257} 303}
258 304
259static void * 305inline_speed void *
260ev_realloc (void *ptr, long size) 306ev_realloc (void *ptr, long size)
261{ 307{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
263 309
264 if (!ptr && size) 310 if (!ptr && size)
288typedef struct 334typedef struct
289{ 335{
290 W w; 336 W w;
291 int events; 337 int events;
292} ANPENDING; 338} ANPENDING;
339
340#if EV_USE_INOTIFY
341typedef struct
342{
343 WL head;
344} ANFS;
345#endif
293 346
294#if EV_MULTIPLICITY 347#if EV_MULTIPLICITY
295 348
296 struct ev_loop 349 struct ev_loop
297 { 350 {
354{ 407{
355 return ev_rt_now; 408 return ev_rt_now;
356} 409}
357#endif 410#endif
358 411
359#define array_roundsize(type,n) (((n) | 4) & ~3) 412int inline_size
413array_nextsize (int elem, int cur, int cnt)
414{
415 int ncur = cur + 1;
416
417 do
418 ncur <<= 1;
419 while (cnt > ncur);
420
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096)
423 {
424 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
426 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem;
428 }
429
430 return ncur;
431}
432
433static noinline void *
434array_realloc (int elem, void *base, int *cur, int cnt)
435{
436 *cur = array_nextsize (elem, *cur, cnt);
437 return ev_realloc (base, elem * *cur);
438}
360 439
361#define array_needsize(type,base,cur,cnt,init) \ 440#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 441 if (expect_false ((cnt) > (cur))) \
363 { \ 442 { \
364 int newcnt = cur; \ 443 int ocur_ = (cur); \
365 do \ 444 (base) = (type *)array_realloc \
366 { \ 445 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 446 init ((base) + (ocur_), (cur) - ocur_); \
368 } \
369 while ((cnt) > newcnt); \
370 \
371 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
372 init (base + cur, newcnt - cur); \
373 cur = newcnt; \
374 } 447 }
375 448
449#if 0
376#define array_slim(type,stem) \ 450#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 451 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 452 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 453 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 454 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 455 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 456 }
457#endif
383 458
384#define array_free(stem, idx) \ 459#define array_free(stem, idx) \
385 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 460 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
386 461
387/*****************************************************************************/ 462/*****************************************************************************/
388 463
389void noinline 464void noinline
390ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
391{ 466{
392 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
393 469
394 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
395 { 473 {
474 w_->pending = ++pendingcnt [pri];
475 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
476 pendings [pri][w_->pending - 1].w = w_;
396 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
397 return;
398 } 478 }
399
400 w_->pending = ++pendingcnt [ABSPRI (w_)];
401 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
402 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
404} 479}
405 480
406void inline_size 481void inline_size
407queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
408{ 483{
443} 518}
444 519
445void 520void
446ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 522{
523 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
449} 525}
450 526
451void inline_size 527void inline_size
452fd_reify (EV_P) 528fd_reify (EV_P)
453{ 529{
547static void noinline 623static void noinline
548fd_rearm_all (EV_P) 624fd_rearm_all (EV_P)
549{ 625{
550 int fd; 626 int fd;
551 627
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 628 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 629 if (anfds [fd].events)
555 { 630 {
556 anfds [fd].events = 0; 631 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 632 fd_change (EV_A_ fd);
684 for (signum = signalmax; signum--; ) 759 for (signum = signalmax; signum--; )
685 if (signals [signum].gotsig) 760 if (signals [signum].gotsig)
686 ev_feed_signal_event (EV_A_ signum + 1); 761 ev_feed_signal_event (EV_A_ signum + 1);
687} 762}
688 763
689void inline_size 764void inline_speed
690fd_intern (int fd) 765fd_intern (int fd)
691{ 766{
692#ifdef _WIN32 767#ifdef _WIN32
693 int arg = 1; 768 int arg = 1;
694 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 769 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 784 ev_unref (EV_A); /* child watcher should not keep loop alive */
710} 785}
711 786
712/*****************************************************************************/ 787/*****************************************************************************/
713 788
714static ev_child *childs [PID_HASHSIZE]; 789static ev_child *childs [EV_PID_HASHSIZE];
715 790
716#ifndef _WIN32 791#ifndef _WIN32
717 792
718static ev_signal childev; 793static ev_signal childev;
719 794
720void inline_speed 795void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 796child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
722{ 797{
723 ev_child *w; 798 ev_child *w;
724 799
725 for (w = (ev_child *)childs [chain & (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)
726 if (w->pid == pid || !w->pid) 801 if (w->pid == pid || !w->pid)
727 { 802 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 803 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
729 w->rpid = pid; 804 w->rpid = pid;
730 w->rstatus = status; 805 w->rstatus = status;
731 ev_feed_event (EV_A_ (W)w, EV_CHILD); 806 ev_feed_event (EV_A_ (W)w, EV_CHILD);
732 } 807 }
733} 808}
734 809
735#ifndef WCONTINUED 810#ifndef WCONTINUED
751 /* make sure we are called again until all childs have been reaped */ 826 /* make sure we are called again until all childs have been reaped */
752 /* we need to do it this way so that the callback gets called before we continue */ 827 /* we need to do it this way so that the callback gets called before we continue */
753 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 828 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 829
755 child_reap (EV_A_ sw, pid, pid, status); 830 child_reap (EV_A_ sw, pid, pid, status);
831 if (EV_PID_HASHSIZE > 1)
756 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 832 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 833}
758 834
759#endif 835#endif
760 836
761/*****************************************************************************/ 837/*****************************************************************************/
844ev_backend (EV_P) 920ev_backend (EV_P)
845{ 921{
846 return backend; 922 return backend;
847} 923}
848 924
849static void 925unsigned int
926ev_loop_count (EV_P)
927{
928 return loop_count;
929}
930
931static void noinline
850loop_init (EV_P_ unsigned int flags) 932loop_init (EV_P_ unsigned int flags)
851{ 933{
852 if (!backend) 934 if (!backend)
853 { 935 {
854#if EV_USE_MONOTONIC 936#if EV_USE_MONOTONIC
862 ev_rt_now = ev_time (); 944 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 945 mn_now = get_clock ();
864 now_floor = mn_now; 946 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 947 rtmn_diff = ev_rt_now - mn_now;
866 948
949 /* pid check not overridable via env */
950#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid ();
953#endif
954
867 if (!(flags & EVFLAG_NOENV) 955 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 956 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 957 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 958 flags = atoi (getenv ("LIBEV_FLAGS"));
871 959
872 if (!(flags & 0x0000ffffUL)) 960 if (!(flags & 0x0000ffffUL))
873 flags |= ev_recommended_backends (); 961 flags |= ev_recommended_backends ();
874 962
875 backend = 0; 963 backend = 0;
964 backend_fd = -1;
965#if EV_USE_INOTIFY
966 fs_fd = -2;
967#endif
968
876#if EV_USE_PORT 969#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 970 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 971#endif
879#if EV_USE_KQUEUE 972#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 973 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
892 ev_init (&sigev, sigcb); 985 ev_init (&sigev, sigcb);
893 ev_set_priority (&sigev, EV_MAXPRI); 986 ev_set_priority (&sigev, EV_MAXPRI);
894 } 987 }
895} 988}
896 989
897static void 990static void noinline
898loop_destroy (EV_P) 991loop_destroy (EV_P)
899{ 992{
900 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);
901 1002
902#if EV_USE_PORT 1003#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1004 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 1005#endif
905#if EV_USE_KQUEUE 1006#if EV_USE_KQUEUE
914#if EV_USE_SELECT 1015#if EV_USE_SELECT
915 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1016 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
916#endif 1017#endif
917 1018
918 for (i = NUMPRI; i--; ) 1019 for (i = NUMPRI; i--; )
1020 {
919 array_free (pending, [i]); 1021 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE
1023 array_free (idle, [i]);
1024#endif
1025 }
920 1026
921 /* have to use the microsoft-never-gets-it-right macro */ 1027 /* have to use the microsoft-never-gets-it-right macro */
922 array_free (fdchange, EMPTY0); 1028 array_free (fdchange, EMPTY);
923 array_free (timer, EMPTY0); 1029 array_free (timer, EMPTY);
924#if EV_PERIODIC_ENABLE 1030#if EV_PERIODIC_ENABLE
925 array_free (periodic, EMPTY0); 1031 array_free (periodic, EMPTY);
926#endif 1032#endif
927 array_free (idle, EMPTY0);
928 array_free (prepare, EMPTY0); 1033 array_free (prepare, EMPTY);
929 array_free (check, EMPTY0); 1034 array_free (check, EMPTY);
930 1035
931 backend = 0; 1036 backend = 0;
932} 1037}
933 1038
934static void 1039void inline_size infy_fork (EV_P);
1040
1041void inline_size
935loop_fork (EV_P) 1042loop_fork (EV_P)
936{ 1043{
937#if EV_USE_PORT 1044#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1045 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1046#endif
940#if EV_USE_KQUEUE 1047#if EV_USE_KQUEUE
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1048 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1049#endif
943#if EV_USE_EPOLL 1050#if EV_USE_EPOLL
944 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);
945#endif 1055#endif
946 1056
947 if (ev_is_active (&sigev)) 1057 if (ev_is_active (&sigev))
948 { 1058 {
949 /* default loop */ 1059 /* default loop */
1065 postfork = 1; 1175 postfork = 1;
1066} 1176}
1067 1177
1068/*****************************************************************************/ 1178/*****************************************************************************/
1069 1179
1070int inline_size 1180void
1071any_pending (EV_P) 1181ev_invoke (EV_P_ void *w, int revents)
1072{ 1182{
1073 int pri; 1183 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1184}
1081 1185
1082void inline_speed 1186void inline_speed
1083call_pending (EV_P) 1187call_pending (EV_P)
1084{ 1188{
1089 { 1193 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1194 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1195
1092 if (expect_true (p->w)) 1196 if (expect_true (p->w))
1093 { 1197 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1198 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1199
1096 p->w->pending = 0; 1200 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1201 EV_CB_INVOKE (p->w, p->events);
1098 } 1202 }
1099 } 1203 }
1104{ 1208{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1209 while (timercnt && ((WT)timers [0])->at <= mn_now)
1106 { 1210 {
1107 ev_timer *w = timers [0]; 1211 ev_timer *w = timers [0];
1108 1212
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1214
1111 /* first reschedule or stop timer */ 1215 /* first reschedule or stop timer */
1112 if (w->repeat) 1216 if (w->repeat)
1113 { 1217 {
1114 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.));
1132{ 1236{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1134 { 1238 {
1135 ev_periodic *w = periodics [0]; 1239 ev_periodic *w = periodics [0];
1136 1240
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1242
1139 /* first reschedule or stop timer */ 1243 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1244 if (w->reschedule_cb)
1141 { 1245 {
1142 ((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);
1143 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));
1144 downheap ((WT *)periodics, periodiccnt, 0); 1248 downheap ((WT *)periodics, periodiccnt, 0);
1145 } 1249 }
1146 else if (w->interval) 1250 else if (w->interval)
1147 { 1251 {
1148 ((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;
1149 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));
1150 downheap ((WT *)periodics, periodiccnt, 0); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1151 } 1256 }
1152 else 1257 else
1153 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1167 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1168 1273
1169 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1170 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1171 else if (w->interval) 1276 else if (w->interval)
1172 ((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;
1173 } 1278 }
1174 1279
1175 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1176 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i); 1282 downheap ((WT *)periodics, periodiccnt, i);
1178} 1283}
1179#endif 1284#endif
1180 1285
1286#if EV_IDLE_ENABLE
1287void inline_size
1288idle_reify (EV_P)
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
1181int inline_size 1309int inline_size
1182time_update_monotonic (EV_P) 1310time_update_monotonic (EV_P)
1183{ 1311{
1184 mn_now = get_clock (); 1312 mn_now = get_clock ();
1185 1313
1209 ev_tstamp odiff = rtmn_diff; 1337 ev_tstamp odiff = rtmn_diff;
1210 1338
1211 /* loop a few times, before making important decisions. 1339 /* loop a few times, before making important decisions.
1212 * on the choice of "4": one iteration isn't enough, 1340 * on the choice of "4": one iteration isn't enough,
1213 * in case we get preempted during the calls to 1341 * in case we get preempted during the calls to
1214 * ev_time and get_clock. a second call is almost guarenteed 1342 * ev_time and get_clock. a second call is almost guaranteed
1215 * to succeed in that case, though. and looping a few more times 1343 * to succeed in that case, though. and looping a few more times
1216 * doesn't hurt either as we only do this on time-jumps or 1344 * doesn't hurt either as we only do this on time-jumps or
1217 * in the unlikely event of getting preempted here. 1345 * in the unlikely event of having been preempted here.
1218 */ 1346 */
1219 for (i = 4; --i; ) 1347 for (i = 4; --i; )
1220 { 1348 {
1221 rtmn_diff = ev_rt_now - mn_now; 1349 rtmn_diff = ev_rt_now - mn_now;
1222 1350
1243 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1371 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1244 { 1372 {
1245#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1247#endif 1375#endif
1248
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1376 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1377 for (i = 0; i < timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1378 ((WT)timers [i])->at += ev_rt_now - mn_now;
1252 } 1379 }
1253 1380
1254 mn_now = ev_rt_now; 1381 mn_now = ev_rt_now;
1274{ 1401{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1402 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1276 ? EVUNLOOP_ONE 1403 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL; 1404 : EVUNLOOP_CANCEL;
1278 1405
1279 while (activecnt) 1406 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1407
1408 do
1280 { 1409 {
1410#ifndef _WIN32
1411 if (expect_false (curpid)) /* penalise the forking check even more */
1412 if (expect_false (getpid () != curpid))
1413 {
1414 curpid = getpid ();
1415 postfork = 1;
1416 }
1417#endif
1418
1419#if EV_FORK_ENABLE
1420 /* we might have forked, so queue fork handlers */
1421 if (expect_false (postfork))
1422 if (forkcnt)
1423 {
1424 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1425 call_pending (EV_A);
1426 }
1427#endif
1428
1281 /* queue check watchers (and execute them) */ 1429 /* queue prepare watchers (and execute them) */
1282 if (expect_false (preparecnt)) 1430 if (expect_false (preparecnt))
1283 { 1431 {
1284 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1432 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1285 call_pending (EV_A); 1433 call_pending (EV_A);
1286 } 1434 }
1287 1435
1436 if (expect_false (!activecnt))
1437 break;
1438
1288 /* we might have forked, so reify kernel state if necessary */ 1439 /* we might have forked, so reify kernel state if necessary */
1289 if (expect_false (postfork)) 1440 if (expect_false (postfork))
1290 loop_fork (EV_A); 1441 loop_fork (EV_A);
1291 1442
1292 /* update fd-related kernel structures */ 1443 /* update fd-related kernel structures */
1293 fd_reify (EV_A); 1444 fd_reify (EV_A);
1294 1445
1295 /* calculate blocking time */ 1446 /* calculate blocking time */
1296 { 1447 {
1297 double block; 1448 ev_tstamp block;
1298 1449
1299 if (flags & EVLOOP_NONBLOCK || idlecnt) 1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1300 block = 0.; /* do not block at all */ 1451 block = 0.; /* do not block at all */
1301 else 1452 else
1302 { 1453 {
1303 /* update time to cancel out callback processing overhead */ 1454 /* update time to cancel out callback processing overhead */
1304#if EV_USE_MONOTONIC 1455#if EV_USE_MONOTONIC
1328#endif 1479#endif
1329 1480
1330 if (expect_false (block < 0.)) block = 0.; 1481 if (expect_false (block < 0.)) block = 0.;
1331 } 1482 }
1332 1483
1484 ++loop_count;
1333 backend_poll (EV_A_ block); 1485 backend_poll (EV_A_ block);
1334 } 1486 }
1335 1487
1336 /* update ev_rt_now, do magic */ 1488 /* update ev_rt_now, do magic */
1337 time_update (EV_A); 1489 time_update (EV_A);
1340 timers_reify (EV_A); /* relative timers called last */ 1492 timers_reify (EV_A); /* relative timers called last */
1341#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1342 periodics_reify (EV_A); /* absolute timers called first */ 1494 periodics_reify (EV_A); /* absolute timers called first */
1343#endif 1495#endif
1344 1496
1497#if EV_IDLE_ENABLE
1345 /* queue idle watchers unless other events are pending */ 1498 /* queue idle watchers unless other events are pending */
1346 if (idlecnt && !any_pending (EV_A)) 1499 idle_reify (EV_A);
1347 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1500#endif
1348 1501
1349 /* queue check watchers, to be executed first */ 1502 /* queue check watchers, to be executed first */
1350 if (expect_false (checkcnt)) 1503 if (expect_false (checkcnt))
1351 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1504 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1352 1505
1353 call_pending (EV_A); 1506 call_pending (EV_A);
1354 1507
1355 if (expect_false (loop_done))
1356 break;
1357 } 1508 }
1509 while (expect_true (activecnt && !loop_done));
1358 1510
1359 if (loop_done == EVUNLOOP_ONE) 1511 if (loop_done == EVUNLOOP_ONE)
1360 loop_done = EVUNLOOP_CANCEL; 1512 loop_done = EVUNLOOP_CANCEL;
1361} 1513}
1362 1514
1389 head = &(*head)->next; 1541 head = &(*head)->next;
1390 } 1542 }
1391} 1543}
1392 1544
1393void inline_speed 1545void inline_speed
1394ev_clear_pending (EV_P_ W w) 1546clear_pending (EV_P_ W w)
1395{ 1547{
1396 if (w->pending) 1548 if (w->pending)
1397 { 1549 {
1398 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1550 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1399 w->pending = 0; 1551 w->pending = 0;
1400 } 1552 }
1401} 1553}
1402 1554
1555int
1556ev_clear_pending (EV_P_ void *w)
1557{
1558 W w_ = (W)w;
1559 int pending = w_->pending;
1560
1561 if (expect_true (pending))
1562 {
1563 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1564 w_->pending = 0;
1565 p->w = 0;
1566 return p->events;
1567 }
1568 else
1569 return 0;
1570}
1571
1572void inline_size
1573pri_adjust (EV_P_ W w)
1574{
1575 int pri = w->priority;
1576 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1577 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1578 w->priority = pri;
1579}
1580
1403void inline_speed 1581void inline_speed
1404ev_start (EV_P_ W w, int active) 1582ev_start (EV_P_ W w, int active)
1405{ 1583{
1406 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1584 pri_adjust (EV_A_ w);
1407 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1408
1409 w->active = active; 1585 w->active = active;
1410 ev_ref (EV_A); 1586 ev_ref (EV_A);
1411} 1587}
1412 1588
1413void inline_size 1589void inline_size
1417 w->active = 0; 1593 w->active = 0;
1418} 1594}
1419 1595
1420/*****************************************************************************/ 1596/*****************************************************************************/
1421 1597
1422void 1598void noinline
1423ev_io_start (EV_P_ ev_io *w) 1599ev_io_start (EV_P_ ev_io *w)
1424{ 1600{
1425 int fd = w->fd; 1601 int fd = w->fd;
1426 1602
1427 if (expect_false (ev_is_active (w))) 1603 if (expect_false (ev_is_active (w)))
1434 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1610 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1435 1611
1436 fd_change (EV_A_ fd); 1612 fd_change (EV_A_ fd);
1437} 1613}
1438 1614
1439void 1615void noinline
1440ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1441{ 1617{
1442 ev_clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1443 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1444 return; 1620 return;
1445 1621
1446 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1622 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1447 1623
1449 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1450 1626
1451 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd);
1452} 1628}
1453 1629
1454void 1630void noinline
1455ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1456{ 1632{
1457 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1458 return; 1634 return;
1459 1635
1464 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1465 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1466 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = w;
1467 upheap ((WT *)timers, timercnt - 1); 1643 upheap ((WT *)timers, timercnt - 1);
1468 1644
1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1646}
1647
1648void noinline
1649ev_timer_stop (EV_P_ ev_timer *w)
1650{
1651 clear_pending (EV_A_ (W)w);
1652 if (expect_false (!ev_is_active (w)))
1653 return;
1654
1469 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1470}
1471 1656
1472void 1657 {
1473ev_timer_stop (EV_P_ ev_timer *w) 1658 int active = ((W)w)->active;
1474{
1475 ev_clear_pending (EV_A_ (W)w);
1476 if (expect_false (!ev_is_active (w)))
1477 return;
1478 1659
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1480
1481 if (expect_true (((W)w)->active < timercnt--)) 1660 if (expect_true (--active < --timercnt))
1482 { 1661 {
1483 timers [((W)w)->active - 1] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1484 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1663 adjustheap ((WT *)timers, timercnt, active);
1485 } 1664 }
1665 }
1486 1666
1487 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1488 1668
1489 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1490} 1670}
1491 1671
1492void 1672void noinline
1493ev_timer_again (EV_P_ ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1494{ 1674{
1495 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1496 { 1676 {
1497 if (w->repeat) 1677 if (w->repeat)
1508 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1509 } 1689 }
1510} 1690}
1511 1691
1512#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1513void 1693void noinline
1514ev_periodic_start (EV_P_ ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1515{ 1695{
1516 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1517 return; 1697 return;
1518 1698
1520 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1521 else if (w->interval) 1701 else if (w->interval)
1522 { 1702 {
1523 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1703 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1524 /* this formula differs from the one in periodic_reify because we do not always round up */ 1704 /* this formula differs from the one in periodic_reify because we do not always round up */
1525 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1705 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1526 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1527 1709
1528 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1529 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1530 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = w;
1531 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap ((WT *)periodics, periodiccnt - 1);
1532 1714
1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1716}
1717
1718void noinline
1719ev_periodic_stop (EV_P_ ev_periodic *w)
1720{
1721 clear_pending (EV_A_ (W)w);
1722 if (expect_false (!ev_is_active (w)))
1723 return;
1724
1533 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1534}
1535 1726
1536void 1727 {
1537ev_periodic_stop (EV_P_ ev_periodic *w) 1728 int active = ((W)w)->active;
1538{
1539 ev_clear_pending (EV_A_ (W)w);
1540 if (expect_false (!ev_is_active (w)))
1541 return;
1542 1729
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1544
1545 if (expect_true (((W)w)->active < periodiccnt--)) 1730 if (expect_true (--active < --periodiccnt))
1546 { 1731 {
1547 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1548 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1733 adjustheap ((WT *)periodics, periodiccnt, active);
1549 } 1734 }
1735 }
1550 1736
1551 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1552} 1738}
1553 1739
1554void 1740void noinline
1555ev_periodic_again (EV_P_ ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1556{ 1742{
1557 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1558 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1559 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
1562 1748
1563#ifndef SA_RESTART 1749#ifndef SA_RESTART
1564# define SA_RESTART 0 1750# define SA_RESTART 0
1565#endif 1751#endif
1566 1752
1567void 1753void noinline
1568ev_signal_start (EV_P_ ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1569{ 1755{
1570#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1571 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1757 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1572#endif 1758#endif
1591 sigaction (w->signum, &sa, 0); 1777 sigaction (w->signum, &sa, 0);
1592#endif 1778#endif
1593 } 1779 }
1594} 1780}
1595 1781
1596void 1782void noinline
1597ev_signal_stop (EV_P_ ev_signal *w) 1783ev_signal_stop (EV_P_ ev_signal *w)
1598{ 1784{
1599 ev_clear_pending (EV_A_ (W)w); 1785 clear_pending (EV_A_ (W)w);
1600 if (expect_false (!ev_is_active (w))) 1786 if (expect_false (!ev_is_active (w)))
1601 return; 1787 return;
1602 1788
1603 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1789 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1604 ev_stop (EV_A_ (W)w); 1790 ev_stop (EV_A_ (W)w);
1615#endif 1801#endif
1616 if (expect_false (ev_is_active (w))) 1802 if (expect_false (ev_is_active (w)))
1617 return; 1803 return;
1618 1804
1619 ev_start (EV_A_ (W)w, 1); 1805 ev_start (EV_A_ (W)w, 1);
1620 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1806 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1621} 1807}
1622 1808
1623void 1809void
1624ev_child_stop (EV_P_ ev_child *w) 1810ev_child_stop (EV_P_ ev_child *w)
1625{ 1811{
1626 ev_clear_pending (EV_A_ (W)w); 1812 clear_pending (EV_A_ (W)w);
1627 if (expect_false (!ev_is_active (w))) 1813 if (expect_false (!ev_is_active (w)))
1628 return; 1814 return;
1629 1815
1630 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1816 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631 ev_stop (EV_A_ (W)w); 1817 ev_stop (EV_A_ (W)w);
1632} 1818}
1633 1819
1634#if EV_STAT_ENABLE 1820#if EV_STAT_ENABLE
1635 1821
1639# endif 1825# endif
1640 1826
1641#define DEF_STAT_INTERVAL 5.0074891 1827#define DEF_STAT_INTERVAL 5.0074891
1642#define MIN_STAT_INTERVAL 0.1074891 1828#define MIN_STAT_INTERVAL 0.1074891
1643 1829
1830static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1831
1832#if EV_USE_INOTIFY
1833# define EV_INOTIFY_BUFSIZE 8192
1834
1835static void noinline
1836infy_add (EV_P_ ev_stat *w)
1837{
1838 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);
1839
1840 if (w->wd < 0)
1841 {
1842 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1843
1844 /* monitor some parent directory for speedup hints */
1845 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1846 {
1847 char path [4096];
1848 strcpy (path, w->path);
1849
1850 do
1851 {
1852 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1853 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1854
1855 char *pend = strrchr (path, '/');
1856
1857 if (!pend)
1858 break; /* whoops, no '/', complain to your admin */
1859
1860 *pend = 0;
1861 w->wd = inotify_add_watch (fs_fd, path, mask);
1862 }
1863 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1864 }
1865 }
1866 else
1867 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1868
1869 if (w->wd >= 0)
1870 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1871}
1872
1873static void noinline
1874infy_del (EV_P_ ev_stat *w)
1875{
1876 int slot;
1877 int wd = w->wd;
1878
1879 if (wd < 0)
1880 return;
1881
1882 w->wd = -2;
1883 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1884 wlist_del (&fs_hash [slot].head, (WL)w);
1885
1886 /* remove this watcher, if others are watching it, they will rearm */
1887 inotify_rm_watch (fs_fd, wd);
1888}
1889
1890static void noinline
1891infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1892{
1893 if (slot < 0)
1894 /* overflow, need to check for all hahs slots */
1895 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1896 infy_wd (EV_A_ slot, wd, ev);
1897 else
1898 {
1899 WL w_;
1900
1901 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1902 {
1903 ev_stat *w = (ev_stat *)w_;
1904 w_ = w_->next; /* lets us remove this watcher and all before it */
1905
1906 if (w->wd == wd || wd == -1)
1907 {
1908 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1909 {
1910 w->wd = -1;
1911 infy_add (EV_A_ w); /* re-add, no matter what */
1912 }
1913
1914 stat_timer_cb (EV_A_ &w->timer, 0);
1915 }
1916 }
1917 }
1918}
1919
1920static void
1921infy_cb (EV_P_ ev_io *w, int revents)
1922{
1923 char buf [EV_INOTIFY_BUFSIZE];
1924 struct inotify_event *ev = (struct inotify_event *)buf;
1925 int ofs;
1926 int len = read (fs_fd, buf, sizeof (buf));
1927
1928 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1929 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1930}
1931
1932void inline_size
1933infy_init (EV_P)
1934{
1935 if (fs_fd != -2)
1936 return;
1937
1938 fs_fd = inotify_init ();
1939
1940 if (fs_fd >= 0)
1941 {
1942 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1943 ev_set_priority (&fs_w, EV_MAXPRI);
1944 ev_io_start (EV_A_ &fs_w);
1945 }
1946}
1947
1948void inline_size
1949infy_fork (EV_P)
1950{
1951 int slot;
1952
1953 if (fs_fd < 0)
1954 return;
1955
1956 close (fs_fd);
1957 fs_fd = inotify_init ();
1958
1959 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1960 {
1961 WL w_ = fs_hash [slot].head;
1962 fs_hash [slot].head = 0;
1963
1964 while (w_)
1965 {
1966 ev_stat *w = (ev_stat *)w_;
1967 w_ = w_->next; /* lets us add this watcher */
1968
1969 w->wd = -1;
1970
1971 if (fs_fd >= 0)
1972 infy_add (EV_A_ w); /* re-add, no matter what */
1973 else
1974 ev_timer_start (EV_A_ &w->timer);
1975 }
1976
1977 }
1978}
1979
1980#endif
1981
1644void 1982void
1645ev_stat_stat (EV_P_ ev_stat *w) 1983ev_stat_stat (EV_P_ ev_stat *w)
1646{ 1984{
1647 if (lstat (w->path, &w->attr) < 0) 1985 if (lstat (w->path, &w->attr) < 0)
1648 w->attr.st_nlink = 0; 1986 w->attr.st_nlink = 0;
1649 else if (!w->attr.st_nlink) 1987 else if (!w->attr.st_nlink)
1650 w->attr.st_nlink = 1; 1988 w->attr.st_nlink = 1;
1651} 1989}
1652 1990
1653static void 1991static void noinline
1654stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1992stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1655{ 1993{
1656 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1994 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1657 1995
1658 /* we copy this here each the time so that */ 1996 /* we copy this here each the time so that */
1659 /* prev has the old value when the callback gets invoked */ 1997 /* prev has the old value when the callback gets invoked */
1660 w->prev = w->attr; 1998 w->prev = w->attr;
1661 ev_stat_stat (EV_A_ w); 1999 ev_stat_stat (EV_A_ w);
1662 2000
1663 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2001 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2002 if (
2003 w->prev.st_dev != w->attr.st_dev
2004 || w->prev.st_ino != w->attr.st_ino
2005 || w->prev.st_mode != w->attr.st_mode
2006 || w->prev.st_nlink != w->attr.st_nlink
2007 || w->prev.st_uid != w->attr.st_uid
2008 || w->prev.st_gid != w->attr.st_gid
2009 || w->prev.st_rdev != w->attr.st_rdev
2010 || w->prev.st_size != w->attr.st_size
2011 || w->prev.st_atime != w->attr.st_atime
2012 || w->prev.st_mtime != w->attr.st_mtime
2013 || w->prev.st_ctime != w->attr.st_ctime
2014 ) {
2015 #if EV_USE_INOTIFY
2016 infy_del (EV_A_ w);
2017 infy_add (EV_A_ w);
2018 ev_stat_stat (EV_A_ w); /* avoid race... */
2019 #endif
2020
1664 ev_feed_event (EV_A_ w, EV_STAT); 2021 ev_feed_event (EV_A_ w, EV_STAT);
2022 }
1665} 2023}
1666 2024
1667void 2025void
1668ev_stat_start (EV_P_ ev_stat *w) 2026ev_stat_start (EV_P_ ev_stat *w)
1669{ 2027{
1679 if (w->interval < MIN_STAT_INTERVAL) 2037 if (w->interval < MIN_STAT_INTERVAL)
1680 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2038 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1681 2039
1682 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2040 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1683 ev_set_priority (&w->timer, ev_priority (w)); 2041 ev_set_priority (&w->timer, ev_priority (w));
2042
2043#if EV_USE_INOTIFY
2044 infy_init (EV_A);
2045
2046 if (fs_fd >= 0)
2047 infy_add (EV_A_ w);
2048 else
2049#endif
1684 ev_timer_start (EV_A_ &w->timer); 2050 ev_timer_start (EV_A_ &w->timer);
1685 2051
1686 ev_start (EV_A_ (W)w, 1); 2052 ev_start (EV_A_ (W)w, 1);
1687} 2053}
1688 2054
1689void 2055void
1690ev_stat_stop (EV_P_ ev_stat *w) 2056ev_stat_stop (EV_P_ ev_stat *w)
1691{ 2057{
1692 ev_clear_pending (EV_A_ (W)w); 2058 clear_pending (EV_A_ (W)w);
1693 if (expect_false (!ev_is_active (w))) 2059 if (expect_false (!ev_is_active (w)))
1694 return; 2060 return;
1695 2061
2062#if EV_USE_INOTIFY
2063 infy_del (EV_A_ w);
2064#endif
1696 ev_timer_stop (EV_A_ &w->timer); 2065 ev_timer_stop (EV_A_ &w->timer);
1697 2066
1698 ev_stop (EV_A_ (W)w); 2067 ev_stop (EV_A_ (W)w);
1699} 2068}
1700#endif 2069#endif
1701 2070
2071#if EV_IDLE_ENABLE
1702void 2072void
1703ev_idle_start (EV_P_ ev_idle *w) 2073ev_idle_start (EV_P_ ev_idle *w)
1704{ 2074{
1705 if (expect_false (ev_is_active (w))) 2075 if (expect_false (ev_is_active (w)))
1706 return; 2076 return;
1707 2077
2078 pri_adjust (EV_A_ (W)w);
2079
2080 {
2081 int active = ++idlecnt [ABSPRI (w)];
2082
2083 ++idleall;
1708 ev_start (EV_A_ (W)w, ++idlecnt); 2084 ev_start (EV_A_ (W)w, active);
2085
1709 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2086 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1710 idles [idlecnt - 1] = w; 2087 idles [ABSPRI (w)][active - 1] = w;
2088 }
1711} 2089}
1712 2090
1713void 2091void
1714ev_idle_stop (EV_P_ ev_idle *w) 2092ev_idle_stop (EV_P_ ev_idle *w)
1715{ 2093{
1716 ev_clear_pending (EV_A_ (W)w); 2094 clear_pending (EV_A_ (W)w);
1717 if (expect_false (!ev_is_active (w))) 2095 if (expect_false (!ev_is_active (w)))
1718 return; 2096 return;
1719 2097
1720 { 2098 {
1721 int active = ((W)w)->active; 2099 int active = ((W)w)->active;
1722 idles [active - 1] = idles [--idlecnt]; 2100
2101 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1723 ((W)idles [active - 1])->active = active; 2102 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2103
2104 ev_stop (EV_A_ (W)w);
2105 --idleall;
1724 } 2106 }
1725
1726 ev_stop (EV_A_ (W)w);
1727} 2107}
2108#endif
1728 2109
1729void 2110void
1730ev_prepare_start (EV_P_ ev_prepare *w) 2111ev_prepare_start (EV_P_ ev_prepare *w)
1731{ 2112{
1732 if (expect_false (ev_is_active (w))) 2113 if (expect_false (ev_is_active (w)))
1738} 2119}
1739 2120
1740void 2121void
1741ev_prepare_stop (EV_P_ ev_prepare *w) 2122ev_prepare_stop (EV_P_ ev_prepare *w)
1742{ 2123{
1743 ev_clear_pending (EV_A_ (W)w); 2124 clear_pending (EV_A_ (W)w);
1744 if (expect_false (!ev_is_active (w))) 2125 if (expect_false (!ev_is_active (w)))
1745 return; 2126 return;
1746 2127
1747 { 2128 {
1748 int active = ((W)w)->active; 2129 int active = ((W)w)->active;
1765} 2146}
1766 2147
1767void 2148void
1768ev_check_stop (EV_P_ ev_check *w) 2149ev_check_stop (EV_P_ ev_check *w)
1769{ 2150{
1770 ev_clear_pending (EV_A_ (W)w); 2151 clear_pending (EV_A_ (W)w);
1771 if (expect_false (!ev_is_active (w))) 2152 if (expect_false (!ev_is_active (w)))
1772 return; 2153 return;
1773 2154
1774 { 2155 {
1775 int active = ((W)w)->active; 2156 int active = ((W)w)->active;
1817} 2198}
1818 2199
1819void 2200void
1820ev_embed_stop (EV_P_ ev_embed *w) 2201ev_embed_stop (EV_P_ ev_embed *w)
1821{ 2202{
1822 ev_clear_pending (EV_A_ (W)w); 2203 clear_pending (EV_A_ (W)w);
1823 if (expect_false (!ev_is_active (w))) 2204 if (expect_false (!ev_is_active (w)))
1824 return; 2205 return;
1825 2206
1826 ev_io_stop (EV_A_ &w->io); 2207 ev_io_stop (EV_A_ &w->io);
2208
2209 ev_stop (EV_A_ (W)w);
2210}
2211#endif
2212
2213#if EV_FORK_ENABLE
2214void
2215ev_fork_start (EV_P_ ev_fork *w)
2216{
2217 if (expect_false (ev_is_active (w)))
2218 return;
2219
2220 ev_start (EV_A_ (W)w, ++forkcnt);
2221 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2222 forks [forkcnt - 1] = w;
2223}
2224
2225void
2226ev_fork_stop (EV_P_ ev_fork *w)
2227{
2228 clear_pending (EV_A_ (W)w);
2229 if (expect_false (!ev_is_active (w)))
2230 return;
2231
2232 {
2233 int active = ((W)w)->active;
2234 forks [active - 1] = forks [--forkcnt];
2235 ((W)forks [active - 1])->active = active;
2236 }
1827 2237
1828 ev_stop (EV_A_ (W)w); 2238 ev_stop (EV_A_ (W)w);
1829} 2239}
1830#endif 2240#endif
1831 2241

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines