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

Comparing libev/ev.c (file contents):
Revision 1.159 by root, Sat Dec 1 19:48:36 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;
… …
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{
… …
593 635
594 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
595 if (anfds [fd].events) 637 if (anfds [fd].events)
596 { 638 {
597 anfds [fd].events = 0; 639 anfds [fd].events = 0;
598 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
599 } 641 }
600} 642}
601 643
602/*****************************************************************************/ 644/*****************************************************************************/
603 645
604void inline_speed 646void inline_speed
605upheap (WT *heap, int k) 647upheap (WT *heap, int k)
606{ 648{
607 WT w = heap [k]; 649 WT w = heap [k];
608 650
609 while (k && heap [k >> 1]->at > w->at) 651 while (k)
610 { 652 {
653 int p = (k - 1) >> 1;
654
655 if (heap [p]->at <= w->at)
656 break;
657
611 heap [k] = heap [k >> 1]; 658 heap [k] = heap [p];
612 ((W)heap [k])->active = k + 1; 659 ((W)heap [k])->active = k + 1;
613 k >>= 1; 660 k = p;
614 } 661 }
615 662
616 heap [k] = w; 663 heap [k] = w;
617 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
618
619} 665}
620 666
621void inline_speed 667void inline_speed
622downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
623{ 669{
624 WT w = heap [k]; 670 WT w = heap [k];
625 671
626 while (k < (N >> 1)) 672 for (;;)
627 { 673 {
628 int j = k << 1; 674 int c = (k << 1) + 1;
629 675
630 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 676 if (c >= N)
631 ++j;
632
633 if (w->at <= heap [j]->at)
634 break; 677 break;
635 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
636 heap [k] = heap [j]; 685 heap [k] = heap [c];
637 ((W)heap [k])->active = k + 1; 686 ((W)heap [k])->active = k + 1;
687
638 k = j; 688 k = c;
639 } 689 }
640 690
641 heap [k] = w; 691 heap [k] = w;
642 ((W)heap [k])->active = k + 1; 692 ((W)heap [k])->active = k + 1;
643} 693}
… …
725 for (signum = signalmax; signum--; ) 775 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig) 776 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1); 777 ev_feed_signal_event (EV_A_ signum + 1);
728} 778}
729 779
730void inline_size 780void inline_speed
731fd_intern (int fd) 781fd_intern (int fd)
732{ 782{
733#ifdef _WIN32 783#ifdef _WIN32
734 int arg = 1; 784 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 785 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
750 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
751} 801}
752 802
753/*****************************************************************************/ 803/*****************************************************************************/
754 804
755static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
756 806
757#ifndef _WIN32 807#ifndef _WIN32
758 808
759static ev_signal childev; 809static ev_signal childev;
760 810
… …
764 ev_child *w; 814 ev_child *w;
765 815
766 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)
767 if (w->pid == pid || !w->pid) 817 if (w->pid == pid || !w->pid)
768 { 818 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 819 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
770 w->rpid = pid; 820 w->rpid = pid;
771 w->rstatus = status; 821 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 822 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 823 }
774} 824}
775 825
776#ifndef WCONTINUED 826#ifndef WCONTINUED
… …
886ev_backend (EV_P) 936ev_backend (EV_P)
887{ 937{
888 return backend; 938 return backend;
889} 939}
890 940
941unsigned int
942ev_loop_count (EV_P)
943{
944 return loop_count;
945}
946
891static void noinline 947static void noinline
892loop_init (EV_P_ unsigned int flags) 948loop_init (EV_P_ unsigned int flags)
893{ 949{
894 if (!backend) 950 if (!backend)
895 { 951 {
… …
975#if EV_USE_SELECT 1031#if EV_USE_SELECT
976 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1032 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977#endif 1033#endif
978 1034
979 for (i = NUMPRI; i--; ) 1035 for (i = NUMPRI; i--; )
1036 {
980 array_free (pending, [i]); 1037 array_free (pending, [i]);
1038#if EV_IDLE_ENABLE
1039 array_free (idle, [i]);
1040#endif
1041 }
981 1042
982 /* have to use the microsoft-never-gets-it-right macro */ 1043 /* have to use the microsoft-never-gets-it-right macro */
983 array_free (fdchange, EMPTY0); 1044 array_free (fdchange, EMPTY);
984 array_free (timer, EMPTY0); 1045 array_free (timer, EMPTY);
985#if EV_PERIODIC_ENABLE 1046#if EV_PERIODIC_ENABLE
986 array_free (periodic, EMPTY0); 1047 array_free (periodic, EMPTY);
987#endif 1048#endif
988 array_free (idle, EMPTY0);
989 array_free (prepare, EMPTY0); 1049 array_free (prepare, EMPTY);
990 array_free (check, EMPTY0); 1050 array_free (check, EMPTY);
991 1051
992 backend = 0; 1052 backend = 0;
993} 1053}
994 1054
995void inline_size infy_fork (EV_P); 1055void inline_size infy_fork (EV_P);
… …
1131 postfork = 1; 1191 postfork = 1;
1132} 1192}
1133 1193
1134/*****************************************************************************/ 1194/*****************************************************************************/
1135 1195
1136int inline_size 1196void
1137any_pending (EV_P) 1197ev_invoke (EV_P_ void *w, int revents)
1138{ 1198{
1139 int pri; 1199 EV_CB_INVOKE ((W)w, revents);
1140
1141 for (pri = NUMPRI; pri--; )
1142 if (pendingcnt [pri])
1143 return 1;
1144
1145 return 0;
1146} 1200}
1147 1201
1148void inline_speed 1202void inline_speed
1149call_pending (EV_P) 1203call_pending (EV_P)
1150{ 1204{
… …
1168void inline_size 1222void inline_size
1169timers_reify (EV_P) 1223timers_reify (EV_P)
1170{ 1224{
1171 while (timercnt && ((WT)timers [0])->at <= mn_now) 1225 while (timercnt && ((WT)timers [0])->at <= mn_now)
1172 { 1226 {
1173 ev_timer *w = timers [0]; 1227 ev_timer *w = (ev_timer *)timers [0];
1174 1228
1175 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1229 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1176 1230
1177 /* first reschedule or stop timer */ 1231 /* first reschedule or stop timer */
1178 if (w->repeat) 1232 if (w->repeat)
… …
1181 1235
1182 ((WT)w)->at += w->repeat; 1236 ((WT)w)->at += w->repeat;
1183 if (((WT)w)->at < mn_now) 1237 if (((WT)w)->at < mn_now)
1184 ((WT)w)->at = mn_now; 1238 ((WT)w)->at = mn_now;
1185 1239
1186 downheap ((WT *)timers, timercnt, 0); 1240 downheap (timers, timercnt, 0);
1187 } 1241 }
1188 else 1242 else
1189 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1243 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1190 1244
1191 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1245 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1196void inline_size 1250void inline_size
1197periodics_reify (EV_P) 1251periodics_reify (EV_P)
1198{ 1252{
1199 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1253 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1200 { 1254 {
1201 ev_periodic *w = periodics [0]; 1255 ev_periodic *w = (ev_periodic *)periodics [0];
1202 1256
1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1257 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1204 1258
1205 /* first reschedule or stop timer */ 1259 /* first reschedule or stop timer */
1206 if (w->reschedule_cb) 1260 if (w->reschedule_cb)
1207 { 1261 {
1208 ((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);
1209 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));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap (periodics, periodiccnt, 0);
1211 } 1265 }
1212 else if (w->interval) 1266 else if (w->interval)
1213 { 1267 {
1214 ((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;
1215 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));
1216 downheap ((WT *)periodics, periodiccnt, 0); 1271 downheap (periodics, periodiccnt, 0);
1217 } 1272 }
1218 else 1273 else
1219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1274 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1220 1275
1221 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1276 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1228 int i; 1283 int i;
1229 1284
1230 /* adjust periodics after time jump */ 1285 /* adjust periodics after time jump */
1231 for (i = 0; i < periodiccnt; ++i) 1286 for (i = 0; i < periodiccnt; ++i)
1232 { 1287 {
1233 ev_periodic *w = periodics [i]; 1288 ev_periodic *w = (ev_periodic *)periodics [i];
1234 1289
1235 if (w->reschedule_cb) 1290 if (w->reschedule_cb)
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1291 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1237 else if (w->interval) 1292 else if (w->interval)
1238 ((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;
1239 } 1294 }
1240 1295
1241 /* now rebuild the heap */ 1296 /* now rebuild the heap */
1242 for (i = periodiccnt >> 1; i--; ) 1297 for (i = periodiccnt >> 1; i--; )
1243 downheap ((WT *)periodics, periodiccnt, i); 1298 downheap (periodics, periodiccnt, i);
1244} 1299}
1245#endif 1300#endif
1246 1301
1302#if EV_IDLE_ENABLE
1247int inline_size 1303void inline_size
1248time_update_monotonic (EV_P) 1304idle_reify (EV_P)
1249{ 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
1250 mn_now = get_clock (); 1335 mn_now = get_clock ();
1251 1336
1337 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1338 /* interpolate in the meantime */
1252 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1339 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1253 { 1340 {
1254 ev_rt_now = rtmn_diff + mn_now; 1341 ev_rt_now = rtmn_diff + mn_now;
1255 return 0; 1342 return;
1256 } 1343 }
1257 else 1344
1258 {
1259 now_floor = mn_now; 1345 now_floor = mn_now;
1260 ev_rt_now = ev_time (); 1346 ev_rt_now = ev_time ();
1261 return 1;
1262 }
1263}
1264 1347
1265void inline_size 1348 /* loop a few times, before making important decisions.
1266time_update (EV_P) 1349 * on the choice of "4": one iteration isn't enough,
1267{ 1350 * in case we get preempted during the calls to
1268 int i; 1351 * ev_time and get_clock. a second call is almost guaranteed
1269 1352 * to succeed in that case, though. and looping a few more times
1270#if EV_USE_MONOTONIC 1353 * doesn't hurt either as we only do this on time-jumps or
1271 if (expect_true (have_monotonic)) 1354 * in the unlikely event of having been preempted here.
1272 { 1355 */
1273 if (time_update_monotonic (EV_A)) 1356 for (i = 4; --i; )
1274 { 1357 {
1275 ev_tstamp odiff = rtmn_diff;
1276
1277 /* loop a few times, before making important decisions.
1278 * on the choice of "4": one iteration isn't enough,
1279 * in case we get preempted during the calls to
1280 * ev_time and get_clock. a second call is almost guaranteed
1281 * to succeed in that case, though. and looping a few more times
1282 * doesn't hurt either as we only do this on time-jumps or
1283 * in the unlikely event of having been preempted here.
1284 */
1285 for (i = 4; --i; )
1286 {
1287 rtmn_diff = ev_rt_now - mn_now; 1358 rtmn_diff = ev_rt_now - mn_now;
1288 1359
1289 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1360 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1290 return; /* all is well */ 1361 return; /* all is well */
1291 1362
1292 ev_rt_now = ev_time (); 1363 ev_rt_now = ev_time ();
1293 mn_now = get_clock (); 1364 mn_now = get_clock ();
1294 now_floor = mn_now; 1365 now_floor = mn_now;
1295 } 1366 }
1296 1367
1297# if EV_PERIODIC_ENABLE 1368# if EV_PERIODIC_ENABLE
1298 periodics_reschedule (EV_A); 1369 periodics_reschedule (EV_A);
1299# endif 1370# endif
1300 /* no timer adjustment, as the monotonic clock doesn't jump */ 1371 /* no timer adjustment, as the monotonic clock doesn't jump */
1301 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1372 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1302 }
1303 } 1373 }
1304 else 1374 else
1305#endif 1375#endif
1306 { 1376 {
1307 ev_rt_now = ev_time (); 1377 ev_rt_now = ev_time ();
1308 1378
1309 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))
1310 { 1380 {
1311#if EV_PERIODIC_ENABLE 1381#if EV_PERIODIC_ENABLE
1312 periodics_reschedule (EV_A); 1382 periodics_reschedule (EV_A);
1313#endif 1383#endif
1314
1315 /* adjust timers. this is easy, as the offset is the same for all of them */ 1384 /* adjust timers. this is easy, as the offset is the same for all of them */
1316 for (i = 0; i < timercnt; ++i) 1385 for (i = 0; i < timercnt; ++i)
1317 ((WT)timers [i])->at += ev_rt_now - mn_now; 1386 ((WT)timers [i])->at += ev_rt_now - mn_now;
1318 } 1387 }
1319 1388
… …
1342 ? EVUNLOOP_ONE 1411 ? EVUNLOOP_ONE
1343 : EVUNLOOP_CANCEL; 1412 : EVUNLOOP_CANCEL;
1344 1413
1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1414 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346 1415
1347 for (;;) 1416 do
1348 { 1417 {
1349#ifndef _WIN32 1418#ifndef _WIN32
1350 if (expect_false (curpid)) /* penalise the forking check even more */ 1419 if (expect_false (curpid)) /* penalise the forking check even more */
1351 if (expect_false (getpid () != curpid)) 1420 if (expect_false (getpid () != curpid))
1352 { 1421 {
… …
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1432 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A); 1433 call_pending (EV_A);
1365 } 1434 }
1366#endif 1435#endif
1367 1436
1368 /* queue check watchers (and execute them) */ 1437 /* queue prepare watchers (and execute them) */
1369 if (expect_false (preparecnt)) 1438 if (expect_false (preparecnt))
1370 { 1439 {
1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1440 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372 call_pending (EV_A); 1441 call_pending (EV_A);
1373 } 1442 }
… …
1384 1453
1385 /* calculate blocking time */ 1454 /* calculate blocking time */
1386 { 1455 {
1387 ev_tstamp block; 1456 ev_tstamp block;
1388 1457
1389 if (flags & EVLOOP_NONBLOCK || idlecnt) 1458 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1390 block = 0.; /* do not block at all */ 1459 block = 0.; /* do not block at all */
1391 else 1460 else
1392 { 1461 {
1393 /* update time to cancel out callback processing overhead */ 1462 /* update time to cancel out callback processing overhead */
1394#if EV_USE_MONOTONIC
1395 if (expect_true (have_monotonic))
1396 time_update_monotonic (EV_A); 1463 time_update (EV_A_ 1e100);
1397 else
1398#endif
1399 {
1400 ev_rt_now = ev_time ();
1401 mn_now = ev_rt_now;
1402 }
1403 1464
1404 block = MAX_BLOCKTIME; 1465 block = MAX_BLOCKTIME;
1405 1466
1406 if (timercnt) 1467 if (timercnt)
1407 { 1468 {
… …
1418#endif 1479#endif
1419 1480
1420 if (expect_false (block < 0.)) block = 0.; 1481 if (expect_false (block < 0.)) block = 0.;
1421 } 1482 }
1422 1483
1484 ++loop_count;
1423 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);
1424 } 1489 }
1425
1426 /* update ev_rt_now, do magic */
1427 time_update (EV_A);
1428 1490
1429 /* queue pending timers and reschedule them */ 1491 /* queue pending timers and reschedule them */
1430 timers_reify (EV_A); /* relative timers called last */ 1492 timers_reify (EV_A); /* relative timers called last */
1431#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1432 periodics_reify (EV_A); /* absolute timers called first */ 1494 periodics_reify (EV_A); /* absolute timers called first */
1433#endif 1495#endif
1434 1496
1497#if EV_IDLE_ENABLE
1435 /* queue idle watchers unless other events are pending */ 1498 /* queue idle watchers unless other events are pending */
1436 if (idlecnt && !any_pending (EV_A)) 1499 idle_reify (EV_A);
1437 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1500#endif
1438 1501
1439 /* queue check watchers, to be executed first */ 1502 /* queue check watchers, to be executed first */
1440 if (expect_false (checkcnt)) 1503 if (expect_false (checkcnt))
1441 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1504 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1442 1505
1443 call_pending (EV_A); 1506 call_pending (EV_A);
1444 1507
1445 if (expect_false (loop_done))
1446 break;
1447 } 1508 }
1509 while (expect_true (activecnt && !loop_done));
1448 1510
1449 if (loop_done == EVUNLOOP_ONE) 1511 if (loop_done == EVUNLOOP_ONE)
1450 loop_done = EVUNLOOP_CANCEL; 1512 loop_done = EVUNLOOP_CANCEL;
1451} 1513}
1452 1514
… …
1479 head = &(*head)->next; 1541 head = &(*head)->next;
1480 } 1542 }
1481} 1543}
1482 1544
1483void inline_speed 1545void inline_speed
1484ev_clear_pending (EV_P_ W w) 1546clear_pending (EV_P_ W w)
1485{ 1547{
1486 if (w->pending) 1548 if (w->pending)
1487 { 1549 {
1488 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1550 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1489 w->pending = 0; 1551 w->pending = 0;
1490 } 1552 }
1491} 1553}
1492 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
1493void inline_speed 1581void inline_speed
1494ev_start (EV_P_ W w, int active) 1582ev_start (EV_P_ W w, int active)
1495{ 1583{
1496 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1584 pri_adjust (EV_A_ w);
1497 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1498
1499 w->active = active; 1585 w->active = active;
1500 ev_ref (EV_A); 1586 ev_ref (EV_A);
1501} 1587}
1502 1588
1503void inline_size 1589void inline_size
… …
1507 w->active = 0; 1593 w->active = 0;
1508} 1594}
1509 1595
1510/*****************************************************************************/ 1596/*****************************************************************************/
1511 1597
1512void 1598void noinline
1513ev_io_start (EV_P_ ev_io *w) 1599ev_io_start (EV_P_ ev_io *w)
1514{ 1600{
1515 int fd = w->fd; 1601 int fd = w->fd;
1516 1602
1517 if (expect_false (ev_is_active (w))) 1603 if (expect_false (ev_is_active (w)))
… …
1519 1605
1520 assert (("ev_io_start called with negative fd", fd >= 0)); 1606 assert (("ev_io_start called with negative fd", fd >= 0));
1521 1607
1522 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
1523 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1609 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1524 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1610 wlist_add (&anfds[fd].head, (WL)w);
1525 1611
1526 fd_change (EV_A_ fd); 1612 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1613 w->events &= ~EV_IOFDSET;
1527} 1614}
1528 1615
1529void 1616void noinline
1530ev_io_stop (EV_P_ ev_io *w) 1617ev_io_stop (EV_P_ ev_io *w)
1531{ 1618{
1532 ev_clear_pending (EV_A_ (W)w); 1619 clear_pending (EV_A_ (W)w);
1533 if (expect_false (!ev_is_active (w))) 1620 if (expect_false (!ev_is_active (w)))
1534 return; 1621 return;
1535 1622
1536 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));
1537 1624
1538 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1625 wlist_del (&anfds[w->fd].head, (WL)w);
1539 ev_stop (EV_A_ (W)w); 1626 ev_stop (EV_A_ (W)w);
1540 1627
1541 fd_change (EV_A_ w->fd); 1628 fd_change (EV_A_ w->fd, 1);
1542} 1629}
1543 1630
1544void 1631void noinline
1545ev_timer_start (EV_P_ ev_timer *w) 1632ev_timer_start (EV_P_ ev_timer *w)
1546{ 1633{
1547 if (expect_false (ev_is_active (w))) 1634 if (expect_false (ev_is_active (w)))
1548 return; 1635 return;
1549 1636
1550 ((WT)w)->at += mn_now; 1637 ((WT)w)->at += mn_now;
1551 1638
1552 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.));
1553 1640
1554 ev_start (EV_A_ (W)w, ++timercnt); 1641 ev_start (EV_A_ (W)w, ++timercnt);
1555 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1642 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1556 timers [timercnt - 1] = w; 1643 timers [timercnt - 1] = (WT)w;
1557 upheap ((WT *)timers, timercnt - 1); 1644 upheap (timers, timercnt - 1);
1558 1645
1559 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1560} 1647}
1561 1648
1562void 1649void noinline
1563ev_timer_stop (EV_P_ ev_timer *w) 1650ev_timer_stop (EV_P_ ev_timer *w)
1564{ 1651{
1565 ev_clear_pending (EV_A_ (W)w); 1652 clear_pending (EV_A_ (W)w);
1566 if (expect_false (!ev_is_active (w))) 1653 if (expect_false (!ev_is_active (w)))
1567 return; 1654 return;
1568 1655
1569 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1570 1657
1571 { 1658 {
1572 int active = ((W)w)->active; 1659 int active = ((W)w)->active;
1573 1660
1574 if (expect_true (--active < --timercnt)) 1661 if (expect_true (--active < --timercnt))
1575 { 1662 {
1576 timers [active] = timers [timercnt]; 1663 timers [active] = timers [timercnt];
1577 adjustheap ((WT *)timers, timercnt, active); 1664 adjustheap (timers, timercnt, active);
1578 } 1665 }
1579 } 1666 }
1580 1667
1581 ((WT)w)->at -= mn_now; 1668 ((WT)w)->at -= mn_now;
1582 1669
1583 ev_stop (EV_A_ (W)w); 1670 ev_stop (EV_A_ (W)w);
1584} 1671}
1585 1672
1586void 1673void noinline
1587ev_timer_again (EV_P_ ev_timer *w) 1674ev_timer_again (EV_P_ ev_timer *w)
1588{ 1675{
1589 if (ev_is_active (w)) 1676 if (ev_is_active (w))
1590 { 1677 {
1591 if (w->repeat) 1678 if (w->repeat)
1592 { 1679 {
1593 ((WT)w)->at = mn_now + w->repeat; 1680 ((WT)w)->at = mn_now + w->repeat;
1594 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1681 adjustheap (timers, timercnt, ((W)w)->active - 1);
1595 } 1682 }
1596 else 1683 else
1597 ev_timer_stop (EV_A_ w); 1684 ev_timer_stop (EV_A_ w);
1598 } 1685 }
1599 else if (w->repeat) 1686 else if (w->repeat)
… …
1602 ev_timer_start (EV_A_ w); 1689 ev_timer_start (EV_A_ w);
1603 } 1690 }
1604} 1691}
1605 1692
1606#if EV_PERIODIC_ENABLE 1693#if EV_PERIODIC_ENABLE
1607void 1694void noinline
1608ev_periodic_start (EV_P_ ev_periodic *w) 1695ev_periodic_start (EV_P_ ev_periodic *w)
1609{ 1696{
1610 if (expect_false (ev_is_active (w))) 1697 if (expect_false (ev_is_active (w)))
1611 return; 1698 return;
1612 1699
… …
1614 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1701 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1615 else if (w->interval) 1702 else if (w->interval)
1616 { 1703 {
1617 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.));
1618 /* 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 */
1619 ((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;
1620 } 1707 }
1708 else
1709 ((WT)w)->at = w->offset;
1621 1710
1622 ev_start (EV_A_ (W)w, ++periodiccnt); 1711 ev_start (EV_A_ (W)w, ++periodiccnt);
1623 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1712 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1624 periodics [periodiccnt - 1] = w; 1713 periodics [periodiccnt - 1] = (WT)w;
1625 upheap ((WT *)periodics, periodiccnt - 1); 1714 upheap (periodics, periodiccnt - 1);
1626 1715
1627 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1628} 1717}
1629 1718
1630void 1719void noinline
1631ev_periodic_stop (EV_P_ ev_periodic *w) 1720ev_periodic_stop (EV_P_ ev_periodic *w)
1632{ 1721{
1633 ev_clear_pending (EV_A_ (W)w); 1722 clear_pending (EV_A_ (W)w);
1634 if (expect_false (!ev_is_active (w))) 1723 if (expect_false (!ev_is_active (w)))
1635 return; 1724 return;
1636 1725
1637 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1638 1727
1639 { 1728 {
1640 int active = ((W)w)->active; 1729 int active = ((W)w)->active;
1641 1730
1642 if (expect_true (--active < --periodiccnt)) 1731 if (expect_true (--active < --periodiccnt))
1643 { 1732 {
1644 periodics [active] = periodics [periodiccnt]; 1733 periodics [active] = periodics [periodiccnt];
1645 adjustheap ((WT *)periodics, periodiccnt, active); 1734 adjustheap (periodics, periodiccnt, active);
1646 } 1735 }
1647 } 1736 }
1648 1737
1649 ev_stop (EV_A_ (W)w); 1738 ev_stop (EV_A_ (W)w);
1650} 1739}
1651 1740
1652void 1741void noinline
1653ev_periodic_again (EV_P_ ev_periodic *w) 1742ev_periodic_again (EV_P_ ev_periodic *w)
1654{ 1743{
1655 /* TODO: use adjustheap and recalculation */ 1744 /* TODO: use adjustheap and recalculation */
1656 ev_periodic_stop (EV_A_ w); 1745 ev_periodic_stop (EV_A_ w);
1657 ev_periodic_start (EV_A_ w); 1746 ev_periodic_start (EV_A_ w);
… …
1660 1749
1661#ifndef SA_RESTART 1750#ifndef SA_RESTART
1662# define SA_RESTART 0 1751# define SA_RESTART 0
1663#endif 1752#endif
1664 1753
1665void 1754void noinline
1666ev_signal_start (EV_P_ ev_signal *w) 1755ev_signal_start (EV_P_ ev_signal *w)
1667{ 1756{
1668#if EV_MULTIPLICITY 1757#if EV_MULTIPLICITY
1669 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));
1670#endif 1759#endif
1671 if (expect_false (ev_is_active (w))) 1760 if (expect_false (ev_is_active (w)))
1672 return; 1761 return;
1673 1762
1674 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));
1675 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
1676 ev_start (EV_A_ (W)w, 1); 1779 ev_start (EV_A_ (W)w, 1);
1677 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1678 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1780 wlist_add (&signals [w->signum - 1].head, (WL)w);
1679 1781
1680 if (!((WL)w)->next) 1782 if (!((WL)w)->next)
1681 { 1783 {
1682#if _WIN32 1784#if _WIN32
1683 signal (w->signum, sighandler); 1785 signal (w->signum, sighandler);
… …
1689 sigaction (w->signum, &sa, 0); 1791 sigaction (w->signum, &sa, 0);
1690#endif 1792#endif
1691 } 1793 }
1692} 1794}
1693 1795
1694void 1796void noinline
1695ev_signal_stop (EV_P_ ev_signal *w) 1797ev_signal_stop (EV_P_ ev_signal *w)
1696{ 1798{
1697 ev_clear_pending (EV_A_ (W)w); 1799 clear_pending (EV_A_ (W)w);
1698 if (expect_false (!ev_is_active (w))) 1800 if (expect_false (!ev_is_active (w)))
1699 return; 1801 return;
1700 1802
1701 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1803 wlist_del (&signals [w->signum - 1].head, (WL)w);
1702 ev_stop (EV_A_ (W)w); 1804 ev_stop (EV_A_ (W)w);
1703 1805
1704 if (!signals [w->signum - 1].head) 1806 if (!signals [w->signum - 1].head)
1705 signal (w->signum, SIG_DFL); 1807 signal (w->signum, SIG_DFL);
1706} 1808}
… …
1713#endif 1815#endif
1714 if (expect_false (ev_is_active (w))) 1816 if (expect_false (ev_is_active (w)))
1715 return; 1817 return;
1716 1818
1717 ev_start (EV_A_ (W)w, 1); 1819 ev_start (EV_A_ (W)w, 1);
1718 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1820 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1719} 1821}
1720 1822
1721void 1823void
1722ev_child_stop (EV_P_ ev_child *w) 1824ev_child_stop (EV_P_ ev_child *w)
1723{ 1825{
1724 ev_clear_pending (EV_A_ (W)w); 1826 clear_pending (EV_A_ (W)w);
1725 if (expect_false (!ev_is_active (w))) 1827 if (expect_false (!ev_is_active (w)))
1726 return; 1828 return;
1727 1829
1728 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1830 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1729 ev_stop (EV_A_ (W)w); 1831 ev_stop (EV_A_ (W)w);
1730} 1832}
1731 1833
1732#if EV_STAT_ENABLE 1834#if EV_STAT_ENABLE
1733 1835
… …
1965} 2067}
1966 2068
1967void 2069void
1968ev_stat_stop (EV_P_ ev_stat *w) 2070ev_stat_stop (EV_P_ ev_stat *w)
1969{ 2071{
1970 ev_clear_pending (EV_A_ (W)w); 2072 clear_pending (EV_A_ (W)w);
1971 if (expect_false (!ev_is_active (w))) 2073 if (expect_false (!ev_is_active (w)))
1972 return; 2074 return;
1973 2075
1974#if EV_USE_INOTIFY 2076#if EV_USE_INOTIFY
1975 infy_del (EV_A_ w); 2077 infy_del (EV_A_ w);
… …
1978 2080
1979 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1980} 2082}
1981#endif 2083#endif
1982 2084
2085#if EV_IDLE_ENABLE
1983void 2086void
1984ev_idle_start (EV_P_ ev_idle *w) 2087ev_idle_start (EV_P_ ev_idle *w)
1985{ 2088{
1986 if (expect_false (ev_is_active (w))) 2089 if (expect_false (ev_is_active (w)))
1987 return; 2090 return;
1988 2091
2092 pri_adjust (EV_A_ (W)w);
2093
2094 {
2095 int active = ++idlecnt [ABSPRI (w)];
2096
2097 ++idleall;
1989 ev_start (EV_A_ (W)w, ++idlecnt); 2098 ev_start (EV_A_ (W)w, active);
2099
1990 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2100 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1991 idles [idlecnt - 1] = w; 2101 idles [ABSPRI (w)][active - 1] = w;
2102 }
1992} 2103}
1993 2104
1994void 2105void
1995ev_idle_stop (EV_P_ ev_idle *w) 2106ev_idle_stop (EV_P_ ev_idle *w)
1996{ 2107{
1997 ev_clear_pending (EV_A_ (W)w); 2108 clear_pending (EV_A_ (W)w);
1998 if (expect_false (!ev_is_active (w))) 2109 if (expect_false (!ev_is_active (w)))
1999 return; 2110 return;
2000 2111
2001 { 2112 {
2002 int active = ((W)w)->active; 2113 int active = ((W)w)->active;
2003 idles [active - 1] = idles [--idlecnt]; 2114
2115 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2004 ((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;
2005 } 2120 }
2006
2007 ev_stop (EV_A_ (W)w);
2008} 2121}
2122#endif
2009 2123
2010void 2124void
2011ev_prepare_start (EV_P_ ev_prepare *w) 2125ev_prepare_start (EV_P_ ev_prepare *w)
2012{ 2126{
2013 if (expect_false (ev_is_active (w))) 2127 if (expect_false (ev_is_active (w)))
… …
2019} 2133}
2020 2134
2021void 2135void
2022ev_prepare_stop (EV_P_ ev_prepare *w) 2136ev_prepare_stop (EV_P_ ev_prepare *w)
2023{ 2137{
2024 ev_clear_pending (EV_A_ (W)w); 2138 clear_pending (EV_A_ (W)w);
2025 if (expect_false (!ev_is_active (w))) 2139 if (expect_false (!ev_is_active (w)))
2026 return; 2140 return;
2027 2141
2028 { 2142 {
2029 int active = ((W)w)->active; 2143 int active = ((W)w)->active;
… …
2046} 2160}
2047 2161
2048void 2162void
2049ev_check_stop (EV_P_ ev_check *w) 2163ev_check_stop (EV_P_ ev_check *w)
2050{ 2164{
2051 ev_clear_pending (EV_A_ (W)w); 2165 clear_pending (EV_A_ (W)w);
2052 if (expect_false (!ev_is_active (w))) 2166 if (expect_false (!ev_is_active (w)))
2053 return; 2167 return;
2054 2168
2055 { 2169 {
2056 int active = ((W)w)->active; 2170 int active = ((W)w)->active;
… …
2098} 2212}
2099 2213
2100void 2214void
2101ev_embed_stop (EV_P_ ev_embed *w) 2215ev_embed_stop (EV_P_ ev_embed *w)
2102{ 2216{
2103 ev_clear_pending (EV_A_ (W)w); 2217 clear_pending (EV_A_ (W)w);
2104 if (expect_false (!ev_is_active (w))) 2218 if (expect_false (!ev_is_active (w)))
2105 return; 2219 return;
2106 2220
2107 ev_io_stop (EV_A_ &w->io); 2221 ev_io_stop (EV_A_ &w->io);
2108 2222
… …
2123} 2237}
2124 2238
2125void 2239void
2126ev_fork_stop (EV_P_ ev_fork *w) 2240ev_fork_stop (EV_P_ ev_fork *w)
2127{ 2241{
2128 ev_clear_pending (EV_A_ (W)w); 2242 clear_pending (EV_A_ (W)w);
2129 if (expect_false (!ev_is_active (w))) 2243 if (expect_false (!ev_is_active (w)))
2130 return; 2244 return;
2131 2245
2132 { 2246 {
2133 int active = ((W)w)->active; 2247 int active = ((W)w)->active;

Diff Legend

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