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.185 by root, Fri Dec 14 18:22:30 2007 UTC

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

Diff Legend

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