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

Comparing libev/ev.c (file contents):
Revision 1.148 by root, Tue Nov 27 11:11:13 2007 UTC vs.
Revision 1.173 by root, Sun Dec 9 19:42:57 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/**/
178 220
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#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) */ 222#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 */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
183
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189 224
190#if __GNUC__ >= 3 225#if __GNUC__ >= 3
191# define expect(expr,value) __builtin_expect ((expr),(value)) 226# 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)) 227# 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 228#else
201# define expect(expr,value) (expr) 229# define expect(expr,value) (expr)
202# define inline_speed static
203# define inline_size static
204# define noinline 230# define noinline
231# if __STDC_VERSION__ < 199901L
232# define inline
233# endif
205#endif 234#endif
206 235
207#define expect_false(expr) expect ((expr) != 0, 0) 236#define expect_false(expr) expect ((expr) != 0, 0)
208#define expect_true(expr) expect ((expr) != 0, 1) 237#define expect_true(expr) expect ((expr) != 0, 1)
238#define inline_size static inline
239
240#if EV_MINIMAL
241# define inline_speed static noinline
242#else
243# define inline_speed static inline
244#endif
209 245
210#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 246#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
211#define ABSPRI(w) ((w)->priority - EV_MINPRI) 247#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
212 248
213#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 249#define EMPTY /* required for microsofts broken pseudo-c compiler */
214#define EMPTY2(a,b) /* used to suppress some warnings */ 250#define EMPTY2(a,b) /* used to suppress some warnings */
215 251
216typedef ev_watcher *W; 252typedef ev_watcher *W;
217typedef ev_watcher_list *WL; 253typedef ev_watcher_list *WL;
218typedef ev_watcher_time *WT; 254typedef ev_watcher_time *WT;
254ev_set_allocator (void *(*cb)(void *ptr, long size)) 290ev_set_allocator (void *(*cb)(void *ptr, long size))
255{ 291{
256 alloc = cb; 292 alloc = cb;
257} 293}
258 294
259static void * 295inline_speed void *
260ev_realloc (void *ptr, long size) 296ev_realloc (void *ptr, long size)
261{ 297{
262 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 298 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
263 299
264 if (!ptr && size) 300 if (!ptr && size)
288typedef struct 324typedef struct
289{ 325{
290 W w; 326 W w;
291 int events; 327 int events;
292} ANPENDING; 328} ANPENDING;
329
330#if EV_USE_INOTIFY
331typedef struct
332{
333 WL head;
334} ANFS;
335#endif
293 336
294#if EV_MULTIPLICITY 337#if EV_MULTIPLICITY
295 338
296 struct ev_loop 339 struct ev_loop
297 { 340 {
354{ 397{
355 return ev_rt_now; 398 return ev_rt_now;
356} 399}
357#endif 400#endif
358 401
359#define array_roundsize(type,n) (((n) | 4) & ~3) 402int inline_size
403array_nextsize (int elem, int cur, int cnt)
404{
405 int ncur = cur + 1;
406
407 do
408 ncur <<= 1;
409 while (cnt > ncur);
410
411 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
412 if (elem * ncur > 4096)
413 {
414 ncur *= elem;
415 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
416 ncur = ncur - sizeof (void *) * 4;
417 ncur /= elem;
418 }
419
420 return ncur;
421}
422
423static noinline void *
424array_realloc (int elem, void *base, int *cur, int cnt)
425{
426 *cur = array_nextsize (elem, *cur, cnt);
427 return ev_realloc (base, elem * *cur);
428}
360 429
361#define array_needsize(type,base,cur,cnt,init) \ 430#define array_needsize(type,base,cur,cnt,init) \
362 if (expect_false ((cnt) > cur)) \ 431 if (expect_false ((cnt) > (cur))) \
363 { \ 432 { \
364 int newcnt = cur; \ 433 int ocur_ = (cur); \
365 do \ 434 (base) = (type *)array_realloc \
366 { \ 435 (sizeof (type), (base), &(cur), (cnt)); \
367 newcnt = array_roundsize (type, newcnt << 1); \ 436 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 } 437 }
375 438
439#if 0
376#define array_slim(type,stem) \ 440#define array_slim(type,stem) \
377 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 441 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
378 { \ 442 { \
379 stem ## max = array_roundsize (stem ## cnt >> 1); \ 443 stem ## max = array_roundsize (stem ## cnt >> 1); \
380 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 444 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
381 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 445 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
382 } 446 }
447#endif
383 448
384#define array_free(stem, idx) \ 449#define array_free(stem, idx) \
385 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 450 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
386 451
387/*****************************************************************************/ 452/*****************************************************************************/
388 453
389void noinline 454void noinline
390ev_feed_event (EV_P_ void *w, int revents) 455ev_feed_event (EV_P_ void *w, int revents)
391{ 456{
392 W w_ = (W)w; 457 W w_ = (W)w;
458 int pri = ABSPRI (w_);
393 459
394 if (expect_false (w_->pending)) 460 if (expect_false (w_->pending))
461 pendings [pri][w_->pending - 1].events |= revents;
462 else
395 { 463 {
464 w_->pending = ++pendingcnt [pri];
465 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
466 pendings [pri][w_->pending - 1].w = w_;
396 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 467 pendings [pri][w_->pending - 1].events = revents;
397 return;
398 } 468 }
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} 469}
405 470
406void inline_size 471void inline_size
407queue_events (EV_P_ W *events, int eventcnt, int type) 472queue_events (EV_P_ W *events, int eventcnt, int type)
408{ 473{
443} 508}
444 509
445void 510void
446ev_feed_fd_event (EV_P_ int fd, int revents) 511ev_feed_fd_event (EV_P_ int fd, int revents)
447{ 512{
513 if (fd >= 0 && fd < anfdmax)
448 fd_event (EV_A_ fd, revents); 514 fd_event (EV_A_ fd, revents);
449} 515}
450 516
451void inline_size 517void inline_size
452fd_reify (EV_P) 518fd_reify (EV_P)
453{ 519{
547static void noinline 613static void noinline
548fd_rearm_all (EV_P) 614fd_rearm_all (EV_P)
549{ 615{
550 int fd; 616 int fd;
551 617
552 /* this should be highly optimised to not do anything but set a flag */
553 for (fd = 0; fd < anfdmax; ++fd) 618 for (fd = 0; fd < anfdmax; ++fd)
554 if (anfds [fd].events) 619 if (anfds [fd].events)
555 { 620 {
556 anfds [fd].events = 0; 621 anfds [fd].events = 0;
557 fd_change (EV_A_ fd); 622 fd_change (EV_A_ fd);
684 for (signum = signalmax; signum--; ) 749 for (signum = signalmax; signum--; )
685 if (signals [signum].gotsig) 750 if (signals [signum].gotsig)
686 ev_feed_signal_event (EV_A_ signum + 1); 751 ev_feed_signal_event (EV_A_ signum + 1);
687} 752}
688 753
689void inline_size 754void inline_speed
690fd_intern (int fd) 755fd_intern (int fd)
691{ 756{
692#ifdef _WIN32 757#ifdef _WIN32
693 int arg = 1; 758 int arg = 1;
694 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
709 ev_unref (EV_A); /* child watcher should not keep loop alive */ 774 ev_unref (EV_A); /* child watcher should not keep loop alive */
710} 775}
711 776
712/*****************************************************************************/ 777/*****************************************************************************/
713 778
714static ev_child *childs [PID_HASHSIZE]; 779static ev_child *childs [EV_PID_HASHSIZE];
715 780
716#ifndef _WIN32 781#ifndef _WIN32
717 782
718static ev_signal childev; 783static ev_signal childev;
719 784
720void inline_speed 785void inline_speed
721child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 786child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
722{ 787{
723 ev_child *w; 788 ev_child *w;
724 789
725 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 790 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
726 if (w->pid == pid || !w->pid) 791 if (w->pid == pid || !w->pid)
727 { 792 {
728 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 793 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
729 w->rpid = pid; 794 w->rpid = pid;
730 w->rstatus = status; 795 w->rstatus = status;
731 ev_feed_event (EV_A_ (W)w, EV_CHILD); 796 ev_feed_event (EV_A_ (W)w, EV_CHILD);
732 } 797 }
733} 798}
734 799
735#ifndef WCONTINUED 800#ifndef WCONTINUED
751 /* make sure we are called again until all childs have been reaped */ 816 /* 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 */ 817 /* 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); 818 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
754 819
755 child_reap (EV_A_ sw, pid, pid, status); 820 child_reap (EV_A_ sw, pid, pid, status);
821 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 */ 822 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
757} 823}
758 824
759#endif 825#endif
760 826
761/*****************************************************************************/ 827/*****************************************************************************/
844ev_backend (EV_P) 910ev_backend (EV_P)
845{ 911{
846 return backend; 912 return backend;
847} 913}
848 914
849static void 915unsigned int
916ev_loop_count (EV_P)
917{
918 return loop_count;
919}
920
921static void noinline
850loop_init (EV_P_ unsigned int flags) 922loop_init (EV_P_ unsigned int flags)
851{ 923{
852 if (!backend) 924 if (!backend)
853 { 925 {
854#if EV_USE_MONOTONIC 926#if EV_USE_MONOTONIC
862 ev_rt_now = ev_time (); 934 ev_rt_now = ev_time ();
863 mn_now = get_clock (); 935 mn_now = get_clock ();
864 now_floor = mn_now; 936 now_floor = mn_now;
865 rtmn_diff = ev_rt_now - mn_now; 937 rtmn_diff = ev_rt_now - mn_now;
866 938
939 /* pid check not overridable via env */
940#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid ();
943#endif
944
867 if (!(flags & EVFLAG_NOENV) 945 if (!(flags & EVFLAG_NOENV)
868 && !enable_secure () 946 && !enable_secure ()
869 && getenv ("LIBEV_FLAGS")) 947 && getenv ("LIBEV_FLAGS"))
870 flags = atoi (getenv ("LIBEV_FLAGS")); 948 flags = atoi (getenv ("LIBEV_FLAGS"));
871 949
872 if (!(flags & 0x0000ffffUL)) 950 if (!(flags & 0x0000ffffUL))
873 flags |= ev_recommended_backends (); 951 flags |= ev_recommended_backends ();
874 952
875 backend = 0; 953 backend = 0;
954 backend_fd = -1;
955#if EV_USE_INOTIFY
956 fs_fd = -2;
957#endif
958
876#if EV_USE_PORT 959#if EV_USE_PORT
877 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 960 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
878#endif 961#endif
879#if EV_USE_KQUEUE 962#if EV_USE_KQUEUE
880 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 963 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
892 ev_init (&sigev, sigcb); 975 ev_init (&sigev, sigcb);
893 ev_set_priority (&sigev, EV_MAXPRI); 976 ev_set_priority (&sigev, EV_MAXPRI);
894 } 977 }
895} 978}
896 979
897static void 980static void noinline
898loop_destroy (EV_P) 981loop_destroy (EV_P)
899{ 982{
900 int i; 983 int i;
984
985#if EV_USE_INOTIFY
986 if (fs_fd >= 0)
987 close (fs_fd);
988#endif
989
990 if (backend_fd >= 0)
991 close (backend_fd);
901 992
902#if EV_USE_PORT 993#if EV_USE_PORT
903 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 994 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
904#endif 995#endif
905#if EV_USE_KQUEUE 996#if EV_USE_KQUEUE
914#if EV_USE_SELECT 1005#if EV_USE_SELECT
915 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1006 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
916#endif 1007#endif
917 1008
918 for (i = NUMPRI; i--; ) 1009 for (i = NUMPRI; i--; )
1010 {
919 array_free (pending, [i]); 1011 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE
1013 array_free (idle, [i]);
1014#endif
1015 }
920 1016
921 /* have to use the microsoft-never-gets-it-right macro */ 1017 /* have to use the microsoft-never-gets-it-right macro */
922 array_free (fdchange, EMPTY0); 1018 array_free (fdchange, EMPTY);
923 array_free (timer, EMPTY0); 1019 array_free (timer, EMPTY);
924#if EV_PERIODIC_ENABLE 1020#if EV_PERIODIC_ENABLE
925 array_free (periodic, EMPTY0); 1021 array_free (periodic, EMPTY);
926#endif 1022#endif
927 array_free (idle, EMPTY0);
928 array_free (prepare, EMPTY0); 1023 array_free (prepare, EMPTY);
929 array_free (check, EMPTY0); 1024 array_free (check, EMPTY);
930 1025
931 backend = 0; 1026 backend = 0;
932} 1027}
933 1028
934static void 1029void inline_size infy_fork (EV_P);
1030
1031void inline_size
935loop_fork (EV_P) 1032loop_fork (EV_P)
936{ 1033{
937#if EV_USE_PORT 1034#if EV_USE_PORT
938 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1035 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
939#endif 1036#endif
940#if EV_USE_KQUEUE 1037#if EV_USE_KQUEUE
941 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1038 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
942#endif 1039#endif
943#if EV_USE_EPOLL 1040#if EV_USE_EPOLL
944 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1041 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1042#endif
1043#if EV_USE_INOTIFY
1044 infy_fork (EV_A);
945#endif 1045#endif
946 1046
947 if (ev_is_active (&sigev)) 1047 if (ev_is_active (&sigev))
948 { 1048 {
949 /* default loop */ 1049 /* default loop */
1065 postfork = 1; 1165 postfork = 1;
1066} 1166}
1067 1167
1068/*****************************************************************************/ 1168/*****************************************************************************/
1069 1169
1070int inline_size 1170void
1071any_pending (EV_P) 1171ev_invoke (EV_P_ void *w, int revents)
1072{ 1172{
1073 int pri; 1173 EV_CB_INVOKE ((W)w, revents);
1074
1075 for (pri = NUMPRI; pri--; )
1076 if (pendingcnt [pri])
1077 return 1;
1078
1079 return 0;
1080} 1174}
1081 1175
1082void inline_speed 1176void inline_speed
1083call_pending (EV_P) 1177call_pending (EV_P)
1084{ 1178{
1089 { 1183 {
1090 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1184 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1091 1185
1092 if (expect_true (p->w)) 1186 if (expect_true (p->w))
1093 { 1187 {
1094 assert (("non-pending watcher on pending list", p->w->pending)); 1188 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1095 1189
1096 p->w->pending = 0; 1190 p->w->pending = 0;
1097 EV_CB_INVOKE (p->w, p->events); 1191 EV_CB_INVOKE (p->w, p->events);
1098 } 1192 }
1099 } 1193 }
1104{ 1198{
1105 while (timercnt && ((WT)timers [0])->at <= mn_now) 1199 while (timercnt && ((WT)timers [0])->at <= mn_now)
1106 { 1200 {
1107 ev_timer *w = timers [0]; 1201 ev_timer *w = timers [0];
1108 1202
1109 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1110 1204
1111 /* first reschedule or stop timer */ 1205 /* first reschedule or stop timer */
1112 if (w->repeat) 1206 if (w->repeat)
1113 { 1207 {
1114 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1208 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1132{ 1226{
1133 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1134 { 1228 {
1135 ev_periodic *w = periodics [0]; 1229 ev_periodic *w = periodics [0];
1136 1230
1137 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1138 1232
1139 /* first reschedule or stop timer */ 1233 /* first reschedule or stop timer */
1140 if (w->reschedule_cb) 1234 if (w->reschedule_cb)
1141 { 1235 {
1142 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1143 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1144 downheap ((WT *)periodics, periodiccnt, 0); 1238 downheap ((WT *)periodics, periodiccnt, 0);
1145 } 1239 }
1146 else if (w->interval) 1240 else if (w->interval)
1147 { 1241 {
1148 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1242 ((WT)w)->at = w->offset + floor ((ev_rt_now - w->offset) / w->interval + 1.) * w->interval;
1149 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1243 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); 1244 downheap ((WT *)periodics, periodiccnt, 0);
1151 } 1245 }
1152 else 1246 else
1153 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1167 ev_periodic *w = periodics [i]; 1261 ev_periodic *w = periodics [i];
1168 1262
1169 if (w->reschedule_cb) 1263 if (w->reschedule_cb)
1170 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1171 else if (w->interval) 1265 else if (w->interval)
1172 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1266 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1173 } 1267 }
1174 1268
1175 /* now rebuild the heap */ 1269 /* now rebuild the heap */
1176 for (i = periodiccnt >> 1; i--; ) 1270 for (i = periodiccnt >> 1; i--; )
1177 downheap ((WT *)periodics, periodiccnt, i); 1271 downheap ((WT *)periodics, periodiccnt, i);
1178} 1272}
1179#endif 1273#endif
1180 1274
1275#if EV_IDLE_ENABLE
1276void inline_size
1277idle_reify (EV_P)
1278{
1279 if (expect_false (idleall))
1280 {
1281 int pri;
1282
1283 for (pri = NUMPRI; pri--; )
1284 {
1285 if (pendingcnt [pri])
1286 break;
1287
1288 if (idlecnt [pri])
1289 {
1290 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1291 break;
1292 }
1293 }
1294 }
1295}
1296#endif
1297
1181int inline_size 1298int inline_size
1182time_update_monotonic (EV_P) 1299time_update_monotonic (EV_P)
1183{ 1300{
1184 mn_now = get_clock (); 1301 mn_now = get_clock ();
1185 1302
1209 ev_tstamp odiff = rtmn_diff; 1326 ev_tstamp odiff = rtmn_diff;
1210 1327
1211 /* loop a few times, before making important decisions. 1328 /* loop a few times, before making important decisions.
1212 * on the choice of "4": one iteration isn't enough, 1329 * on the choice of "4": one iteration isn't enough,
1213 * in case we get preempted during the calls to 1330 * in case we get preempted during the calls to
1214 * ev_time and get_clock. a second call is almost guarenteed 1331 * ev_time and get_clock. a second call is almost guaranteed
1215 * to succeed in that case, though. and looping a few more times 1332 * 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 1333 * doesn't hurt either as we only do this on time-jumps or
1217 * in the unlikely event of getting preempted here. 1334 * in the unlikely event of having been preempted here.
1218 */ 1335 */
1219 for (i = 4; --i; ) 1336 for (i = 4; --i; )
1220 { 1337 {
1221 rtmn_diff = ev_rt_now - mn_now; 1338 rtmn_diff = ev_rt_now - mn_now;
1222 1339
1244 { 1361 {
1245#if EV_PERIODIC_ENABLE 1362#if EV_PERIODIC_ENABLE
1246 periodics_reschedule (EV_A); 1363 periodics_reschedule (EV_A);
1247#endif 1364#endif
1248 1365
1249 /* adjust timers. this is easy, as the offset is the same for all */ 1366 /* adjust timers. this is easy, as the offset is the same for all of them */
1250 for (i = 0; i < timercnt; ++i) 1367 for (i = 0; i < timercnt; ++i)
1251 ((WT)timers [i])->at += ev_rt_now - mn_now; 1368 ((WT)timers [i])->at += ev_rt_now - mn_now;
1252 } 1369 }
1253 1370
1254 mn_now = ev_rt_now; 1371 mn_now = ev_rt_now;
1274{ 1391{
1275 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1392 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1276 ? EVUNLOOP_ONE 1393 ? EVUNLOOP_ONE
1277 : EVUNLOOP_CANCEL; 1394 : EVUNLOOP_CANCEL;
1278 1395
1279 while (activecnt) 1396 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1397
1398 do
1280 { 1399 {
1281 /* we might have forked, so reify kernel state if necessary */ 1400#ifndef _WIN32
1401 if (expect_false (curpid)) /* penalise the forking check even more */
1402 if (expect_false (getpid () != curpid))
1403 {
1404 curpid = getpid ();
1405 postfork = 1;
1406 }
1407#endif
1408
1282 #if EV_FORK_ENABLE 1409#if EV_FORK_ENABLE
1410 /* we might have forked, so queue fork handlers */
1283 if (expect_false (postfork)) 1411 if (expect_false (postfork))
1284 if (forkcnt) 1412 if (forkcnt)
1285 { 1413 {
1286 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1287 call_pending (EV_A); 1415 call_pending (EV_A);
1288 } 1416 }
1289 #endif 1417#endif
1290 1418
1291 /* queue check watchers (and execute them) */ 1419 /* queue prepare watchers (and execute them) */
1292 if (expect_false (preparecnt)) 1420 if (expect_false (preparecnt))
1293 { 1421 {
1294 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1295 call_pending (EV_A); 1423 call_pending (EV_A);
1296 } 1424 }
1297 1425
1426 if (expect_false (!activecnt))
1427 break;
1428
1298 /* we might have forked, so reify kernel state if necessary */ 1429 /* we might have forked, so reify kernel state if necessary */
1299 if (expect_false (postfork)) 1430 if (expect_false (postfork))
1300 loop_fork (EV_A); 1431 loop_fork (EV_A);
1301 1432
1302 /* update fd-related kernel structures */ 1433 /* update fd-related kernel structures */
1303 fd_reify (EV_A); 1434 fd_reify (EV_A);
1304 1435
1305 /* calculate blocking time */ 1436 /* calculate blocking time */
1306 { 1437 {
1307 double block; 1438 ev_tstamp block;
1308 1439
1309 if (flags & EVLOOP_NONBLOCK || idlecnt) 1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1310 block = 0.; /* do not block at all */ 1441 block = 0.; /* do not block at all */
1311 else 1442 else
1312 { 1443 {
1313 /* update time to cancel out callback processing overhead */ 1444 /* update time to cancel out callback processing overhead */
1314#if EV_USE_MONOTONIC 1445#if EV_USE_MONOTONIC
1338#endif 1469#endif
1339 1470
1340 if (expect_false (block < 0.)) block = 0.; 1471 if (expect_false (block < 0.)) block = 0.;
1341 } 1472 }
1342 1473
1474 ++loop_count;
1343 backend_poll (EV_A_ block); 1475 backend_poll (EV_A_ block);
1344 } 1476 }
1345 1477
1346 /* update ev_rt_now, do magic */ 1478 /* update ev_rt_now, do magic */
1347 time_update (EV_A); 1479 time_update (EV_A);
1350 timers_reify (EV_A); /* relative timers called last */ 1482 timers_reify (EV_A); /* relative timers called last */
1351#if EV_PERIODIC_ENABLE 1483#if EV_PERIODIC_ENABLE
1352 periodics_reify (EV_A); /* absolute timers called first */ 1484 periodics_reify (EV_A); /* absolute timers called first */
1353#endif 1485#endif
1354 1486
1487#if EV_IDLE_ENABLE
1355 /* queue idle watchers unless other events are pending */ 1488 /* queue idle watchers unless other events are pending */
1356 if (idlecnt && !any_pending (EV_A)) 1489 idle_reify (EV_A);
1357 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1490#endif
1358 1491
1359 /* queue check watchers, to be executed first */ 1492 /* queue check watchers, to be executed first */
1360 if (expect_false (checkcnt)) 1493 if (expect_false (checkcnt))
1361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1494 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1362 1495
1363 call_pending (EV_A); 1496 call_pending (EV_A);
1364 1497
1365 if (expect_false (loop_done))
1366 break;
1367 } 1498 }
1499 while (expect_true (activecnt && !loop_done));
1368 1500
1369 if (loop_done == EVUNLOOP_ONE) 1501 if (loop_done == EVUNLOOP_ONE)
1370 loop_done = EVUNLOOP_CANCEL; 1502 loop_done = EVUNLOOP_CANCEL;
1371} 1503}
1372 1504
1399 head = &(*head)->next; 1531 head = &(*head)->next;
1400 } 1532 }
1401} 1533}
1402 1534
1403void inline_speed 1535void inline_speed
1404ev_clear_pending (EV_P_ W w) 1536clear_pending (EV_P_ W w)
1405{ 1537{
1406 if (w->pending) 1538 if (w->pending)
1407 { 1539 {
1408 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1540 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1409 w->pending = 0; 1541 w->pending = 0;
1410 } 1542 }
1411} 1543}
1412 1544
1545int
1546ev_clear_pending (EV_P_ void *w)
1547{
1548 W w_ = (W)w;
1549 int pending = w_->pending;
1550
1551 if (expect_true (pending))
1552 {
1553 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1554 w_->pending = 0;
1555 p->w = 0;
1556 return p->events;
1557 }
1558 else
1559 return 0;
1560}
1561
1562void inline_size
1563pri_adjust (EV_P_ W w)
1564{
1565 int pri = w->priority;
1566 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1567 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1568 w->priority = pri;
1569}
1570
1413void inline_speed 1571void inline_speed
1414ev_start (EV_P_ W w, int active) 1572ev_start (EV_P_ W w, int active)
1415{ 1573{
1416 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1574 pri_adjust (EV_A_ w);
1417 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1418
1419 w->active = active; 1575 w->active = active;
1420 ev_ref (EV_A); 1576 ev_ref (EV_A);
1421} 1577}
1422 1578
1423void inline_size 1579void inline_size
1427 w->active = 0; 1583 w->active = 0;
1428} 1584}
1429 1585
1430/*****************************************************************************/ 1586/*****************************************************************************/
1431 1587
1432void 1588void noinline
1433ev_io_start (EV_P_ ev_io *w) 1589ev_io_start (EV_P_ ev_io *w)
1434{ 1590{
1435 int fd = w->fd; 1591 int fd = w->fd;
1436 1592
1437 if (expect_false (ev_is_active (w))) 1593 if (expect_false (ev_is_active (w)))
1444 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1600 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1445 1601
1446 fd_change (EV_A_ fd); 1602 fd_change (EV_A_ fd);
1447} 1603}
1448 1604
1449void 1605void noinline
1450ev_io_stop (EV_P_ ev_io *w) 1606ev_io_stop (EV_P_ ev_io *w)
1451{ 1607{
1452 ev_clear_pending (EV_A_ (W)w); 1608 clear_pending (EV_A_ (W)w);
1453 if (expect_false (!ev_is_active (w))) 1609 if (expect_false (!ev_is_active (w)))
1454 return; 1610 return;
1455 1611
1456 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1612 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1457 1613
1459 ev_stop (EV_A_ (W)w); 1615 ev_stop (EV_A_ (W)w);
1460 1616
1461 fd_change (EV_A_ w->fd); 1617 fd_change (EV_A_ w->fd);
1462} 1618}
1463 1619
1464void 1620void noinline
1465ev_timer_start (EV_P_ ev_timer *w) 1621ev_timer_start (EV_P_ ev_timer *w)
1466{ 1622{
1467 if (expect_false (ev_is_active (w))) 1623 if (expect_false (ev_is_active (w)))
1468 return; 1624 return;
1469 1625
1474 ev_start (EV_A_ (W)w, ++timercnt); 1630 ev_start (EV_A_ (W)w, ++timercnt);
1475 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1631 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1476 timers [timercnt - 1] = w; 1632 timers [timercnt - 1] = w;
1477 upheap ((WT *)timers, timercnt - 1); 1633 upheap ((WT *)timers, timercnt - 1);
1478 1634
1635 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1636}
1637
1638void noinline
1639ev_timer_stop (EV_P_ ev_timer *w)
1640{
1641 clear_pending (EV_A_ (W)w);
1642 if (expect_false (!ev_is_active (w)))
1643 return;
1644
1479 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1645 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1480}
1481 1646
1482void 1647 {
1483ev_timer_stop (EV_P_ ev_timer *w) 1648 int active = ((W)w)->active;
1484{
1485 ev_clear_pending (EV_A_ (W)w);
1486 if (expect_false (!ev_is_active (w)))
1487 return;
1488 1649
1489 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1490
1491 if (expect_true (((W)w)->active < timercnt--)) 1650 if (expect_true (--active < --timercnt))
1492 { 1651 {
1493 timers [((W)w)->active - 1] = timers [timercnt]; 1652 timers [active] = timers [timercnt];
1494 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1653 adjustheap ((WT *)timers, timercnt, active);
1495 } 1654 }
1655 }
1496 1656
1497 ((WT)w)->at -= mn_now; 1657 ((WT)w)->at -= mn_now;
1498 1658
1499 ev_stop (EV_A_ (W)w); 1659 ev_stop (EV_A_ (W)w);
1500} 1660}
1501 1661
1502void 1662void noinline
1503ev_timer_again (EV_P_ ev_timer *w) 1663ev_timer_again (EV_P_ ev_timer *w)
1504{ 1664{
1505 if (ev_is_active (w)) 1665 if (ev_is_active (w))
1506 { 1666 {
1507 if (w->repeat) 1667 if (w->repeat)
1518 ev_timer_start (EV_A_ w); 1678 ev_timer_start (EV_A_ w);
1519 } 1679 }
1520} 1680}
1521 1681
1522#if EV_PERIODIC_ENABLE 1682#if EV_PERIODIC_ENABLE
1523void 1683void noinline
1524ev_periodic_start (EV_P_ ev_periodic *w) 1684ev_periodic_start (EV_P_ ev_periodic *w)
1525{ 1685{
1526 if (expect_false (ev_is_active (w))) 1686 if (expect_false (ev_is_active (w)))
1527 return; 1687 return;
1528 1688
1530 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1690 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1531 else if (w->interval) 1691 else if (w->interval)
1532 { 1692 {
1533 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1693 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1534 /* this formula differs from the one in periodic_reify because we do not always round up */ 1694 /* this formula differs from the one in periodic_reify because we do not always round up */
1535 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1695 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1536 } 1696 }
1697 else
1698 ((WT)w)->at = w->offset;
1537 1699
1538 ev_start (EV_A_ (W)w, ++periodiccnt); 1700 ev_start (EV_A_ (W)w, ++periodiccnt);
1539 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1701 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1540 periodics [periodiccnt - 1] = w; 1702 periodics [periodiccnt - 1] = w;
1541 upheap ((WT *)periodics, periodiccnt - 1); 1703 upheap ((WT *)periodics, periodiccnt - 1);
1542 1704
1705 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1706}
1707
1708void noinline
1709ev_periodic_stop (EV_P_ ev_periodic *w)
1710{
1711 clear_pending (EV_A_ (W)w);
1712 if (expect_false (!ev_is_active (w)))
1713 return;
1714
1543 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1715 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1544}
1545 1716
1546void 1717 {
1547ev_periodic_stop (EV_P_ ev_periodic *w) 1718 int active = ((W)w)->active;
1548{
1549 ev_clear_pending (EV_A_ (W)w);
1550 if (expect_false (!ev_is_active (w)))
1551 return;
1552 1719
1553 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1554
1555 if (expect_true (((W)w)->active < periodiccnt--)) 1720 if (expect_true (--active < --periodiccnt))
1556 { 1721 {
1557 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1722 periodics [active] = periodics [periodiccnt];
1558 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1723 adjustheap ((WT *)periodics, periodiccnt, active);
1559 } 1724 }
1725 }
1560 1726
1561 ev_stop (EV_A_ (W)w); 1727 ev_stop (EV_A_ (W)w);
1562} 1728}
1563 1729
1564void 1730void noinline
1565ev_periodic_again (EV_P_ ev_periodic *w) 1731ev_periodic_again (EV_P_ ev_periodic *w)
1566{ 1732{
1567 /* TODO: use adjustheap and recalculation */ 1733 /* TODO: use adjustheap and recalculation */
1568 ev_periodic_stop (EV_A_ w); 1734 ev_periodic_stop (EV_A_ w);
1569 ev_periodic_start (EV_A_ w); 1735 ev_periodic_start (EV_A_ w);
1572 1738
1573#ifndef SA_RESTART 1739#ifndef SA_RESTART
1574# define SA_RESTART 0 1740# define SA_RESTART 0
1575#endif 1741#endif
1576 1742
1577void 1743void noinline
1578ev_signal_start (EV_P_ ev_signal *w) 1744ev_signal_start (EV_P_ ev_signal *w)
1579{ 1745{
1580#if EV_MULTIPLICITY 1746#if EV_MULTIPLICITY
1581 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1747 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1582#endif 1748#endif
1601 sigaction (w->signum, &sa, 0); 1767 sigaction (w->signum, &sa, 0);
1602#endif 1768#endif
1603 } 1769 }
1604} 1770}
1605 1771
1606void 1772void noinline
1607ev_signal_stop (EV_P_ ev_signal *w) 1773ev_signal_stop (EV_P_ ev_signal *w)
1608{ 1774{
1609 ev_clear_pending (EV_A_ (W)w); 1775 clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w))) 1776 if (expect_false (!ev_is_active (w)))
1611 return; 1777 return;
1612 1778
1613 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1780 ev_stop (EV_A_ (W)w);
1625#endif 1791#endif
1626 if (expect_false (ev_is_active (w))) 1792 if (expect_false (ev_is_active (w)))
1627 return; 1793 return;
1628 1794
1629 ev_start (EV_A_ (W)w, 1); 1795 ev_start (EV_A_ (W)w, 1);
1630 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1796 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1631} 1797}
1632 1798
1633void 1799void
1634ev_child_stop (EV_P_ ev_child *w) 1800ev_child_stop (EV_P_ ev_child *w)
1635{ 1801{
1636 ev_clear_pending (EV_A_ (W)w); 1802 clear_pending (EV_A_ (W)w);
1637 if (expect_false (!ev_is_active (w))) 1803 if (expect_false (!ev_is_active (w)))
1638 return; 1804 return;
1639 1805
1640 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1806 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1641 ev_stop (EV_A_ (W)w); 1807 ev_stop (EV_A_ (W)w);
1642} 1808}
1643 1809
1644#if EV_STAT_ENABLE 1810#if EV_STAT_ENABLE
1645 1811
1649# endif 1815# endif
1650 1816
1651#define DEF_STAT_INTERVAL 5.0074891 1817#define DEF_STAT_INTERVAL 5.0074891
1652#define MIN_STAT_INTERVAL 0.1074891 1818#define MIN_STAT_INTERVAL 0.1074891
1653 1819
1820static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1821
1822#if EV_USE_INOTIFY
1823# define EV_INOTIFY_BUFSIZE 8192
1824
1825static void noinline
1826infy_add (EV_P_ ev_stat *w)
1827{
1828 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);
1829
1830 if (w->wd < 0)
1831 {
1832 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1833
1834 /* monitor some parent directory for speedup hints */
1835 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1836 {
1837 char path [4096];
1838 strcpy (path, w->path);
1839
1840 do
1841 {
1842 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1843 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1844
1845 char *pend = strrchr (path, '/');
1846
1847 if (!pend)
1848 break; /* whoops, no '/', complain to your admin */
1849
1850 *pend = 0;
1851 w->wd = inotify_add_watch (fs_fd, path, mask);
1852 }
1853 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1854 }
1855 }
1856 else
1857 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1858
1859 if (w->wd >= 0)
1860 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1861}
1862
1863static void noinline
1864infy_del (EV_P_ ev_stat *w)
1865{
1866 int slot;
1867 int wd = w->wd;
1868
1869 if (wd < 0)
1870 return;
1871
1872 w->wd = -2;
1873 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1874 wlist_del (&fs_hash [slot].head, (WL)w);
1875
1876 /* remove this watcher, if others are watching it, they will rearm */
1877 inotify_rm_watch (fs_fd, wd);
1878}
1879
1880static void noinline
1881infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1882{
1883 if (slot < 0)
1884 /* overflow, need to check for all hahs slots */
1885 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1886 infy_wd (EV_A_ slot, wd, ev);
1887 else
1888 {
1889 WL w_;
1890
1891 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1892 {
1893 ev_stat *w = (ev_stat *)w_;
1894 w_ = w_->next; /* lets us remove this watcher and all before it */
1895
1896 if (w->wd == wd || wd == -1)
1897 {
1898 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1899 {
1900 w->wd = -1;
1901 infy_add (EV_A_ w); /* re-add, no matter what */
1902 }
1903
1904 stat_timer_cb (EV_A_ &w->timer, 0);
1905 }
1906 }
1907 }
1908}
1909
1910static void
1911infy_cb (EV_P_ ev_io *w, int revents)
1912{
1913 char buf [EV_INOTIFY_BUFSIZE];
1914 struct inotify_event *ev = (struct inotify_event *)buf;
1915 int ofs;
1916 int len = read (fs_fd, buf, sizeof (buf));
1917
1918 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1919 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1920}
1921
1922void inline_size
1923infy_init (EV_P)
1924{
1925 if (fs_fd != -2)
1926 return;
1927
1928 fs_fd = inotify_init ();
1929
1930 if (fs_fd >= 0)
1931 {
1932 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1933 ev_set_priority (&fs_w, EV_MAXPRI);
1934 ev_io_start (EV_A_ &fs_w);
1935 }
1936}
1937
1938void inline_size
1939infy_fork (EV_P)
1940{
1941 int slot;
1942
1943 if (fs_fd < 0)
1944 return;
1945
1946 close (fs_fd);
1947 fs_fd = inotify_init ();
1948
1949 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1950 {
1951 WL w_ = fs_hash [slot].head;
1952 fs_hash [slot].head = 0;
1953
1954 while (w_)
1955 {
1956 ev_stat *w = (ev_stat *)w_;
1957 w_ = w_->next; /* lets us add this watcher */
1958
1959 w->wd = -1;
1960
1961 if (fs_fd >= 0)
1962 infy_add (EV_A_ w); /* re-add, no matter what */
1963 else
1964 ev_timer_start (EV_A_ &w->timer);
1965 }
1966
1967 }
1968}
1969
1970#endif
1971
1654void 1972void
1655ev_stat_stat (EV_P_ ev_stat *w) 1973ev_stat_stat (EV_P_ ev_stat *w)
1656{ 1974{
1657 if (lstat (w->path, &w->attr) < 0) 1975 if (lstat (w->path, &w->attr) < 0)
1658 w->attr.st_nlink = 0; 1976 w->attr.st_nlink = 0;
1659 else if (!w->attr.st_nlink) 1977 else if (!w->attr.st_nlink)
1660 w->attr.st_nlink = 1; 1978 w->attr.st_nlink = 1;
1661} 1979}
1662 1980
1663static void 1981static void noinline
1664stat_timer_cb (EV_P_ ev_timer *w_, int revents) 1982stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1665{ 1983{
1666 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 1984 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1667 1985
1668 /* we copy this here each the time so that */ 1986 /* we copy this here each the time so that */
1669 /* prev has the old value when the callback gets invoked */ 1987 /* prev has the old value when the callback gets invoked */
1670 w->prev = w->attr; 1988 w->prev = w->attr;
1671 ev_stat_stat (EV_A_ w); 1989 ev_stat_stat (EV_A_ w);
1672 1990
1673 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 1991 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1992 if (
1993 w->prev.st_dev != w->attr.st_dev
1994 || w->prev.st_ino != w->attr.st_ino
1995 || w->prev.st_mode != w->attr.st_mode
1996 || w->prev.st_nlink != w->attr.st_nlink
1997 || w->prev.st_uid != w->attr.st_uid
1998 || w->prev.st_gid != w->attr.st_gid
1999 || w->prev.st_rdev != w->attr.st_rdev
2000 || w->prev.st_size != w->attr.st_size
2001 || w->prev.st_atime != w->attr.st_atime
2002 || w->prev.st_mtime != w->attr.st_mtime
2003 || w->prev.st_ctime != w->attr.st_ctime
2004 ) {
2005 #if EV_USE_INOTIFY
2006 infy_del (EV_A_ w);
2007 infy_add (EV_A_ w);
2008 ev_stat_stat (EV_A_ w); /* avoid race... */
2009 #endif
2010
1674 ev_feed_event (EV_A_ w, EV_STAT); 2011 ev_feed_event (EV_A_ w, EV_STAT);
2012 }
1675} 2013}
1676 2014
1677void 2015void
1678ev_stat_start (EV_P_ ev_stat *w) 2016ev_stat_start (EV_P_ ev_stat *w)
1679{ 2017{
1689 if (w->interval < MIN_STAT_INTERVAL) 2027 if (w->interval < MIN_STAT_INTERVAL)
1690 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2028 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1691 2029
1692 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2030 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1693 ev_set_priority (&w->timer, ev_priority (w)); 2031 ev_set_priority (&w->timer, ev_priority (w));
2032
2033#if EV_USE_INOTIFY
2034 infy_init (EV_A);
2035
2036 if (fs_fd >= 0)
2037 infy_add (EV_A_ w);
2038 else
2039#endif
1694 ev_timer_start (EV_A_ &w->timer); 2040 ev_timer_start (EV_A_ &w->timer);
1695 2041
1696 ev_start (EV_A_ (W)w, 1); 2042 ev_start (EV_A_ (W)w, 1);
1697} 2043}
1698 2044
1699void 2045void
1700ev_stat_stop (EV_P_ ev_stat *w) 2046ev_stat_stop (EV_P_ ev_stat *w)
1701{ 2047{
1702 ev_clear_pending (EV_A_ (W)w); 2048 clear_pending (EV_A_ (W)w);
1703 if (expect_false (!ev_is_active (w))) 2049 if (expect_false (!ev_is_active (w)))
1704 return; 2050 return;
1705 2051
2052#if EV_USE_INOTIFY
2053 infy_del (EV_A_ w);
2054#endif
1706 ev_timer_stop (EV_A_ &w->timer); 2055 ev_timer_stop (EV_A_ &w->timer);
1707 2056
1708 ev_stop (EV_A_ (W)w); 2057 ev_stop (EV_A_ (W)w);
1709} 2058}
1710#endif 2059#endif
1711 2060
2061#if EV_IDLE_ENABLE
1712void 2062void
1713ev_idle_start (EV_P_ ev_idle *w) 2063ev_idle_start (EV_P_ ev_idle *w)
1714{ 2064{
1715 if (expect_false (ev_is_active (w))) 2065 if (expect_false (ev_is_active (w)))
1716 return; 2066 return;
1717 2067
2068 pri_adjust (EV_A_ (W)w);
2069
2070 {
2071 int active = ++idlecnt [ABSPRI (w)];
2072
2073 ++idleall;
1718 ev_start (EV_A_ (W)w, ++idlecnt); 2074 ev_start (EV_A_ (W)w, active);
2075
1719 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2076 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1720 idles [idlecnt - 1] = w; 2077 idles [ABSPRI (w)][active - 1] = w;
2078 }
1721} 2079}
1722 2080
1723void 2081void
1724ev_idle_stop (EV_P_ ev_idle *w) 2082ev_idle_stop (EV_P_ ev_idle *w)
1725{ 2083{
1726 ev_clear_pending (EV_A_ (W)w); 2084 clear_pending (EV_A_ (W)w);
1727 if (expect_false (!ev_is_active (w))) 2085 if (expect_false (!ev_is_active (w)))
1728 return; 2086 return;
1729 2087
1730 { 2088 {
1731 int active = ((W)w)->active; 2089 int active = ((W)w)->active;
1732 idles [active - 1] = idles [--idlecnt]; 2090
2091 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1733 ((W)idles [active - 1])->active = active; 2092 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2093
2094 ev_stop (EV_A_ (W)w);
2095 --idleall;
1734 } 2096 }
1735
1736 ev_stop (EV_A_ (W)w);
1737} 2097}
2098#endif
1738 2099
1739void 2100void
1740ev_prepare_start (EV_P_ ev_prepare *w) 2101ev_prepare_start (EV_P_ ev_prepare *w)
1741{ 2102{
1742 if (expect_false (ev_is_active (w))) 2103 if (expect_false (ev_is_active (w)))
1748} 2109}
1749 2110
1750void 2111void
1751ev_prepare_stop (EV_P_ ev_prepare *w) 2112ev_prepare_stop (EV_P_ ev_prepare *w)
1752{ 2113{
1753 ev_clear_pending (EV_A_ (W)w); 2114 clear_pending (EV_A_ (W)w);
1754 if (expect_false (!ev_is_active (w))) 2115 if (expect_false (!ev_is_active (w)))
1755 return; 2116 return;
1756 2117
1757 { 2118 {
1758 int active = ((W)w)->active; 2119 int active = ((W)w)->active;
1775} 2136}
1776 2137
1777void 2138void
1778ev_check_stop (EV_P_ ev_check *w) 2139ev_check_stop (EV_P_ ev_check *w)
1779{ 2140{
1780 ev_clear_pending (EV_A_ (W)w); 2141 clear_pending (EV_A_ (W)w);
1781 if (expect_false (!ev_is_active (w))) 2142 if (expect_false (!ev_is_active (w)))
1782 return; 2143 return;
1783 2144
1784 { 2145 {
1785 int active = ((W)w)->active; 2146 int active = ((W)w)->active;
1827} 2188}
1828 2189
1829void 2190void
1830ev_embed_stop (EV_P_ ev_embed *w) 2191ev_embed_stop (EV_P_ ev_embed *w)
1831{ 2192{
1832 ev_clear_pending (EV_A_ (W)w); 2193 clear_pending (EV_A_ (W)w);
1833 if (expect_false (!ev_is_active (w))) 2194 if (expect_false (!ev_is_active (w)))
1834 return; 2195 return;
1835 2196
1836 ev_io_stop (EV_A_ &w->io); 2197 ev_io_stop (EV_A_ &w->io);
1837 2198
1852} 2213}
1853 2214
1854void 2215void
1855ev_fork_stop (EV_P_ ev_fork *w) 2216ev_fork_stop (EV_P_ ev_fork *w)
1856{ 2217{
1857 ev_clear_pending (EV_A_ (W)w); 2218 clear_pending (EV_A_ (W)w);
1858 if (expect_false (!ev_is_active (w))) 2219 if (expect_false (!ev_is_active (w)))
1859 return; 2220 return;
1860 2221
1861 { 2222 {
1862 int active = ((W)w)->active; 2223 int active = ((W)w)->active;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines