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

Comparing libev/ev.c (file contents):
Revision 1.140 by root, Mon Nov 26 19:49:36 2007 UTC vs.
Revision 1.158 by root, Thu Nov 29 17:28:13 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 */ 227# define inline_size static inline /* inline for codesize */
193# if EV_MINIMAL 228# if EV_MINIMAL
… …
198# define inline_speed static inline 233# define inline_speed static inline
199# endif 234# endif
200#else 235#else
201# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
202# define inline_speed static 237# define inline_speed static
203# define inline_minimal static 238# define inline_size static
204# define noinline 239# define noinline
205#endif 240#endif
206 241
207#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
208#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
… …
225 260
226/*****************************************************************************/ 261/*****************************************************************************/
227 262
228static void (*syserr_cb)(const char *msg); 263static void (*syserr_cb)(const char *msg);
229 264
265void
230void ev_set_syserr_cb (void (*cb)(const char *msg)) 266ev_set_syserr_cb (void (*cb)(const char *msg))
231{ 267{
232 syserr_cb = cb; 268 syserr_cb = cb;
233} 269}
234 270
235static void 271static void noinline
236syserr (const char *msg) 272syserr (const char *msg)
237{ 273{
238 if (!msg) 274 if (!msg)
239 msg = "(libev) system error"; 275 msg = "(libev) system error";
240 276
… …
247 } 283 }
248} 284}
249 285
250static void *(*alloc)(void *ptr, long size); 286static void *(*alloc)(void *ptr, long size);
251 287
288void
252void ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
253{ 290{
254 alloc = cb; 291 alloc = cb;
255} 292}
256 293
257static void * 294inline_speed void *
258ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, long size)
259{ 296{
260 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
261 298
262 if (!ptr && size) 299 if (!ptr && size)
… …
286typedef struct 323typedef struct
287{ 324{
288 W w; 325 W w;
289 int events; 326 int events;
290} ANPENDING; 327} ANPENDING;
328
329#if EV_USE_INOTIFY
330typedef struct
331{
332 WL head;
333} ANFS;
334#endif
291 335
292#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
293 337
294 struct ev_loop 338 struct ev_loop
295 { 339 {
… …
315 359
316#endif 360#endif
317 361
318/*****************************************************************************/ 362/*****************************************************************************/
319 363
320ev_tstamp noinline 364ev_tstamp
321ev_time (void) 365ev_time (void)
322{ 366{
323#if EV_USE_REALTIME 367#if EV_USE_REALTIME
324 struct timespec ts; 368 struct timespec ts;
325 clock_gettime (CLOCK_REALTIME, &ts); 369 clock_gettime (CLOCK_REALTIME, &ts);
… …
382#define array_free(stem, idx) \ 426#define array_free(stem, idx) \
383 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
384 428
385/*****************************************************************************/ 429/*****************************************************************************/
386 430
387void inline_size
388anfds_init (ANFD *base, int count)
389{
390 while (count--)
391 {
392 base->head = 0;
393 base->events = EV_NONE;
394 base->reify = 0;
395
396 ++base;
397 }
398}
399
400void noinline 431void noinline
401ev_feed_event (EV_P_ void *w, int revents) 432ev_feed_event (EV_P_ void *w, int revents)
402{ 433{
403 W w_ = (W)w; 434 W w_ = (W)w;
404 435
… …
412 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2); 443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
413 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
414 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
415} 446}
416 447
417static void 448void inline_size
418queue_events (EV_P_ W *events, int eventcnt, int type) 449queue_events (EV_P_ W *events, int eventcnt, int type)
419{ 450{
420 int i; 451 int i;
421 452
422 for (i = 0; i < eventcnt; ++i) 453 for (i = 0; i < eventcnt; ++i)
423 ev_feed_event (EV_A_ events [i], type); 454 ev_feed_event (EV_A_ events [i], type);
424} 455}
425 456
457/*****************************************************************************/
458
459void inline_size
460anfds_init (ANFD *base, int count)
461{
462 while (count--)
463 {
464 base->head = 0;
465 base->events = EV_NONE;
466 base->reify = 0;
467
468 ++base;
469 }
470}
471
426void inline_speed 472void inline_speed
427fd_event (EV_P_ int fd, int revents) 473fd_event (EV_P_ int fd, int revents)
428{ 474{
429 ANFD *anfd = anfds + fd; 475 ANFD *anfd = anfds + fd;
430 ev_io *w; 476 ev_io *w;
… …
441void 487void
442ev_feed_fd_event (EV_P_ int fd, int revents) 488ev_feed_fd_event (EV_P_ int fd, int revents)
443{ 489{
444 fd_event (EV_A_ fd, revents); 490 fd_event (EV_A_ fd, revents);
445} 491}
446
447/*****************************************************************************/
448 492
449void inline_size 493void inline_size
450fd_reify (EV_P) 494fd_reify (EV_P)
451{ 495{
452 int i; 496 int i;
… …
545static void noinline 589static void noinline
546fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
547{ 591{
548 int fd; 592 int fd;
549 593
550 /* this should be highly optimised to not do anything but set a flag */
551 for (fd = 0; fd < anfdmax; ++fd) 594 for (fd = 0; fd < anfdmax; ++fd)
552 if (anfds [fd].events) 595 if (anfds [fd].events)
553 { 596 {
554 anfds [fd].events = 0; 597 anfds [fd].events = 0;
555 fd_change (EV_A_ fd); 598 fd_change (EV_A_ fd);
… …
707 ev_unref (EV_A); /* child watcher should not keep loop alive */ 750 ev_unref (EV_A); /* child watcher should not keep loop alive */
708} 751}
709 752
710/*****************************************************************************/ 753/*****************************************************************************/
711 754
712static ev_child *childs [PID_HASHSIZE]; 755static ev_child *childs [EV_PID_HASHSIZE];
713 756
714#ifndef _WIN32 757#ifndef _WIN32
715 758
716static ev_signal childev; 759static ev_signal childev;
717
718#ifndef WCONTINUED
719# define WCONTINUED 0
720#endif
721 760
722void inline_speed 761void inline_speed
723child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 762child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
724{ 763{
725 ev_child *w; 764 ev_child *w;
726 765
727 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
728 if (w->pid == pid || !w->pid) 767 if (w->pid == pid || !w->pid)
729 { 768 {
730 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
731 w->rpid = pid; 770 w->rpid = pid;
732 w->rstatus = status; 771 w->rstatus = status;
733 ev_feed_event (EV_A_ (W)w, EV_CHILD); 772 ev_feed_event (EV_A_ (W)w, EV_CHILD);
734 } 773 }
735} 774}
736 775
776#ifndef WCONTINUED
777# define WCONTINUED 0
778#endif
779
737static void 780static void
738childcb (EV_P_ ev_signal *sw, int revents) 781childcb (EV_P_ ev_signal *sw, int revents)
739{ 782{
740 int pid, status; 783 int pid, status;
741 784
785 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
742 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 786 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
743 { 787 if (!WCONTINUED
788 || errno != EINVAL
789 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
790 return;
791
744 /* make sure we are called again until all childs have been reaped */ 792 /* make sure we are called again until all childs have been reaped */
745 /* we need to do it this way so that the callback gets called before we continue */ 793 /* we need to do it this way so that the callback gets called before we continue */
746 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 794 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
747 795
748 child_reap (EV_A_ sw, pid, pid, status); 796 child_reap (EV_A_ sw, pid, pid, status);
797 if (EV_PID_HASHSIZE > 1)
749 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 798 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
750 }
751} 799}
752 800
753#endif 801#endif
754 802
755/*****************************************************************************/ 803/*****************************************************************************/
… …
838ev_backend (EV_P) 886ev_backend (EV_P)
839{ 887{
840 return backend; 888 return backend;
841} 889}
842 890
843static void 891static void noinline
844loop_init (EV_P_ unsigned int flags) 892loop_init (EV_P_ unsigned int flags)
845{ 893{
846 if (!backend) 894 if (!backend)
847 { 895 {
848#if EV_USE_MONOTONIC 896#if EV_USE_MONOTONIC
… …
856 ev_rt_now = ev_time (); 904 ev_rt_now = ev_time ();
857 mn_now = get_clock (); 905 mn_now = get_clock ();
858 now_floor = mn_now; 906 now_floor = mn_now;
859 rtmn_diff = ev_rt_now - mn_now; 907 rtmn_diff = ev_rt_now - mn_now;
860 908
909 /* pid check not overridable via env */
910#ifndef _WIN32
911 if (flags & EVFLAG_FORKCHECK)
912 curpid = getpid ();
913#endif
914
861 if (!(flags & EVFLAG_NOENV) 915 if (!(flags & EVFLAG_NOENV)
862 && !enable_secure () 916 && !enable_secure ()
863 && getenv ("LIBEV_FLAGS")) 917 && getenv ("LIBEV_FLAGS"))
864 flags = atoi (getenv ("LIBEV_FLAGS")); 918 flags = atoi (getenv ("LIBEV_FLAGS"));
865 919
866 if (!(flags & 0x0000ffffUL)) 920 if (!(flags & 0x0000ffffUL))
867 flags |= ev_recommended_backends (); 921 flags |= ev_recommended_backends ();
868 922
869 backend = 0; 923 backend = 0;
924 backend_fd = -1;
925#if EV_USE_INOTIFY
926 fs_fd = -2;
927#endif
928
870#if EV_USE_PORT 929#if EV_USE_PORT
871 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 930 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
872#endif 931#endif
873#if EV_USE_KQUEUE 932#if EV_USE_KQUEUE
874 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 933 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
886 ev_init (&sigev, sigcb); 945 ev_init (&sigev, sigcb);
887 ev_set_priority (&sigev, EV_MAXPRI); 946 ev_set_priority (&sigev, EV_MAXPRI);
888 } 947 }
889} 948}
890 949
891static void 950static void noinline
892loop_destroy (EV_P) 951loop_destroy (EV_P)
893{ 952{
894 int i; 953 int i;
954
955#if EV_USE_INOTIFY
956 if (fs_fd >= 0)
957 close (fs_fd);
958#endif
959
960 if (backend_fd >= 0)
961 close (backend_fd);
895 962
896#if EV_USE_PORT 963#if EV_USE_PORT
897 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 964 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
898#endif 965#endif
899#if EV_USE_KQUEUE 966#if EV_USE_KQUEUE
… …
923 array_free (check, EMPTY0); 990 array_free (check, EMPTY0);
924 991
925 backend = 0; 992 backend = 0;
926} 993}
927 994
928static void 995void inline_size infy_fork (EV_P);
996
997void inline_size
929loop_fork (EV_P) 998loop_fork (EV_P)
930{ 999{
931#if EV_USE_PORT 1000#if EV_USE_PORT
932 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1001 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
933#endif 1002#endif
934#if EV_USE_KQUEUE 1003#if EV_USE_KQUEUE
935 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1004 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
936#endif 1005#endif
937#if EV_USE_EPOLL 1006#if EV_USE_EPOLL
938 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1007 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1008#endif
1009#if EV_USE_INOTIFY
1010 infy_fork (EV_A);
939#endif 1011#endif
940 1012
941 if (ev_is_active (&sigev)) 1013 if (ev_is_active (&sigev))
942 { 1014 {
943 /* default loop */ 1015 /* default loop */
… …
1083 { 1155 {
1084 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1156 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1085 1157
1086 if (expect_true (p->w)) 1158 if (expect_true (p->w))
1087 { 1159 {
1088 assert (("non-pending watcher on pending list", p->w->pending)); 1160 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1089 1161
1090 p->w->pending = 0; 1162 p->w->pending = 0;
1091 EV_CB_INVOKE (p->w, p->events); 1163 EV_CB_INVOKE (p->w, p->events);
1092 } 1164 }
1093 } 1165 }
… …
1098{ 1170{
1099 while (timercnt && ((WT)timers [0])->at <= mn_now) 1171 while (timercnt && ((WT)timers [0])->at <= mn_now)
1100 { 1172 {
1101 ev_timer *w = timers [0]; 1173 ev_timer *w = timers [0];
1102 1174
1103 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1104 1176
1105 /* first reschedule or stop timer */ 1177 /* first reschedule or stop timer */
1106 if (w->repeat) 1178 if (w->repeat)
1107 { 1179 {
1108 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1180 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
… …
1126{ 1198{
1127 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1128 { 1200 {
1129 ev_periodic *w = periodics [0]; 1201 ev_periodic *w = periodics [0];
1130 1202
1131 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1132 1204
1133 /* first reschedule or stop timer */ 1205 /* first reschedule or stop timer */
1134 if (w->reschedule_cb) 1206 if (w->reschedule_cb)
1135 { 1207 {
1136 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1208 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
… …
1203 ev_tstamp odiff = rtmn_diff; 1275 ev_tstamp odiff = rtmn_diff;
1204 1276
1205 /* loop a few times, before making important decisions. 1277 /* loop a few times, before making important decisions.
1206 * on the choice of "4": one iteration isn't enough, 1278 * on the choice of "4": one iteration isn't enough,
1207 * in case we get preempted during the calls to 1279 * in case we get preempted during the calls to
1208 * ev_time and get_clock. a second call is almost guarenteed 1280 * ev_time and get_clock. a second call is almost guaranteed
1209 * to succeed in that case, though. and looping a few more times 1281 * to succeed in that case, though. and looping a few more times
1210 * doesn't hurt either as we only do this on time-jumps or 1282 * doesn't hurt either as we only do this on time-jumps or
1211 * in the unlikely event of getting preempted here. 1283 * in the unlikely event of having been preempted here.
1212 */ 1284 */
1213 for (i = 4; --i; ) 1285 for (i = 4; --i; )
1214 { 1286 {
1215 rtmn_diff = ev_rt_now - mn_now; 1287 rtmn_diff = ev_rt_now - mn_now;
1216 1288
… …
1238 { 1310 {
1239#if EV_PERIODIC_ENABLE 1311#if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1312 periodics_reschedule (EV_A);
1241#endif 1313#endif
1242 1314
1243 /* adjust timers. this is easy, as the offset is the same for all */ 1315 /* adjust timers. this is easy, as the offset is the same for all of them */
1244 for (i = 0; i < timercnt; ++i) 1316 for (i = 0; i < timercnt; ++i)
1245 ((WT)timers [i])->at += ev_rt_now - mn_now; 1317 ((WT)timers [i])->at += ev_rt_now - mn_now;
1246 } 1318 }
1247 1319
1248 mn_now = ev_rt_now; 1320 mn_now = ev_rt_now;
… …
1268{ 1340{
1269 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1341 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1270 ? EVUNLOOP_ONE 1342 ? EVUNLOOP_ONE
1271 : EVUNLOOP_CANCEL; 1343 : EVUNLOOP_CANCEL;
1272 1344
1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346
1273 while (activecnt) 1347 while (activecnt)
1274 { 1348 {
1349#ifndef _WIN32
1350 if (expect_false (curpid)) /* penalise the forking check even more */
1351 if (expect_false (getpid () != curpid))
1352 {
1353 curpid = getpid ();
1354 postfork = 1;
1355 }
1356#endif
1357
1358#if EV_FORK_ENABLE
1359 /* we might have forked, so queue fork handlers */
1360 if (expect_false (postfork))
1361 if (forkcnt)
1362 {
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A);
1365 }
1366#endif
1367
1275 /* queue check watchers (and execute them) */ 1368 /* queue check watchers (and execute them) */
1276 if (expect_false (preparecnt)) 1369 if (expect_false (preparecnt))
1277 { 1370 {
1278 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1279 call_pending (EV_A); 1372 call_pending (EV_A);
… …
1286 /* update fd-related kernel structures */ 1379 /* update fd-related kernel structures */
1287 fd_reify (EV_A); 1380 fd_reify (EV_A);
1288 1381
1289 /* calculate blocking time */ 1382 /* calculate blocking time */
1290 { 1383 {
1291 double block; 1384 ev_tstamp block;
1292 1385
1293 if (flags & EVLOOP_NONBLOCK || idlecnt) 1386 if (flags & EVLOOP_NONBLOCK || idlecnt)
1294 block = 0.; /* do not block at all */ 1387 block = 0.; /* do not block at all */
1295 else 1388 else
1296 { 1389 {
… …
1458 ev_start (EV_A_ (W)w, ++timercnt); 1551 ev_start (EV_A_ (W)w, ++timercnt);
1459 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1552 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1460 timers [timercnt - 1] = w; 1553 timers [timercnt - 1] = w;
1461 upheap ((WT *)timers, timercnt - 1); 1554 upheap ((WT *)timers, timercnt - 1);
1462 1555
1463 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1556 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1464} 1557}
1465 1558
1466void 1559void
1467ev_timer_stop (EV_P_ ev_timer *w) 1560ev_timer_stop (EV_P_ ev_timer *w)
1468{ 1561{
… …
1470 if (expect_false (!ev_is_active (w))) 1563 if (expect_false (!ev_is_active (w)))
1471 return; 1564 return;
1472 1565
1473 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1566 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1474 1567
1568 {
1569 int active = ((W)w)->active;
1570
1475 if (expect_true (((W)w)->active < timercnt--)) 1571 if (expect_true (--active < --timercnt))
1476 { 1572 {
1477 timers [((W)w)->active - 1] = timers [timercnt]; 1573 timers [active] = timers [timercnt];
1478 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1574 adjustheap ((WT *)timers, timercnt, active);
1479 } 1575 }
1576 }
1480 1577
1481 ((WT)w)->at -= mn_now; 1578 ((WT)w)->at -= mn_now;
1482 1579
1483 ev_stop (EV_A_ (W)w); 1580 ev_stop (EV_A_ (W)w);
1484} 1581}
… …
1522 ev_start (EV_A_ (W)w, ++periodiccnt); 1619 ev_start (EV_A_ (W)w, ++periodiccnt);
1523 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1620 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1524 periodics [periodiccnt - 1] = w; 1621 periodics [periodiccnt - 1] = w;
1525 upheap ((WT *)periodics, periodiccnt - 1); 1622 upheap ((WT *)periodics, periodiccnt - 1);
1526 1623
1527 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1624 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1528} 1625}
1529 1626
1530void 1627void
1531ev_periodic_stop (EV_P_ ev_periodic *w) 1628ev_periodic_stop (EV_P_ ev_periodic *w)
1532{ 1629{
… …
1534 if (expect_false (!ev_is_active (w))) 1631 if (expect_false (!ev_is_active (w)))
1535 return; 1632 return;
1536 1633
1537 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1634 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1538 1635
1636 {
1637 int active = ((W)w)->active;
1638
1539 if (expect_true (((W)w)->active < periodiccnt--)) 1639 if (expect_true (--active < --periodiccnt))
1540 { 1640 {
1541 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1641 periodics [active] = periodics [periodiccnt];
1542 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1642 adjustheap ((WT *)periodics, periodiccnt, active);
1543 } 1643 }
1644 }
1544 1645
1545 ev_stop (EV_A_ (W)w); 1646 ev_stop (EV_A_ (W)w);
1546} 1647}
1547 1648
1548void 1649void
… …
1551 /* TODO: use adjustheap and recalculation */ 1652 /* TODO: use adjustheap and recalculation */
1552 ev_periodic_stop (EV_A_ w); 1653 ev_periodic_stop (EV_A_ w);
1553 ev_periodic_start (EV_A_ w); 1654 ev_periodic_start (EV_A_ w);
1554} 1655}
1555#endif 1656#endif
1556
1557void
1558ev_idle_start (EV_P_ ev_idle *w)
1559{
1560 if (expect_false (ev_is_active (w)))
1561 return;
1562
1563 ev_start (EV_A_ (W)w, ++idlecnt);
1564 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1565 idles [idlecnt - 1] = w;
1566}
1567
1568void
1569ev_idle_stop (EV_P_ ev_idle *w)
1570{
1571 ev_clear_pending (EV_A_ (W)w);
1572 if (expect_false (!ev_is_active (w)))
1573 return;
1574
1575 {
1576 int active = ((W)w)->active;
1577 idles [active - 1] = idles [--idlecnt];
1578 ((W)idles [active - 1])->active = active;
1579 }
1580
1581 ev_stop (EV_A_ (W)w);
1582}
1583
1584void
1585ev_prepare_start (EV_P_ ev_prepare *w)
1586{
1587 if (expect_false (ev_is_active (w)))
1588 return;
1589
1590 ev_start (EV_A_ (W)w, ++preparecnt);
1591 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1592 prepares [preparecnt - 1] = w;
1593}
1594
1595void
1596ev_prepare_stop (EV_P_ ev_prepare *w)
1597{
1598 ev_clear_pending (EV_A_ (W)w);
1599 if (expect_false (!ev_is_active (w)))
1600 return;
1601
1602 {
1603 int active = ((W)w)->active;
1604 prepares [active - 1] = prepares [--preparecnt];
1605 ((W)prepares [active - 1])->active = active;
1606 }
1607
1608 ev_stop (EV_A_ (W)w);
1609}
1610
1611void
1612ev_check_start (EV_P_ ev_check *w)
1613{
1614 if (expect_false (ev_is_active (w)))
1615 return;
1616
1617 ev_start (EV_A_ (W)w, ++checkcnt);
1618 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1619 checks [checkcnt - 1] = w;
1620}
1621
1622void
1623ev_check_stop (EV_P_ ev_check *w)
1624{
1625 ev_clear_pending (EV_A_ (W)w);
1626 if (expect_false (!ev_is_active (w)))
1627 return;
1628
1629 {
1630 int active = ((W)w)->active;
1631 checks [active - 1] = checks [--checkcnt];
1632 ((W)checks [active - 1])->active = active;
1633 }
1634
1635 ev_stop (EV_A_ (W)w);
1636}
1637 1657
1638#ifndef SA_RESTART 1658#ifndef SA_RESTART
1639# define SA_RESTART 0 1659# define SA_RESTART 0
1640#endif 1660#endif
1641 1661
… …
1690#endif 1710#endif
1691 if (expect_false (ev_is_active (w))) 1711 if (expect_false (ev_is_active (w)))
1692 return; 1712 return;
1693 1713
1694 ev_start (EV_A_ (W)w, 1); 1714 ev_start (EV_A_ (W)w, 1);
1695 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1715 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1696} 1716}
1697 1717
1698void 1718void
1699ev_child_stop (EV_P_ ev_child *w) 1719ev_child_stop (EV_P_ ev_child *w)
1700{ 1720{
1701 ev_clear_pending (EV_A_ (W)w); 1721 ev_clear_pending (EV_A_ (W)w);
1702 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1703 return; 1723 return;
1704 1724
1705 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1725 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1726 ev_stop (EV_A_ (W)w);
1727}
1728
1729#if EV_STAT_ENABLE
1730
1731# ifdef _WIN32
1732# undef lstat
1733# define lstat(a,b) _stati64 (a,b)
1734# endif
1735
1736#define DEF_STAT_INTERVAL 5.0074891
1737#define MIN_STAT_INTERVAL 0.1074891
1738
1739static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1740
1741#if EV_USE_INOTIFY
1742# define EV_INOTIFY_BUFSIZE 8192
1743
1744static void noinline
1745infy_add (EV_P_ ev_stat *w)
1746{
1747 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);
1748
1749 if (w->wd < 0)
1750 {
1751 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1752
1753 /* monitor some parent directory for speedup hints */
1754 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1755 {
1756 char path [4096];
1757 strcpy (path, w->path);
1758
1759 do
1760 {
1761 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1762 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1763
1764 char *pend = strrchr (path, '/');
1765
1766 if (!pend)
1767 break; /* whoops, no '/', complain to your admin */
1768
1769 *pend = 0;
1770 w->wd = inotify_add_watch (fs_fd, path, mask);
1771 }
1772 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1773 }
1774 }
1775 else
1776 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1777
1778 if (w->wd >= 0)
1779 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1780}
1781
1782static void noinline
1783infy_del (EV_P_ ev_stat *w)
1784{
1785 int slot;
1786 int wd = w->wd;
1787
1788 if (wd < 0)
1789 return;
1790
1791 w->wd = -2;
1792 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1793 wlist_del (&fs_hash [slot].head, (WL)w);
1794
1795 /* remove this watcher, if others are watching it, they will rearm */
1796 inotify_rm_watch (fs_fd, wd);
1797}
1798
1799static void noinline
1800infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1801{
1802 if (slot < 0)
1803 /* overflow, need to check for all hahs slots */
1804 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1805 infy_wd (EV_A_ slot, wd, ev);
1806 else
1807 {
1808 WL w_;
1809
1810 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1811 {
1812 ev_stat *w = (ev_stat *)w_;
1813 w_ = w_->next; /* lets us remove this watcher and all before it */
1814
1815 if (w->wd == wd || wd == -1)
1816 {
1817 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1818 {
1819 w->wd = -1;
1820 infy_add (EV_A_ w); /* re-add, no matter what */
1821 }
1822
1823 stat_timer_cb (EV_A_ &w->timer, 0);
1824 }
1825 }
1826 }
1827}
1828
1829static void
1830infy_cb (EV_P_ ev_io *w, int revents)
1831{
1832 char buf [EV_INOTIFY_BUFSIZE];
1833 struct inotify_event *ev = (struct inotify_event *)buf;
1834 int ofs;
1835 int len = read (fs_fd, buf, sizeof (buf));
1836
1837 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1838 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1839}
1840
1841void inline_size
1842infy_init (EV_P)
1843{
1844 if (fs_fd != -2)
1845 return;
1846
1847 fs_fd = inotify_init ();
1848
1849 if (fs_fd >= 0)
1850 {
1851 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1852 ev_set_priority (&fs_w, EV_MAXPRI);
1853 ev_io_start (EV_A_ &fs_w);
1854 }
1855}
1856
1857void inline_size
1858infy_fork (EV_P)
1859{
1860 int slot;
1861
1862 if (fs_fd < 0)
1863 return;
1864
1865 close (fs_fd);
1866 fs_fd = inotify_init ();
1867
1868 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1869 {
1870 WL w_ = fs_hash [slot].head;
1871 fs_hash [slot].head = 0;
1872
1873 while (w_)
1874 {
1875 ev_stat *w = (ev_stat *)w_;
1876 w_ = w_->next; /* lets us add this watcher */
1877
1878 w->wd = -1;
1879
1880 if (fs_fd >= 0)
1881 infy_add (EV_A_ w); /* re-add, no matter what */
1882 else
1883 ev_timer_start (EV_A_ &w->timer);
1884 }
1885
1886 }
1887}
1888
1889#endif
1890
1891void
1892ev_stat_stat (EV_P_ ev_stat *w)
1893{
1894 if (lstat (w->path, &w->attr) < 0)
1895 w->attr.st_nlink = 0;
1896 else if (!w->attr.st_nlink)
1897 w->attr.st_nlink = 1;
1898}
1899
1900static void noinline
1901stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1902{
1903 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1904
1905 /* we copy this here each the time so that */
1906 /* prev has the old value when the callback gets invoked */
1907 w->prev = w->attr;
1908 ev_stat_stat (EV_A_ w);
1909
1910 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1911 if (
1912 w->prev.st_dev != w->attr.st_dev
1913 || w->prev.st_ino != w->attr.st_ino
1914 || w->prev.st_mode != w->attr.st_mode
1915 || w->prev.st_nlink != w->attr.st_nlink
1916 || w->prev.st_uid != w->attr.st_uid
1917 || w->prev.st_gid != w->attr.st_gid
1918 || w->prev.st_rdev != w->attr.st_rdev
1919 || w->prev.st_size != w->attr.st_size
1920 || w->prev.st_atime != w->attr.st_atime
1921 || w->prev.st_mtime != w->attr.st_mtime
1922 || w->prev.st_ctime != w->attr.st_ctime
1923 ) {
1924 #if EV_USE_INOTIFY
1925 infy_del (EV_A_ w);
1926 infy_add (EV_A_ w);
1927 ev_stat_stat (EV_A_ w); /* avoid race... */
1928 #endif
1929
1930 ev_feed_event (EV_A_ w, EV_STAT);
1931 }
1932}
1933
1934void
1935ev_stat_start (EV_P_ ev_stat *w)
1936{
1937 if (expect_false (ev_is_active (w)))
1938 return;
1939
1940 /* since we use memcmp, we need to clear any padding data etc. */
1941 memset (&w->prev, 0, sizeof (ev_statdata));
1942 memset (&w->attr, 0, sizeof (ev_statdata));
1943
1944 ev_stat_stat (EV_A_ w);
1945
1946 if (w->interval < MIN_STAT_INTERVAL)
1947 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1948
1949 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1950 ev_set_priority (&w->timer, ev_priority (w));
1951
1952#if EV_USE_INOTIFY
1953 infy_init (EV_A);
1954
1955 if (fs_fd >= 0)
1956 infy_add (EV_A_ w);
1957 else
1958#endif
1959 ev_timer_start (EV_A_ &w->timer);
1960
1961 ev_start (EV_A_ (W)w, 1);
1962}
1963
1964void
1965ev_stat_stop (EV_P_ ev_stat *w)
1966{
1967 ev_clear_pending (EV_A_ (W)w);
1968 if (expect_false (!ev_is_active (w)))
1969 return;
1970
1971#if EV_USE_INOTIFY
1972 infy_del (EV_A_ w);
1973#endif
1974 ev_timer_stop (EV_A_ &w->timer);
1975
1976 ev_stop (EV_A_ (W)w);
1977}
1978#endif
1979
1980void
1981ev_idle_start (EV_P_ ev_idle *w)
1982{
1983 if (expect_false (ev_is_active (w)))
1984 return;
1985
1986 ev_start (EV_A_ (W)w, ++idlecnt);
1987 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1988 idles [idlecnt - 1] = w;
1989}
1990
1991void
1992ev_idle_stop (EV_P_ ev_idle *w)
1993{
1994 ev_clear_pending (EV_A_ (W)w);
1995 if (expect_false (!ev_is_active (w)))
1996 return;
1997
1998 {
1999 int active = ((W)w)->active;
2000 idles [active - 1] = idles [--idlecnt];
2001 ((W)idles [active - 1])->active = active;
2002 }
2003
2004 ev_stop (EV_A_ (W)w);
2005}
2006
2007void
2008ev_prepare_start (EV_P_ ev_prepare *w)
2009{
2010 if (expect_false (ev_is_active (w)))
2011 return;
2012
2013 ev_start (EV_A_ (W)w, ++preparecnt);
2014 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2015 prepares [preparecnt - 1] = w;
2016}
2017
2018void
2019ev_prepare_stop (EV_P_ ev_prepare *w)
2020{
2021 ev_clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w)))
2023 return;
2024
2025 {
2026 int active = ((W)w)->active;
2027 prepares [active - 1] = prepares [--preparecnt];
2028 ((W)prepares [active - 1])->active = active;
2029 }
2030
2031 ev_stop (EV_A_ (W)w);
2032}
2033
2034void
2035ev_check_start (EV_P_ ev_check *w)
2036{
2037 if (expect_false (ev_is_active (w)))
2038 return;
2039
2040 ev_start (EV_A_ (W)w, ++checkcnt);
2041 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2042 checks [checkcnt - 1] = w;
2043}
2044
2045void
2046ev_check_stop (EV_P_ ev_check *w)
2047{
2048 ev_clear_pending (EV_A_ (W)w);
2049 if (expect_false (!ev_is_active (w)))
2050 return;
2051
2052 {
2053 int active = ((W)w)->active;
2054 checks [active - 1] = checks [--checkcnt];
2055 ((W)checks [active - 1])->active = active;
2056 }
2057
1706 ev_stop (EV_A_ (W)w); 2058 ev_stop (EV_A_ (W)w);
1707} 2059}
1708 2060
1709#if EV_EMBED_ENABLE 2061#if EV_EMBED_ENABLE
1710void noinline 2062void noinline
… …
1753 2105
1754 ev_stop (EV_A_ (W)w); 2106 ev_stop (EV_A_ (W)w);
1755} 2107}
1756#endif 2108#endif
1757 2109
1758#if EV_STAT_ENABLE 2110#if EV_FORK_ENABLE
1759
1760# ifdef _WIN32
1761# define lstat(a,b) stat(a,b)
1762# endif
1763
1764void 2111void
1765ev_stat_stat (EV_P_ ev_stat *w)
1766{
1767 if (lstat (w->path, &w->attr) < 0)
1768 w->attr.st_nlink = 0;
1769 else if (!w->attr.st_nlink)
1770 w->attr.st_nlink = 1;
1771}
1772
1773static void
1774stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1775{
1776 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1777
1778 /* we copy this here each the time so that */
1779 /* prev has the old value when the callback gets invoked */
1780 w->prev = w->attr;
1781 ev_stat_stat (EV_A_ w);
1782
1783 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1784 ev_feed_event (EV_A_ w, EV_STAT);
1785}
1786
1787void
1788ev_stat_start (EV_P_ ev_stat *w) 2112ev_fork_start (EV_P_ ev_fork *w)
1789{ 2113{
1790 if (expect_false (ev_is_active (w))) 2114 if (expect_false (ev_is_active (w)))
1791 return; 2115 return;
1792 2116
1793 /* since we use memcmp, we need to clear any padding data etc. */
1794 memset (&w->prev, 0, sizeof (ev_statdata));
1795 memset (&w->attr, 0, sizeof (ev_statdata));
1796
1797 ev_stat_stat (EV_A_ w);
1798
1799 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1800 ev_set_priority (&w->timer, ev_priority (w));
1801 ev_timer_start (EV_A_ &w->timer);
1802
1803 ev_start (EV_A_ (W)w, 1); 2117 ev_start (EV_A_ (W)w, ++forkcnt);
2118 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2119 forks [forkcnt - 1] = w;
1804} 2120}
1805 2121
1806void 2122void
1807ev_stat_stop (EV_P_ ev_stat *w) 2123ev_fork_stop (EV_P_ ev_fork *w)
1808{ 2124{
1809 ev_clear_pending (EV_A_ (W)w); 2125 ev_clear_pending (EV_A_ (W)w);
1810 if (expect_false (!ev_is_active (w))) 2126 if (expect_false (!ev_is_active (w)))
1811 return; 2127 return;
1812 2128
1813 ev_timer_stop (EV_A_ &w->timer); 2129 {
2130 int active = ((W)w)->active;
2131 forks [active - 1] = forks [--forkcnt];
2132 ((W)forks [active - 1])->active = active;
2133 }
1814 2134
1815 ev_stop (EV_A_ (W)w); 2135 ev_stop (EV_A_ (W)w);
1816} 2136}
1817#endif 2137#endif
1818 2138

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines