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

Comparing libev/ev.c (file contents):
Revision 1.152 by root, Wed Nov 28 11:15:55 2007 UTC vs.
Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC

216# include <sys/inotify.h> 216# include <sys/inotify.h>
217#endif 217#endif
218 218
219/**/ 219/**/
220 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 */
230
221#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) */
222#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) */
223/*#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 */
224 234
225#if __GNUC__ >= 3 235#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 238#else
236# define expect(expr,value) (expr) 239# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 240# define noinline
241# if __STDC_VERSION__ < 199901L
242# define inline
243# endif
240#endif 244#endif
241 245
242#define expect_false(expr) expect ((expr) != 0, 0) 246#define expect_false(expr) expect ((expr) != 0, 0)
243#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
244 255
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 256#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 257#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 258
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 259#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 260#define EMPTY2(a,b) /* used to suppress some warnings */
250 261
251typedef ev_watcher *W; 262typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 263typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 264typedef ev_watcher_time *WT;
281 perror (msg); 292 perror (msg);
282 abort (); 293 abort ();
283 } 294 }
284} 295}
285 296
286static void *(*alloc)(void *ptr, size_t size) = realloc; 297static void *(*alloc)(void *ptr, long size);
287 298
288void 299void
289ev_set_allocator (void *(*cb)(void *ptr, size_t size)) 300ev_set_allocator (void *(*cb)(void *ptr, long size))
290{ 301{
291 alloc = cb; 302 alloc = cb;
292} 303}
293 304
294inline_speed void * 305inline_speed void *
295ev_realloc (void *ptr, size_t size) 306ev_realloc (void *ptr, long size)
296{ 307{
297 ptr = alloc (ptr, size); 308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
298 309
299 if (!ptr && size) 310 if (!ptr && size)
300 { 311 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size); 312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort (); 313 abort ();
303 } 314 }
304 315
305 return ptr; 316 return ptr;
306} 317}
324{ 335{
325 W w; 336 W w;
326 int events; 337 int events;
327} ANPENDING; 338} ANPENDING;
328 339
340#if EV_USE_INOTIFY
329typedef struct 341typedef struct
330{ 342{
331#if EV_USE_INOTIFY
332 WL head; 343 WL head;
333#endif
334} ANFS; 344} ANFS;
345#endif
335 346
336#if EV_MULTIPLICITY 347#if EV_MULTIPLICITY
337 348
338 struct ev_loop 349 struct ev_loop
339 { 350 {
396{ 407{
397 return ev_rt_now; 408 return ev_rt_now;
398} 409}
399#endif 410#endif
400 411
401#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}
402 439
403#define array_needsize(type,base,cur,cnt,init) \ 440#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 441 if (expect_false ((cnt) > (cur))) \
405 { \ 442 { \
406 int newcnt = cur; \ 443 int ocur_ = (cur); \
407 do \ 444 (base) = (type *)array_realloc \
408 { \ 445 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 446 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 447 }
417 448
449#if 0
418#define array_slim(type,stem) \ 450#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 451 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 452 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 453 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 454 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 455 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 456 }
457#endif
425 458
426#define array_free(stem, idx) \ 459#define array_free(stem, idx) \
427 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;
428 461
429/*****************************************************************************/ 462/*****************************************************************************/
430 463
431void noinline 464void noinline
432ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
433{ 466{
434 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
435 469
436 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
437 { 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_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 478 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 479}
447 480
448void inline_size 481void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 483{
451 int i; 484 int i;
452 485
453 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
485} 518}
486 519
487void 520void
488ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 522{
523 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
491} 525}
492 526
493void inline_size 527void inline_size
494fd_reify (EV_P) 528fd_reify (EV_P)
495{ 529{
499 { 533 {
500 int fd = fdchanges [i]; 534 int fd = fdchanges [i];
501 ANFD *anfd = anfds + fd; 535 ANFD *anfd = anfds + fd;
502 ev_io *w; 536 ev_io *w;
503 537
504 int events = 0; 538 unsigned char events = 0;
505 539
506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
507 events |= w->events; 541 events |= (unsigned char)w->events;
508 542
509#if EV_SELECT_IS_WINSOCKET 543#if EV_SELECT_IS_WINSOCKET
510 if (events) 544 if (events)
511 { 545 {
512 unsigned long argp; 546 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd); 547 anfd->handle = _get_osfhandle (fd);
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 } 549 }
516#endif 550#endif
517 551
552 {
553 unsigned char o_events = anfd->events;
554 unsigned char o_reify = anfd->reify;
555
518 anfd->reify = 0; 556 anfd->reify = 0;
519
520 backend_modify (EV_A_ fd, anfd->events, events);
521 anfd->events = events; 557 anfd->events = events;
558
559 if (o_events != events || o_reify & EV_IOFDSET)
560 backend_modify (EV_A_ fd, o_events, events);
561 }
522 } 562 }
523 563
524 fdchangecnt = 0; 564 fdchangecnt = 0;
525} 565}
526 566
527void inline_size 567void inline_size
528fd_change (EV_P_ int fd) 568fd_change (EV_P_ int fd, int flags)
529{ 569{
530 if (expect_false (anfds [fd].reify)) 570 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 571 anfds [fd].reify |= flags;
534 572
573 if (expect_true (!reify))
574 {
535 ++fdchangecnt; 575 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 576 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 577 fdchanges [fdchangecnt - 1] = fd;
578 }
538} 579}
539 580
540void inline_speed 581void inline_speed
541fd_kill (EV_P_ int fd) 582fd_kill (EV_P_ int fd)
542{ 583{
589static void noinline 630static void noinline
590fd_rearm_all (EV_P) 631fd_rearm_all (EV_P)
591{ 632{
592 int fd; 633 int fd;
593 634
594 /* this should be highly optimised to not do anything but set a flag */
595 for (fd = 0; fd < anfdmax; ++fd) 635 for (fd = 0; fd < anfdmax; ++fd)
596 if (anfds [fd].events) 636 if (anfds [fd].events)
597 { 637 {
598 anfds [fd].events = 0; 638 anfds [fd].events = 0;
599 fd_change (EV_A_ fd); 639 fd_change (EV_A_ fd, EV_IOFDSET | 1);
600 } 640 }
601} 641}
602 642
603/*****************************************************************************/ 643/*****************************************************************************/
604 644
605void inline_speed 645void inline_speed
606upheap (WT *heap, int k) 646upheap (WT *heap, int k)
607{ 647{
608 WT w = heap [k]; 648 WT w = heap [k];
609 649
610 while (k && heap [k >> 1]->at > w->at) 650 while (k)
611 { 651 {
652 int p = (k - 1) >> 1;
653
654 if (heap [p]->at <= w->at)
655 break;
656
612 heap [k] = heap [k >> 1]; 657 heap [k] = heap [p];
613 ((W)heap [k])->active = k + 1; 658 ((W)heap [k])->active = k + 1;
614 k >>= 1; 659 k = p;
615 } 660 }
616 661
617 heap [k] = w; 662 heap [k] = w;
618 ((W)heap [k])->active = k + 1; 663 ((W)heap [k])->active = k + 1;
619
620} 664}
621 665
622void inline_speed 666void inline_speed
623downheap (WT *heap, int N, int k) 667downheap (WT *heap, int N, int k)
624{ 668{
625 WT w = heap [k]; 669 WT w = heap [k];
626 670
627 while (k < (N >> 1)) 671 for (;;)
628 { 672 {
629 int j = k << 1; 673 int c = (k << 1) + 1;
630 674
631 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 675 if (c >= N)
632 ++j;
633
634 if (w->at <= heap [j]->at)
635 break; 676 break;
636 677
678 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
679 ? 1 : 0;
680
681 if (w->at <= heap [c]->at)
682 break;
683
637 heap [k] = heap [j]; 684 heap [k] = heap [c];
638 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
686
639 k = j; 687 k = c;
640 } 688 }
641 689
642 heap [k] = w; 690 heap [k] = w;
643 ((W)heap [k])->active = k + 1; 691 ((W)heap [k])->active = k + 1;
644} 692}
726 for (signum = signalmax; signum--; ) 774 for (signum = signalmax; signum--; )
727 if (signals [signum].gotsig) 775 if (signals [signum].gotsig)
728 ev_feed_signal_event (EV_A_ signum + 1); 776 ev_feed_signal_event (EV_A_ signum + 1);
729} 777}
730 778
731void inline_size 779void inline_speed
732fd_intern (int fd) 780fd_intern (int fd)
733{ 781{
734#ifdef _WIN32 782#ifdef _WIN32
735 int arg = 1; 783 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 784 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
751 ev_unref (EV_A); /* child watcher should not keep loop alive */ 799 ev_unref (EV_A); /* child watcher should not keep loop alive */
752} 800}
753 801
754/*****************************************************************************/ 802/*****************************************************************************/
755 803
756static ev_child *childs [EV_PID_HASHSIZE]; 804static WL childs [EV_PID_HASHSIZE];
757 805
758#ifndef _WIN32 806#ifndef _WIN32
759 807
760static ev_signal childev; 808static ev_signal childev;
761 809
765 ev_child *w; 813 ev_child *w;
766 814
767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 815 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
768 if (w->pid == pid || !w->pid) 816 if (w->pid == pid || !w->pid)
769 { 817 {
770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 818 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
771 w->rpid = pid; 819 w->rpid = pid;
772 w->rstatus = status; 820 w->rstatus = status;
773 ev_feed_event (EV_A_ (W)w, EV_CHILD); 821 ev_feed_event (EV_A_ (W)w, EV_CHILD);
774 } 822 }
775} 823}
776 824
777#ifndef WCONTINUED 825#ifndef WCONTINUED
887ev_backend (EV_P) 935ev_backend (EV_P)
888{ 936{
889 return backend; 937 return backend;
890} 938}
891 939
940unsigned int
941ev_loop_count (EV_P)
942{
943 return loop_count;
944}
945
892static void noinline 946static void noinline
893loop_init (EV_P_ unsigned int flags) 947loop_init (EV_P_ unsigned int flags)
894{ 948{
895 if (!backend) 949 if (!backend)
896 { 950 {
905 ev_rt_now = ev_time (); 959 ev_rt_now = ev_time ();
906 mn_now = get_clock (); 960 mn_now = get_clock ();
907 now_floor = mn_now; 961 now_floor = mn_now;
908 rtmn_diff = ev_rt_now - mn_now; 962 rtmn_diff = ev_rt_now - mn_now;
909 963
964 /* pid check not overridable via env */
965#ifndef _WIN32
966 if (flags & EVFLAG_FORKCHECK)
967 curpid = getpid ();
968#endif
969
910 if (!(flags & EVFLAG_NOENV) 970 if (!(flags & EVFLAG_NOENV)
911 && !enable_secure () 971 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS")) 972 && getenv ("LIBEV_FLAGS"))
913 flags = atoi (getenv ("LIBEV_FLAGS")); 973 flags = atoi (getenv ("LIBEV_FLAGS"));
914 974
970#if EV_USE_SELECT 1030#if EV_USE_SELECT
971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1031 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
972#endif 1032#endif
973 1033
974 for (i = NUMPRI; i--; ) 1034 for (i = NUMPRI; i--; )
1035 {
975 array_free (pending, [i]); 1036 array_free (pending, [i]);
1037#if EV_IDLE_ENABLE
1038 array_free (idle, [i]);
1039#endif
1040 }
976 1041
977 /* have to use the microsoft-never-gets-it-right macro */ 1042 /* have to use the microsoft-never-gets-it-right macro */
978 array_free (fdchange, EMPTY0); 1043 array_free (fdchange, EMPTY);
979 array_free (timer, EMPTY0); 1044 array_free (timer, EMPTY);
980#if EV_PERIODIC_ENABLE 1045#if EV_PERIODIC_ENABLE
981 array_free (periodic, EMPTY0); 1046 array_free (periodic, EMPTY);
982#endif 1047#endif
983 array_free (idle, EMPTY0);
984 array_free (prepare, EMPTY0); 1048 array_free (prepare, EMPTY);
985 array_free (check, EMPTY0); 1049 array_free (check, EMPTY);
986 1050
987 backend = 0; 1051 backend = 0;
988} 1052}
1053
1054void inline_size infy_fork (EV_P);
989 1055
990void inline_size 1056void inline_size
991loop_fork (EV_P) 1057loop_fork (EV_P)
992{ 1058{
993#if EV_USE_PORT 1059#if EV_USE_PORT
996#if EV_USE_KQUEUE 1062#if EV_USE_KQUEUE
997 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1063 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
998#endif 1064#endif
999#if EV_USE_EPOLL 1065#if EV_USE_EPOLL
1000 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1066 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1067#endif
1068#if EV_USE_INOTIFY
1069 infy_fork (EV_A);
1001#endif 1070#endif
1002 1071
1003 if (ev_is_active (&sigev)) 1072 if (ev_is_active (&sigev))
1004 { 1073 {
1005 /* default loop */ 1074 /* default loop */
1121 postfork = 1; 1190 postfork = 1;
1122} 1191}
1123 1192
1124/*****************************************************************************/ 1193/*****************************************************************************/
1125 1194
1126int inline_size 1195void
1127any_pending (EV_P) 1196ev_invoke (EV_P_ void *w, int revents)
1128{ 1197{
1129 int pri; 1198 EV_CB_INVOKE ((W)w, revents);
1130
1131 for (pri = NUMPRI; pri--; )
1132 if (pendingcnt [pri])
1133 return 1;
1134
1135 return 0;
1136} 1199}
1137 1200
1138void inline_speed 1201void inline_speed
1139call_pending (EV_P) 1202call_pending (EV_P)
1140{ 1203{
1158void inline_size 1221void inline_size
1159timers_reify (EV_P) 1222timers_reify (EV_P)
1160{ 1223{
1161 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1162 { 1225 {
1163 ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1164 1227
1165 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1166 1229
1167 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1168 if (w->repeat) 1231 if (w->repeat)
1171 1234
1172 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1173 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1174 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1175 1238
1176 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1177 } 1240 }
1178 else 1241 else
1179 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1180 1243
1181 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1186void inline_size 1249void inline_size
1187periodics_reify (EV_P) 1250periodics_reify (EV_P)
1188{ 1251{
1189 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1190 { 1253 {
1191 ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1192 1255
1193 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1194 1257
1195 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1196 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1197 { 1260 {
1198 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1261 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1199 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1262 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1200 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1201 } 1264 }
1202 else if (w->interval) 1265 else if (w->interval)
1203 { 1266 {
1204 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1267 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1268 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1205 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1269 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1206 downheap ((WT *)periodics, periodiccnt, 0); 1270 downheap (periodics, periodiccnt, 0);
1207 } 1271 }
1208 else 1272 else
1209 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1210 1274
1211 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1218 int i; 1282 int i;
1219 1283
1220 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1221 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1222 { 1286 {
1223 ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1224 1288
1225 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1226 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1227 else if (w->interval) 1291 else if (w->interval)
1228 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1292 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1229 } 1293 }
1230 1294
1231 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1232 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1233 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1234} 1298}
1235#endif 1299#endif
1236 1300
1301#if EV_IDLE_ENABLE
1237int inline_size 1302void inline_size
1238time_update_monotonic (EV_P) 1303idle_reify (EV_P)
1239{ 1304{
1305 if (expect_false (idleall))
1306 {
1307 int pri;
1308
1309 for (pri = NUMPRI; pri--; )
1310 {
1311 if (pendingcnt [pri])
1312 break;
1313
1314 if (idlecnt [pri])
1315 {
1316 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1317 break;
1318 }
1319 }
1320 }
1321}
1322#endif
1323
1324void inline_speed
1325time_update (EV_P_ ev_tstamp max_block)
1326{
1327 int i;
1328
1329#if EV_USE_MONOTONIC
1330 if (expect_true (have_monotonic))
1331 {
1332 ev_tstamp odiff = rtmn_diff;
1333
1240 mn_now = get_clock (); 1334 mn_now = get_clock ();
1241 1335
1336 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1337 /* interpolate in the meantime */
1242 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1338 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1243 { 1339 {
1244 ev_rt_now = rtmn_diff + mn_now; 1340 ev_rt_now = rtmn_diff + mn_now;
1245 return 0; 1341 return;
1246 } 1342 }
1247 else 1343
1248 {
1249 now_floor = mn_now; 1344 now_floor = mn_now;
1250 ev_rt_now = ev_time (); 1345 ev_rt_now = ev_time ();
1251 return 1;
1252 }
1253}
1254 1346
1255void inline_size 1347 /* loop a few times, before making important decisions.
1256time_update (EV_P) 1348 * on the choice of "4": one iteration isn't enough,
1257{ 1349 * in case we get preempted during the calls to
1258 int i; 1350 * ev_time and get_clock. a second call is almost guaranteed
1259 1351 * to succeed in that case, though. and looping a few more times
1260#if EV_USE_MONOTONIC 1352 * doesn't hurt either as we only do this on time-jumps or
1261 if (expect_true (have_monotonic)) 1353 * in the unlikely event of having been preempted here.
1262 { 1354 */
1263 if (time_update_monotonic (EV_A)) 1355 for (i = 4; --i; )
1264 { 1356 {
1265 ev_tstamp odiff = rtmn_diff;
1266
1267 /* loop a few times, before making important decisions.
1268 * on the choice of "4": one iteration isn't enough,
1269 * in case we get preempted during the calls to
1270 * ev_time and get_clock. a second call is almost guarenteed
1271 * to succeed in that case, though. and looping a few more times
1272 * doesn't hurt either as we only do this on time-jumps or
1273 * in the unlikely event of getting preempted here.
1274 */
1275 for (i = 4; --i; )
1276 {
1277 rtmn_diff = ev_rt_now - mn_now; 1357 rtmn_diff = ev_rt_now - mn_now;
1278 1358
1279 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1280 return; /* all is well */ 1360 return; /* all is well */
1281 1361
1282 ev_rt_now = ev_time (); 1362 ev_rt_now = ev_time ();
1283 mn_now = get_clock (); 1363 mn_now = get_clock ();
1284 now_floor = mn_now; 1364 now_floor = mn_now;
1285 } 1365 }
1286 1366
1287# if EV_PERIODIC_ENABLE 1367# if EV_PERIODIC_ENABLE
1288 periodics_reschedule (EV_A); 1368 periodics_reschedule (EV_A);
1289# endif 1369# endif
1290 /* no timer adjustment, as the monotonic clock doesn't jump */ 1370 /* no timer adjustment, as the monotonic clock doesn't jump */
1291 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1371 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1292 }
1293 } 1372 }
1294 else 1373 else
1295#endif 1374#endif
1296 { 1375 {
1297 ev_rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1298 1377
1299 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1378 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1300 { 1379 {
1301#if EV_PERIODIC_ENABLE 1380#if EV_PERIODIC_ENABLE
1302 periodics_reschedule (EV_A); 1381 periodics_reschedule (EV_A);
1303#endif 1382#endif
1304
1305 /* adjust timers. this is easy, as the offset is the same for all */ 1383 /* adjust timers. this is easy, as the offset is the same for all of them */
1306 for (i = 0; i < timercnt; ++i) 1384 for (i = 0; i < timercnt; ++i)
1307 ((WT)timers [i])->at += ev_rt_now - mn_now; 1385 ((WT)timers [i])->at += ev_rt_now - mn_now;
1308 } 1386 }
1309 1387
1310 mn_now = ev_rt_now; 1388 mn_now = ev_rt_now;
1330{ 1408{
1331 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1409 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1332 ? EVUNLOOP_ONE 1410 ? EVUNLOOP_ONE
1333 : EVUNLOOP_CANCEL; 1411 : EVUNLOOP_CANCEL;
1334 1412
1335 while (activecnt) 1413 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1414
1415 do
1336 { 1416 {
1337 /* we might have forked, so reify kernel state if necessary */ 1417#ifndef _WIN32
1418 if (expect_false (curpid)) /* penalise the forking check even more */
1419 if (expect_false (getpid () != curpid))
1420 {
1421 curpid = getpid ();
1422 postfork = 1;
1423 }
1424#endif
1425
1338 #if EV_FORK_ENABLE 1426#if EV_FORK_ENABLE
1427 /* we might have forked, so queue fork handlers */
1339 if (expect_false (postfork)) 1428 if (expect_false (postfork))
1340 if (forkcnt) 1429 if (forkcnt)
1341 { 1430 {
1342 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1431 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1343 call_pending (EV_A); 1432 call_pending (EV_A);
1344 } 1433 }
1345 #endif 1434#endif
1346 1435
1347 /* queue check watchers (and execute them) */ 1436 /* queue prepare watchers (and execute them) */
1348 if (expect_false (preparecnt)) 1437 if (expect_false (preparecnt))
1349 { 1438 {
1350 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1439 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1351 call_pending (EV_A); 1440 call_pending (EV_A);
1352 } 1441 }
1353 1442
1443 if (expect_false (!activecnt))
1444 break;
1445
1354 /* we might have forked, so reify kernel state if necessary */ 1446 /* we might have forked, so reify kernel state if necessary */
1355 if (expect_false (postfork)) 1447 if (expect_false (postfork))
1356 loop_fork (EV_A); 1448 loop_fork (EV_A);
1357 1449
1358 /* update fd-related kernel structures */ 1450 /* update fd-related kernel structures */
1359 fd_reify (EV_A); 1451 fd_reify (EV_A);
1360 1452
1361 /* calculate blocking time */ 1453 /* calculate blocking time */
1362 { 1454 {
1363 double block; 1455 ev_tstamp block;
1364 1456
1365 if (flags & EVLOOP_NONBLOCK || idlecnt) 1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1366 block = 0.; /* do not block at all */ 1458 block = 0.; /* do not block at all */
1367 else 1459 else
1368 { 1460 {
1369 /* update time to cancel out callback processing overhead */ 1461 /* update time to cancel out callback processing overhead */
1370#if EV_USE_MONOTONIC
1371 if (expect_true (have_monotonic))
1372 time_update_monotonic (EV_A); 1462 time_update (EV_A_ 1e100);
1373 else
1374#endif
1375 {
1376 ev_rt_now = ev_time ();
1377 mn_now = ev_rt_now;
1378 }
1379 1463
1380 block = MAX_BLOCKTIME; 1464 block = MAX_BLOCKTIME;
1381 1465
1382 if (timercnt) 1466 if (timercnt)
1383 { 1467 {
1394#endif 1478#endif
1395 1479
1396 if (expect_false (block < 0.)) block = 0.; 1480 if (expect_false (block < 0.)) block = 0.;
1397 } 1481 }
1398 1482
1483 ++loop_count;
1399 backend_poll (EV_A_ block); 1484 backend_poll (EV_A_ block);
1485
1486 /* update ev_rt_now, do magic */
1487 time_update (EV_A_ block);
1400 } 1488 }
1401
1402 /* update ev_rt_now, do magic */
1403 time_update (EV_A);
1404 1489
1405 /* queue pending timers and reschedule them */ 1490 /* queue pending timers and reschedule them */
1406 timers_reify (EV_A); /* relative timers called last */ 1491 timers_reify (EV_A); /* relative timers called last */
1407#if EV_PERIODIC_ENABLE 1492#if EV_PERIODIC_ENABLE
1408 periodics_reify (EV_A); /* absolute timers called first */ 1493 periodics_reify (EV_A); /* absolute timers called first */
1409#endif 1494#endif
1410 1495
1496#if EV_IDLE_ENABLE
1411 /* queue idle watchers unless other events are pending */ 1497 /* queue idle watchers unless other events are pending */
1412 if (idlecnt && !any_pending (EV_A)) 1498 idle_reify (EV_A);
1413 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1499#endif
1414 1500
1415 /* queue check watchers, to be executed first */ 1501 /* queue check watchers, to be executed first */
1416 if (expect_false (checkcnt)) 1502 if (expect_false (checkcnt))
1417 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1503 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1418 1504
1419 call_pending (EV_A); 1505 call_pending (EV_A);
1420 1506
1421 if (expect_false (loop_done))
1422 break;
1423 } 1507 }
1508 while (expect_true (activecnt && !loop_done));
1424 1509
1425 if (loop_done == EVUNLOOP_ONE) 1510 if (loop_done == EVUNLOOP_ONE)
1426 loop_done = EVUNLOOP_CANCEL; 1511 loop_done = EVUNLOOP_CANCEL;
1427} 1512}
1428 1513
1455 head = &(*head)->next; 1540 head = &(*head)->next;
1456 } 1541 }
1457} 1542}
1458 1543
1459void inline_speed 1544void inline_speed
1460ev_clear_pending (EV_P_ W w) 1545clear_pending (EV_P_ W w)
1461{ 1546{
1462 if (w->pending) 1547 if (w->pending)
1463 { 1548 {
1464 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1549 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1465 w->pending = 0; 1550 w->pending = 0;
1466 } 1551 }
1467} 1552}
1468 1553
1554int
1555ev_clear_pending (EV_P_ void *w)
1556{
1557 W w_ = (W)w;
1558 int pending = w_->pending;
1559
1560 if (expect_true (pending))
1561 {
1562 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1563 w_->pending = 0;
1564 p->w = 0;
1565 return p->events;
1566 }
1567 else
1568 return 0;
1569}
1570
1571void inline_size
1572pri_adjust (EV_P_ W w)
1573{
1574 int pri = w->priority;
1575 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1576 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1577 w->priority = pri;
1578}
1579
1469void inline_speed 1580void inline_speed
1470ev_start (EV_P_ W w, int active) 1581ev_start (EV_P_ W w, int active)
1471{ 1582{
1472 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1583 pri_adjust (EV_A_ w);
1473 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1474
1475 w->active = active; 1584 w->active = active;
1476 ev_ref (EV_A); 1585 ev_ref (EV_A);
1477} 1586}
1478 1587
1479void inline_size 1588void inline_size
1483 w->active = 0; 1592 w->active = 0;
1484} 1593}
1485 1594
1486/*****************************************************************************/ 1595/*****************************************************************************/
1487 1596
1488void 1597void noinline
1489ev_io_start (EV_P_ ev_io *w) 1598ev_io_start (EV_P_ ev_io *w)
1490{ 1599{
1491 int fd = w->fd; 1600 int fd = w->fd;
1492 1601
1493 if (expect_false (ev_is_active (w))) 1602 if (expect_false (ev_is_active (w)))
1495 1604
1496 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1497 1606
1498 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1499 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1500 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1501 1610
1502 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1503} 1613}
1504 1614
1505void 1615void noinline
1506ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1507{ 1617{
1508 ev_clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1509 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1510 return; 1620 return;
1511 1621
1512 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));
1513 1623
1514 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1515 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1516 1626
1517 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1518} 1628}
1519 1629
1520void 1630void noinline
1521ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1522{ 1632{
1523 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1524 return; 1634 return;
1525 1635
1526 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1527 1637
1528 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1638 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1529 1639
1530 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1531 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1532 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1533 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1534 1644
1535 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1536} 1646}
1537 1647
1538void 1648void noinline
1539ev_timer_stop (EV_P_ ev_timer *w) 1649ev_timer_stop (EV_P_ ev_timer *w)
1540{ 1650{
1541 ev_clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1542 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1543 return; 1653 return;
1544 1654
1545 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1546 1656
1547 { 1657 {
1548 int active = ((W)w)->active; 1658 int active = ((W)w)->active;
1549 1659
1550 if (expect_true (--active < --timercnt)) 1660 if (expect_true (--active < --timercnt))
1551 { 1661 {
1552 timers [active] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1553 adjustheap ((WT *)timers, timercnt, active); 1663 adjustheap (timers, timercnt, active);
1554 } 1664 }
1555 } 1665 }
1556 1666
1557 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1558 1668
1559 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1560} 1670}
1561 1671
1562void 1672void noinline
1563ev_timer_again (EV_P_ ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1564{ 1674{
1565 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1566 { 1676 {
1567 if (w->repeat) 1677 if (w->repeat)
1568 { 1678 {
1569 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1570 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1571 } 1681 }
1572 else 1682 else
1573 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1574 } 1684 }
1575 else if (w->repeat) 1685 else if (w->repeat)
1578 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1579 } 1689 }
1580} 1690}
1581 1691
1582#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1583void 1693void noinline
1584ev_periodic_start (EV_P_ ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1585{ 1695{
1586 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1587 return; 1697 return;
1588 1698
1590 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1591 else if (w->interval) 1701 else if (w->interval)
1592 { 1702 {
1593 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.));
1594 /* 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 */
1595 ((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;
1596 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1597 1709
1598 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1599 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1600 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1601 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1602 1714
1603 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1604} 1716}
1605 1717
1606void 1718void noinline
1607ev_periodic_stop (EV_P_ ev_periodic *w) 1719ev_periodic_stop (EV_P_ ev_periodic *w)
1608{ 1720{
1609 ev_clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1611 return; 1723 return;
1612 1724
1613 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1614 1726
1615 { 1727 {
1616 int active = ((W)w)->active; 1728 int active = ((W)w)->active;
1617 1729
1618 if (expect_true (--active < --periodiccnt)) 1730 if (expect_true (--active < --periodiccnt))
1619 { 1731 {
1620 periodics [active] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1621 adjustheap ((WT *)periodics, periodiccnt, active); 1733 adjustheap (periodics, periodiccnt, active);
1622 } 1734 }
1623 } 1735 }
1624 1736
1625 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1626} 1738}
1627 1739
1628void 1740void noinline
1629ev_periodic_again (EV_P_ ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1630{ 1742{
1631 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1632 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1633 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
1636 1748
1637#ifndef SA_RESTART 1749#ifndef SA_RESTART
1638# define SA_RESTART 0 1750# define SA_RESTART 0
1639#endif 1751#endif
1640 1752
1641void 1753void noinline
1642ev_signal_start (EV_P_ ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1643{ 1755{
1644#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1645 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));
1646#endif 1758#endif
1647 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1648 return; 1760 return;
1649 1761
1650 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1762 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1651 1763
1764 {
1765#ifndef _WIN32
1766 sigset_t full, prev;
1767 sigfillset (&full);
1768 sigprocmask (SIG_SETMASK, &full, &prev);
1769#endif
1770
1771 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1772
1773#ifndef _WIN32
1774 sigprocmask (SIG_SETMASK, &prev, 0);
1775#endif
1776 }
1777
1652 ev_start (EV_A_ (W)w, 1); 1778 ev_start (EV_A_ (W)w, 1);
1653 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1654 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1655 1780
1656 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1657 { 1782 {
1658#if _WIN32 1783#if _WIN32
1659 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
1665 sigaction (w->signum, &sa, 0); 1790 sigaction (w->signum, &sa, 0);
1666#endif 1791#endif
1667 } 1792 }
1668} 1793}
1669 1794
1670void 1795void noinline
1671ev_signal_stop (EV_P_ ev_signal *w) 1796ev_signal_stop (EV_P_ ev_signal *w)
1672{ 1797{
1673 ev_clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1674 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1675 return; 1800 return;
1676 1801
1677 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1678 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1679 1804
1680 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1681 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1682} 1807}
1689#endif 1814#endif
1690 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1691 return; 1816 return;
1692 1817
1693 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1694 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1695} 1820}
1696 1821
1697void 1822void
1698ev_child_stop (EV_P_ ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1699{ 1824{
1700 ev_clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1701 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1702 return; 1827 return;
1703 1828
1704 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1705 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1706} 1831}
1707 1832
1708#if EV_STAT_ENABLE 1833#if EV_STAT_ENABLE
1709 1834
1713# endif 1838# endif
1714 1839
1715#define DEF_STAT_INTERVAL 5.0074891 1840#define DEF_STAT_INTERVAL 5.0074891
1716#define MIN_STAT_INTERVAL 0.1074891 1841#define MIN_STAT_INTERVAL 0.1074891
1717 1842
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 1843static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719 1844
1720#if EV_USE_INOTIFY 1845#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE ((PATH_MAX + sizeof (struct inotify_event)) + 2048) 1846# define EV_INOTIFY_BUFSIZE 8192
1722 1847
1723static void noinline 1848static void noinline
1724infy_add (EV_P_ ev_stat *w) 1849infy_add (EV_P_ ev_stat *w)
1725{ 1850{
1726 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); 1851 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);
1728 if (w->wd < 0) 1853 if (w->wd < 0)
1729 { 1854 {
1730 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 1855 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1731 1856
1732 /* monitor some parent directory for speedup hints */ 1857 /* monitor some parent directory for speedup hints */
1733 if (errno == ENOENT || errno == EACCES) 1858 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1734 { 1859 {
1735 char path [PATH_MAX]; 1860 char path [4096];
1736 strcpy (path, w->path); 1861 strcpy (path, w->path);
1737 1862
1738 do 1863 do
1739 { 1864 {
1740 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 1865 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1744 1869
1745 if (!pend) 1870 if (!pend)
1746 break; /* whoops, no '/', complain to your admin */ 1871 break; /* whoops, no '/', complain to your admin */
1747 1872
1748 *pend = 0; 1873 *pend = 0;
1749 w->wd = inotify_add_watch (fs_fd, path, IN_DELETE_SELF | IN_CREATE | IN_MOVED_TO | IN_MASK_ADD); 1874 w->wd = inotify_add_watch (fs_fd, path, mask);
1750 } 1875 }
1751 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 1876 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1752 } 1877 }
1753 } 1878 }
1754 else 1879 else
1759} 1884}
1760 1885
1761static void noinline 1886static void noinline
1762infy_del (EV_P_ ev_stat *w) 1887infy_del (EV_P_ ev_stat *w)
1763{ 1888{
1764 WL w_;
1765 int slot; 1889 int slot;
1766 int wd = w->wd; 1890 int wd = w->wd;
1767 1891
1768 if (wd < 0) 1892 if (wd < 0)
1769 return; 1893 return;
1798 { 1922 {
1799 w->wd = -1; 1923 w->wd = -1;
1800 infy_add (EV_A_ w); /* re-add, no matter what */ 1924 infy_add (EV_A_ w); /* re-add, no matter what */
1801 } 1925 }
1802 1926
1803 stat_timer_cb (EV_P_ &w->timer, 0); 1927 stat_timer_cb (EV_A_ &w->timer, 0);
1804 } 1928 }
1805 } 1929 }
1806 } 1930 }
1807} 1931}
1808 1932
1832 ev_set_priority (&fs_w, EV_MAXPRI); 1956 ev_set_priority (&fs_w, EV_MAXPRI);
1833 ev_io_start (EV_A_ &fs_w); 1957 ev_io_start (EV_A_ &fs_w);
1834 } 1958 }
1835} 1959}
1836 1960
1961void inline_size
1962infy_fork (EV_P)
1963{
1964 int slot;
1965
1966 if (fs_fd < 0)
1967 return;
1968
1969 close (fs_fd);
1970 fs_fd = inotify_init ();
1971
1972 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1973 {
1974 WL w_ = fs_hash [slot].head;
1975 fs_hash [slot].head = 0;
1976
1977 while (w_)
1978 {
1979 ev_stat *w = (ev_stat *)w_;
1980 w_ = w_->next; /* lets us add this watcher */
1981
1982 w->wd = -1;
1983
1984 if (fs_fd >= 0)
1985 infy_add (EV_A_ w); /* re-add, no matter what */
1986 else
1987 ev_timer_start (EV_A_ &w->timer);
1988 }
1989
1990 }
1991}
1992
1837#endif 1993#endif
1838 1994
1839void 1995void
1840ev_stat_stat (EV_P_ ev_stat *w) 1996ev_stat_stat (EV_P_ ev_stat *w)
1841{ 1997{
1843 w->attr.st_nlink = 0; 1999 w->attr.st_nlink = 0;
1844 else if (!w->attr.st_nlink) 2000 else if (!w->attr.st_nlink)
1845 w->attr.st_nlink = 1; 2001 w->attr.st_nlink = 1;
1846} 2002}
1847 2003
1848void noinline 2004static void noinline
1849stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2005stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1850{ 2006{
1851 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2007 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1852 2008
1853 /* we copy this here each the time so that */ 2009 /* we copy this here each the time so that */
1854 /* prev has the old value when the callback gets invoked */ 2010 /* prev has the old value when the callback gets invoked */
1855 w->prev = w->attr; 2011 w->prev = w->attr;
1856 ev_stat_stat (EV_A_ w); 2012 ev_stat_stat (EV_A_ w);
1857 2013
1858 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2014 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2015 if (
2016 w->prev.st_dev != w->attr.st_dev
2017 || w->prev.st_ino != w->attr.st_ino
2018 || w->prev.st_mode != w->attr.st_mode
2019 || w->prev.st_nlink != w->attr.st_nlink
2020 || w->prev.st_uid != w->attr.st_uid
2021 || w->prev.st_gid != w->attr.st_gid
2022 || w->prev.st_rdev != w->attr.st_rdev
2023 || w->prev.st_size != w->attr.st_size
2024 || w->prev.st_atime != w->attr.st_atime
2025 || w->prev.st_mtime != w->attr.st_mtime
2026 || w->prev.st_ctime != w->attr.st_ctime
1859 { 2027 ) {
1860 #if EV_USE_INOTIFY 2028 #if EV_USE_INOTIFY
1861 infy_del (EV_A_ w); 2029 infy_del (EV_A_ w);
1862 infy_add (EV_A_ w); 2030 infy_add (EV_A_ w);
1863 ev_stat_stat (EV_A_ w); /* avoid race... */ 2031 ev_stat_stat (EV_A_ w); /* avoid race... */
1864 #endif 2032 #endif
1898} 2066}
1899 2067
1900void 2068void
1901ev_stat_stop (EV_P_ ev_stat *w) 2069ev_stat_stop (EV_P_ ev_stat *w)
1902{ 2070{
1903 ev_clear_pending (EV_A_ (W)w); 2071 clear_pending (EV_A_ (W)w);
1904 if (expect_false (!ev_is_active (w))) 2072 if (expect_false (!ev_is_active (w)))
1905 return; 2073 return;
1906 2074
1907#if EV_USE_INOTIFY 2075#if EV_USE_INOTIFY
1908 infy_del (EV_A_ w); 2076 infy_del (EV_A_ w);
1911 2079
1912 ev_stop (EV_A_ (W)w); 2080 ev_stop (EV_A_ (W)w);
1913} 2081}
1914#endif 2082#endif
1915 2083
2084#if EV_IDLE_ENABLE
1916void 2085void
1917ev_idle_start (EV_P_ ev_idle *w) 2086ev_idle_start (EV_P_ ev_idle *w)
1918{ 2087{
1919 if (expect_false (ev_is_active (w))) 2088 if (expect_false (ev_is_active (w)))
1920 return; 2089 return;
1921 2090
2091 pri_adjust (EV_A_ (W)w);
2092
2093 {
2094 int active = ++idlecnt [ABSPRI (w)];
2095
2096 ++idleall;
1922 ev_start (EV_A_ (W)w, ++idlecnt); 2097 ev_start (EV_A_ (W)w, active);
2098
1923 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2099 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1924 idles [idlecnt - 1] = w; 2100 idles [ABSPRI (w)][active - 1] = w;
2101 }
1925} 2102}
1926 2103
1927void 2104void
1928ev_idle_stop (EV_P_ ev_idle *w) 2105ev_idle_stop (EV_P_ ev_idle *w)
1929{ 2106{
1930 ev_clear_pending (EV_A_ (W)w); 2107 clear_pending (EV_A_ (W)w);
1931 if (expect_false (!ev_is_active (w))) 2108 if (expect_false (!ev_is_active (w)))
1932 return; 2109 return;
1933 2110
1934 { 2111 {
1935 int active = ((W)w)->active; 2112 int active = ((W)w)->active;
1936 idles [active - 1] = idles [--idlecnt]; 2113
2114 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1937 ((W)idles [active - 1])->active = active; 2115 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2116
2117 ev_stop (EV_A_ (W)w);
2118 --idleall;
1938 } 2119 }
1939
1940 ev_stop (EV_A_ (W)w);
1941} 2120}
2121#endif
1942 2122
1943void 2123void
1944ev_prepare_start (EV_P_ ev_prepare *w) 2124ev_prepare_start (EV_P_ ev_prepare *w)
1945{ 2125{
1946 if (expect_false (ev_is_active (w))) 2126 if (expect_false (ev_is_active (w)))
1952} 2132}
1953 2133
1954void 2134void
1955ev_prepare_stop (EV_P_ ev_prepare *w) 2135ev_prepare_stop (EV_P_ ev_prepare *w)
1956{ 2136{
1957 ev_clear_pending (EV_A_ (W)w); 2137 clear_pending (EV_A_ (W)w);
1958 if (expect_false (!ev_is_active (w))) 2138 if (expect_false (!ev_is_active (w)))
1959 return; 2139 return;
1960 2140
1961 { 2141 {
1962 int active = ((W)w)->active; 2142 int active = ((W)w)->active;
1979} 2159}
1980 2160
1981void 2161void
1982ev_check_stop (EV_P_ ev_check *w) 2162ev_check_stop (EV_P_ ev_check *w)
1983{ 2163{
1984 ev_clear_pending (EV_A_ (W)w); 2164 clear_pending (EV_A_ (W)w);
1985 if (expect_false (!ev_is_active (w))) 2165 if (expect_false (!ev_is_active (w)))
1986 return; 2166 return;
1987 2167
1988 { 2168 {
1989 int active = ((W)w)->active; 2169 int active = ((W)w)->active;
2031} 2211}
2032 2212
2033void 2213void
2034ev_embed_stop (EV_P_ ev_embed *w) 2214ev_embed_stop (EV_P_ ev_embed *w)
2035{ 2215{
2036 ev_clear_pending (EV_A_ (W)w); 2216 clear_pending (EV_A_ (W)w);
2037 if (expect_false (!ev_is_active (w))) 2217 if (expect_false (!ev_is_active (w)))
2038 return; 2218 return;
2039 2219
2040 ev_io_stop (EV_A_ &w->io); 2220 ev_io_stop (EV_A_ &w->io);
2041 2221
2056} 2236}
2057 2237
2058void 2238void
2059ev_fork_stop (EV_P_ ev_fork *w) 2239ev_fork_stop (EV_P_ ev_fork *w)
2060{ 2240{
2061 ev_clear_pending (EV_A_ (W)w); 2241 clear_pending (EV_A_ (W)w);
2062 if (expect_false (!ev_is_active (w))) 2242 if (expect_false (!ev_is_active (w)))
2063 return; 2243 return;
2064 2244
2065 { 2245 {
2066 int active = ((W)w)->active; 2246 int active = ((W)w)->active;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines