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

Comparing libev/ev.c (file contents):
Revision 1.157 by root, Wed Nov 28 20:58:32 2007 UTC vs.
Revision 1.183 by root, Wed Dec 12 05:11:56 2007 UTC

… …
216# include <sys/inotify.h> 216# include <sys/inotify.h>
217#endif 217#endif
218 218
219/**/ 219/**/
220 220
221/*
222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding
225 * errors are against us.
226 * This value is good at least till the year 4000.
227 * Better solutions welcome.
228 */
229#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
230
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 234
225#if __GNUC__ >= 3 235#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 238#else
236# define expect(expr,value) (expr) 239# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 240# define noinline
241# if __STDC_VERSION__ < 199901L
242# define inline
243# endif
240#endif 244#endif
241 245
242#define expect_false(expr) expect ((expr) != 0, 0) 246#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 247#define expect_true(expr) expect ((expr) != 0, 1)
248#define inline_size static inline
249
250#if EV_MINIMAL
251# define inline_speed static noinline
252#else
253# define inline_speed static inline
254#endif
244 255
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 256#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 257#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 258
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 259#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 260#define EMPTY2(a,b) /* used to suppress some warnings */
250 261
251typedef ev_watcher *W; 262typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 263typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 264typedef ev_watcher_time *WT;
… …
396{ 407{
397 return ev_rt_now; 408 return ev_rt_now;
398} 409}
399#endif 410#endif
400 411
401#define array_roundsize(type,n) (((n) | 4) & ~3) 412int inline_size
413array_nextsize (int elem, int cur, int cnt)
414{
415 int ncur = cur + 1;
416
417 do
418 ncur <<= 1;
419 while (cnt > ncur);
420
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096)
423 {
424 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
426 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem;
428 }
429
430 return ncur;
431}
432
433static noinline void *
434array_realloc (int elem, void *base, int *cur, int cnt)
435{
436 *cur = array_nextsize (elem, *cur, cnt);
437 return ev_realloc (base, elem * *cur);
438}
402 439
403#define array_needsize(type,base,cur,cnt,init) \ 440#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 441 if (expect_false ((cnt) > (cur))) \
405 { \ 442 { \
406 int newcnt = cur; \ 443 int ocur_ = (cur); \
407 do \ 444 (base) = (type *)array_realloc \
408 { \ 445 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 446 init ((base) + (ocur_), (cur) - ocur_); \
410 } \
411 while ((cnt) > newcnt); \
412 \
413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
414 init (base + cur, newcnt - cur); \
415 cur = newcnt; \
416 } 447 }
417 448
449#if 0
418#define array_slim(type,stem) \ 450#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 451 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 452 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 453 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 454 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 455 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 456 }
457#endif
425 458
426#define array_free(stem, idx) \ 459#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 460 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 461
429/*****************************************************************************/ 462/*****************************************************************************/
430 463
431void noinline 464void noinline
432ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
433{ 466{
434 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
435 469
436 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
437 { 473 {
474 w_->pending = ++pendingcnt [pri];
475 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
476 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 478 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446} 479}
447 480
448void inline_size 481void inline_speed
449queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 483{
451 int i; 484 int i;
452 485
453 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
… …
485} 518}
486 519
487void 520void
488ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 522{
523 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
491} 525}
492 526
493void inline_size 527void inline_size
494fd_reify (EV_P) 528fd_reify (EV_P)
495{ 529{
… …
523 557
524 fdchangecnt = 0; 558 fdchangecnt = 0;
525} 559}
526 560
527void inline_size 561void inline_size
528fd_change (EV_P_ int fd) 562fd_change (EV_P_ int fd, int flags)
529{ 563{
530 if (expect_false (anfds [fd].reify)) 564 unsigned char reify = anfds [fd].reify;
531 return;
532
533 anfds [fd].reify = 1; 565 anfds [fd].reify |= flags | 1;
534 566
567 if (expect_true (!reify))
568 {
535 ++fdchangecnt; 569 ++fdchangecnt;
536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
537 fdchanges [fdchangecnt - 1] = fd; 571 fdchanges [fdchangecnt - 1] = fd;
572 }
538} 573}
539 574
540void inline_speed 575void inline_speed
541fd_kill (EV_P_ int fd) 576fd_kill (EV_P_ int fd)
542{ 577{
… …
593 628
594 for (fd = 0; fd < anfdmax; ++fd) 629 for (fd = 0; fd < anfdmax; ++fd)
595 if (anfds [fd].events) 630 if (anfds [fd].events)
596 { 631 {
597 anfds [fd].events = 0; 632 anfds [fd].events = 0;
598 fd_change (EV_A_ fd); 633 fd_change (EV_A_ fd, EV_IOFDSET);
599 } 634 }
600} 635}
601 636
602/*****************************************************************************/ 637/*****************************************************************************/
603 638
604void inline_speed 639void inline_speed
605upheap (WT *heap, int k) 640upheap (WT *heap, int k)
606{ 641{
607 WT w = heap [k]; 642 WT w = heap [k];
608 643
609 while (k && heap [k >> 1]->at > w->at) 644 while (k)
610 { 645 {
646 int p = (k - 1) >> 1;
647
648 if (heap [p]->at <= w->at)
649 break;
650
611 heap [k] = heap [k >> 1]; 651 heap [k] = heap [p];
612 ((W)heap [k])->active = k + 1; 652 ((W)heap [k])->active = k + 1;
613 k >>= 1; 653 k = p;
614 } 654 }
615 655
616 heap [k] = w; 656 heap [k] = w;
617 ((W)heap [k])->active = k + 1; 657 ((W)heap [k])->active = k + 1;
618
619} 658}
620 659
621void inline_speed 660void inline_speed
622downheap (WT *heap, int N, int k) 661downheap (WT *heap, int N, int k)
623{ 662{
624 WT w = heap [k]; 663 WT w = heap [k];
625 664
626 while (k < (N >> 1)) 665 for (;;)
627 { 666 {
628 int j = k << 1; 667 int c = (k << 1) + 1;
629 668
630 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 669 if (c >= N)
631 ++j;
632
633 if (w->at <= heap [j]->at)
634 break; 670 break;
635 671
672 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
673 ? 1 : 0;
674
675 if (w->at <= heap [c]->at)
676 break;
677
636 heap [k] = heap [j]; 678 heap [k] = heap [c];
637 ((W)heap [k])->active = k + 1; 679 ((W)heap [k])->active = k + 1;
680
638 k = j; 681 k = c;
639 } 682 }
640 683
641 heap [k] = w; 684 heap [k] = w;
642 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
643} 686}
… …
725 for (signum = signalmax; signum--; ) 768 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig) 769 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1); 770 ev_feed_signal_event (EV_A_ signum + 1);
728} 771}
729 772
730void inline_size 773void inline_speed
731fd_intern (int fd) 774fd_intern (int fd)
732{ 775{
733#ifdef _WIN32 776#ifdef _WIN32
734 int arg = 1; 777 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 778 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
750 ev_unref (EV_A); /* child watcher should not keep loop alive */ 793 ev_unref (EV_A); /* child watcher should not keep loop alive */
751} 794}
752 795
753/*****************************************************************************/ 796/*****************************************************************************/
754 797
755static ev_child *childs [EV_PID_HASHSIZE]; 798static WL childs [EV_PID_HASHSIZE];
756 799
757#ifndef _WIN32 800#ifndef _WIN32
758 801
759static ev_signal childev; 802static ev_signal childev;
760 803
… …
764 ev_child *w; 807 ev_child *w;
765 808
766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 809 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
767 if (w->pid == pid || !w->pid) 810 if (w->pid == pid || !w->pid)
768 { 811 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 812 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
770 w->rpid = pid; 813 w->rpid = pid;
771 w->rstatus = status; 814 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 815 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 816 }
774} 817}
775 818
776#ifndef WCONTINUED 819#ifndef WCONTINUED
… …
886ev_backend (EV_P) 929ev_backend (EV_P)
887{ 930{
888 return backend; 931 return backend;
889} 932}
890 933
934unsigned int
935ev_loop_count (EV_P)
936{
937 return loop_count;
938}
939
891static void noinline 940static void noinline
892loop_init (EV_P_ unsigned int flags) 941loop_init (EV_P_ unsigned int flags)
893{ 942{
894 if (!backend) 943 if (!backend)
895 { 944 {
… …
904 ev_rt_now = ev_time (); 953 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 954 mn_now = get_clock ();
906 now_floor = mn_now; 955 now_floor = mn_now;
907 rtmn_diff = ev_rt_now - mn_now; 956 rtmn_diff = ev_rt_now - mn_now;
908 957
958 /* pid check not overridable via env */
959#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid ();
962#endif
963
909 if (!(flags & EVFLAG_NOENV) 964 if (!(flags & EVFLAG_NOENV)
910 && !enable_secure () 965 && !enable_secure ()
911 && getenv ("LIBEV_FLAGS")) 966 && getenv ("LIBEV_FLAGS"))
912 flags = atoi (getenv ("LIBEV_FLAGS")); 967 flags = atoi (getenv ("LIBEV_FLAGS"));
913 968
… …
969#if EV_USE_SELECT 1024#if EV_USE_SELECT
970 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1025 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
971#endif 1026#endif
972 1027
973 for (i = NUMPRI; i--; ) 1028 for (i = NUMPRI; i--; )
1029 {
974 array_free (pending, [i]); 1030 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE
1032 array_free (idle, [i]);
1033#endif
1034 }
975 1035
976 /* have to use the microsoft-never-gets-it-right macro */ 1036 /* have to use the microsoft-never-gets-it-right macro */
977 array_free (fdchange, EMPTY0); 1037 array_free (fdchange, EMPTY);
978 array_free (timer, EMPTY0); 1038 array_free (timer, EMPTY);
979#if EV_PERIODIC_ENABLE 1039#if EV_PERIODIC_ENABLE
980 array_free (periodic, EMPTY0); 1040 array_free (periodic, EMPTY);
981#endif 1041#endif
982 array_free (idle, EMPTY0);
983 array_free (prepare, EMPTY0); 1042 array_free (prepare, EMPTY);
984 array_free (check, EMPTY0); 1043 array_free (check, EMPTY);
985 1044
986 backend = 0; 1045 backend = 0;
987} 1046}
988 1047
989void inline_size infy_fork (EV_P); 1048void inline_size infy_fork (EV_P);
… …
1125 postfork = 1; 1184 postfork = 1;
1126} 1185}
1127 1186
1128/*****************************************************************************/ 1187/*****************************************************************************/
1129 1188
1130int inline_size 1189void
1131any_pending (EV_P) 1190ev_invoke (EV_P_ void *w, int revents)
1132{ 1191{
1133 int pri; 1192 EV_CB_INVOKE ((W)w, revents);
1134
1135 for (pri = NUMPRI; pri--; )
1136 if (pendingcnt [pri])
1137 return 1;
1138
1139 return 0;
1140} 1193}
1141 1194
1142void inline_speed 1195void inline_speed
1143call_pending (EV_P) 1196call_pending (EV_P)
1144{ 1197{
… …
1162void inline_size 1215void inline_size
1163timers_reify (EV_P) 1216timers_reify (EV_P)
1164{ 1217{
1165 while (timercnt && ((WT)timers [0])->at <= mn_now) 1218 while (timercnt && ((WT)timers [0])->at <= mn_now)
1166 { 1219 {
1167 ev_timer *w = timers [0]; 1220 ev_timer *w = (ev_timer *)timers [0];
1168 1221
1169 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1170 1223
1171 /* first reschedule or stop timer */ 1224 /* first reschedule or stop timer */
1172 if (w->repeat) 1225 if (w->repeat)
… …
1175 1228
1176 ((WT)w)->at += w->repeat; 1229 ((WT)w)->at += w->repeat;
1177 if (((WT)w)->at < mn_now) 1230 if (((WT)w)->at < mn_now)
1178 ((WT)w)->at = mn_now; 1231 ((WT)w)->at = mn_now;
1179 1232
1180 downheap ((WT *)timers, timercnt, 0); 1233 downheap (timers, timercnt, 0);
1181 } 1234 }
1182 else 1235 else
1183 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1184 1237
1185 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1190void inline_size 1243void inline_size
1191periodics_reify (EV_P) 1244periodics_reify (EV_P)
1192{ 1245{
1193 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1194 { 1247 {
1195 ev_periodic *w = periodics [0]; 1248 ev_periodic *w = (ev_periodic *)periodics [0];
1196 1249
1197 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1198 1251
1199 /* first reschedule or stop timer */ 1252 /* first reschedule or stop timer */
1200 if (w->reschedule_cb) 1253 if (w->reschedule_cb)
1201 { 1254 {
1202 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1203 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1256 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1204 downheap ((WT *)periodics, periodiccnt, 0); 1257 downheap (periodics, periodiccnt, 0);
1205 } 1258 }
1206 else if (w->interval) 1259 else if (w->interval)
1207 { 1260 {
1208 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1262 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1209 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1263 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap (periodics, periodiccnt, 0);
1211 } 1265 }
1212 else 1266 else
1213 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1214 1268
1215 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1222 int i; 1276 int i;
1223 1277
1224 /* adjust periodics after time jump */ 1278 /* adjust periodics after time jump */
1225 for (i = 0; i < periodiccnt; ++i) 1279 for (i = 0; i < periodiccnt; ++i)
1226 { 1280 {
1227 ev_periodic *w = periodics [i]; 1281 ev_periodic *w = (ev_periodic *)periodics [i];
1228 1282
1229 if (w->reschedule_cb) 1283 if (w->reschedule_cb)
1230 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1231 else if (w->interval) 1285 else if (w->interval)
1232 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1233 } 1287 }
1234 1288
1235 /* now rebuild the heap */ 1289 /* now rebuild the heap */
1236 for (i = periodiccnt >> 1; i--; ) 1290 for (i = periodiccnt >> 1; i--; )
1237 downheap ((WT *)periodics, periodiccnt, i); 1291 downheap (periodics, periodiccnt, i);
1238} 1292}
1239#endif 1293#endif
1240 1294
1295#if EV_IDLE_ENABLE
1241int inline_size 1296void inline_size
1242time_update_monotonic (EV_P) 1297idle_reify (EV_P)
1243{ 1298{
1299 if (expect_false (idleall))
1300 {
1301 int pri;
1302
1303 for (pri = NUMPRI; pri--; )
1304 {
1305 if (pendingcnt [pri])
1306 break;
1307
1308 if (idlecnt [pri])
1309 {
1310 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1311 break;
1312 }
1313 }
1314 }
1315}
1316#endif
1317
1318void inline_speed
1319time_update (EV_P_ ev_tstamp max_block)
1320{
1321 int i;
1322
1323#if EV_USE_MONOTONIC
1324 if (expect_true (have_monotonic))
1325 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1244 mn_now = get_clock (); 1328 mn_now = get_clock ();
1245 1329
1330 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1331 /* interpolate in the meantime */
1246 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1332 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1247 { 1333 {
1248 ev_rt_now = rtmn_diff + mn_now; 1334 ev_rt_now = rtmn_diff + mn_now;
1249 return 0; 1335 return;
1250 } 1336 }
1251 else 1337
1252 {
1253 now_floor = mn_now; 1338 now_floor = mn_now;
1254 ev_rt_now = ev_time (); 1339 ev_rt_now = ev_time ();
1255 return 1;
1256 }
1257}
1258 1340
1259void inline_size 1341 /* loop a few times, before making important decisions.
1260time_update (EV_P) 1342 * on the choice of "4": one iteration isn't enough,
1261{ 1343 * in case we get preempted during the calls to
1262 int i; 1344 * ev_time and get_clock. a second call is almost guaranteed
1263 1345 * to succeed in that case, though. and looping a few more times
1264#if EV_USE_MONOTONIC 1346 * doesn't hurt either as we only do this on time-jumps or
1265 if (expect_true (have_monotonic)) 1347 * in the unlikely event of having been preempted here.
1266 { 1348 */
1267 if (time_update_monotonic (EV_A)) 1349 for (i = 4; --i; )
1268 { 1350 {
1269 ev_tstamp odiff = rtmn_diff;
1270
1271 /* loop a few times, before making important decisions.
1272 * on the choice of "4": one iteration isn't enough,
1273 * in case we get preempted during the calls to
1274 * ev_time and get_clock. a second call is almost guaranteed
1275 * to succeed in that case, though. and looping a few more times
1276 * doesn't hurt either as we only do this on time-jumps or
1277 * in the unlikely event of having been preempted here.
1278 */
1279 for (i = 4; --i; )
1280 {
1281 rtmn_diff = ev_rt_now - mn_now; 1351 rtmn_diff = ev_rt_now - mn_now;
1282 1352
1283 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1284 return; /* all is well */ 1354 return; /* all is well */
1285 1355
1286 ev_rt_now = ev_time (); 1356 ev_rt_now = ev_time ();
1287 mn_now = get_clock (); 1357 mn_now = get_clock ();
1288 now_floor = mn_now; 1358 now_floor = mn_now;
1289 } 1359 }
1290 1360
1291# if EV_PERIODIC_ENABLE 1361# if EV_PERIODIC_ENABLE
1292 periodics_reschedule (EV_A); 1362 periodics_reschedule (EV_A);
1293# endif 1363# endif
1294 /* no timer adjustment, as the monotonic clock doesn't jump */ 1364 /* no timer adjustment, as the monotonic clock doesn't jump */
1295 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1365 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1296 }
1297 } 1366 }
1298 else 1367 else
1299#endif 1368#endif
1300 { 1369 {
1301 ev_rt_now = ev_time (); 1370 ev_rt_now = ev_time ();
1302 1371
1303 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1372 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1304 { 1373 {
1305#if EV_PERIODIC_ENABLE 1374#if EV_PERIODIC_ENABLE
1306 periodics_reschedule (EV_A); 1375 periodics_reschedule (EV_A);
1307#endif 1376#endif
1308
1309 /* adjust timers. this is easy, as the offset is the same for all of them */ 1377 /* adjust timers. this is easy, as the offset is the same for all of them */
1310 for (i = 0; i < timercnt; ++i) 1378 for (i = 0; i < timercnt; ++i)
1311 ((WT)timers [i])->at += ev_rt_now - mn_now; 1379 ((WT)timers [i])->at += ev_rt_now - mn_now;
1312 } 1380 }
1313 1381
… …
1334{ 1402{
1335 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1403 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1336 ? EVUNLOOP_ONE 1404 ? EVUNLOOP_ONE
1337 : EVUNLOOP_CANCEL; 1405 : EVUNLOOP_CANCEL;
1338 1406
1339 while (activecnt) 1407 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1408
1409 do
1340 { 1410 {
1411#ifndef _WIN32
1412 if (expect_false (curpid)) /* penalise the forking check even more */
1413 if (expect_false (getpid () != curpid))
1414 {
1415 curpid = getpid ();
1416 postfork = 1;
1417 }
1418#endif
1419
1341#if EV_FORK_ENABLE 1420#if EV_FORK_ENABLE
1342 /* we might have forked, so queue fork handlers */ 1421 /* we might have forked, so queue fork handlers */
1343 if (expect_false (postfork)) 1422 if (expect_false (postfork))
1344 if (forkcnt) 1423 if (forkcnt)
1345 { 1424 {
1346 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1425 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1347 call_pending (EV_A); 1426 call_pending (EV_A);
1348 } 1427 }
1349#endif 1428#endif
1350 1429
1351 /* queue check watchers (and execute them) */ 1430 /* queue prepare watchers (and execute them) */
1352 if (expect_false (preparecnt)) 1431 if (expect_false (preparecnt))
1353 { 1432 {
1354 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1433 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1355 call_pending (EV_A); 1434 call_pending (EV_A);
1356 } 1435 }
1357 1436
1437 if (expect_false (!activecnt))
1438 break;
1439
1358 /* we might have forked, so reify kernel state if necessary */ 1440 /* we might have forked, so reify kernel state if necessary */
1359 if (expect_false (postfork)) 1441 if (expect_false (postfork))
1360 loop_fork (EV_A); 1442 loop_fork (EV_A);
1361 1443
1362 /* update fd-related kernel structures */ 1444 /* update fd-related kernel structures */
… …
1364 1446
1365 /* calculate blocking time */ 1447 /* calculate blocking time */
1366 { 1448 {
1367 ev_tstamp block; 1449 ev_tstamp block;
1368 1450
1369 if (flags & EVLOOP_NONBLOCK || idlecnt) 1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1370 block = 0.; /* do not block at all */ 1452 block = 0.; /* do not block at all */
1371 else 1453 else
1372 { 1454 {
1373 /* update time to cancel out callback processing overhead */ 1455 /* update time to cancel out callback processing overhead */
1374#if EV_USE_MONOTONIC
1375 if (expect_true (have_monotonic))
1376 time_update_monotonic (EV_A); 1456 time_update (EV_A_ 1e100);
1377 else
1378#endif
1379 {
1380 ev_rt_now = ev_time ();
1381 mn_now = ev_rt_now;
1382 }
1383 1457
1384 block = MAX_BLOCKTIME; 1458 block = MAX_BLOCKTIME;
1385 1459
1386 if (timercnt) 1460 if (timercnt)
1387 { 1461 {
… …
1398#endif 1472#endif
1399 1473
1400 if (expect_false (block < 0.)) block = 0.; 1474 if (expect_false (block < 0.)) block = 0.;
1401 } 1475 }
1402 1476
1477 ++loop_count;
1403 backend_poll (EV_A_ block); 1478 backend_poll (EV_A_ block);
1479
1480 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block);
1404 } 1482 }
1405
1406 /* update ev_rt_now, do magic */
1407 time_update (EV_A);
1408 1483
1409 /* queue pending timers and reschedule them */ 1484 /* queue pending timers and reschedule them */
1410 timers_reify (EV_A); /* relative timers called last */ 1485 timers_reify (EV_A); /* relative timers called last */
1411#if EV_PERIODIC_ENABLE 1486#if EV_PERIODIC_ENABLE
1412 periodics_reify (EV_A); /* absolute timers called first */ 1487 periodics_reify (EV_A); /* absolute timers called first */
1413#endif 1488#endif
1414 1489
1490#if EV_IDLE_ENABLE
1415 /* queue idle watchers unless other events are pending */ 1491 /* queue idle watchers unless other events are pending */
1416 if (idlecnt && !any_pending (EV_A)) 1492 idle_reify (EV_A);
1417 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1493#endif
1418 1494
1419 /* queue check watchers, to be executed first */ 1495 /* queue check watchers, to be executed first */
1420 if (expect_false (checkcnt)) 1496 if (expect_false (checkcnt))
1421 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1497 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1422 1498
1423 call_pending (EV_A); 1499 call_pending (EV_A);
1424 1500
1425 if (expect_false (loop_done))
1426 break;
1427 } 1501 }
1502 while (expect_true (activecnt && !loop_done));
1428 1503
1429 if (loop_done == EVUNLOOP_ONE) 1504 if (loop_done == EVUNLOOP_ONE)
1430 loop_done = EVUNLOOP_CANCEL; 1505 loop_done = EVUNLOOP_CANCEL;
1431} 1506}
1432 1507
… …
1459 head = &(*head)->next; 1534 head = &(*head)->next;
1460 } 1535 }
1461} 1536}
1462 1537
1463void inline_speed 1538void inline_speed
1464ev_clear_pending (EV_P_ W w) 1539clear_pending (EV_P_ W w)
1465{ 1540{
1466 if (w->pending) 1541 if (w->pending)
1467 { 1542 {
1468 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1543 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1469 w->pending = 0; 1544 w->pending = 0;
1470 } 1545 }
1471} 1546}
1472 1547
1548int
1549ev_clear_pending (EV_P_ void *w)
1550{
1551 W w_ = (W)w;
1552 int pending = w_->pending;
1553
1554 if (expect_true (pending))
1555 {
1556 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1557 w_->pending = 0;
1558 p->w = 0;
1559 return p->events;
1560 }
1561 else
1562 return 0;
1563}
1564
1565void inline_size
1566pri_adjust (EV_P_ W w)
1567{
1568 int pri = w->priority;
1569 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1570 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1571 w->priority = pri;
1572}
1573
1473void inline_speed 1574void inline_speed
1474ev_start (EV_P_ W w, int active) 1575ev_start (EV_P_ W w, int active)
1475{ 1576{
1476 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1577 pri_adjust (EV_A_ w);
1477 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1478
1479 w->active = active; 1578 w->active = active;
1480 ev_ref (EV_A); 1579 ev_ref (EV_A);
1481} 1580}
1482 1581
1483void inline_size 1582void inline_size
… …
1487 w->active = 0; 1586 w->active = 0;
1488} 1587}
1489 1588
1490/*****************************************************************************/ 1589/*****************************************************************************/
1491 1590
1492void 1591void noinline
1493ev_io_start (EV_P_ ev_io *w) 1592ev_io_start (EV_P_ ev_io *w)
1494{ 1593{
1495 int fd = w->fd; 1594 int fd = w->fd;
1496 1595
1497 if (expect_false (ev_is_active (w))) 1596 if (expect_false (ev_is_active (w)))
… …
1499 1598
1500 assert (("ev_io_start called with negative fd", fd >= 0)); 1599 assert (("ev_io_start called with negative fd", fd >= 0));
1501 1600
1502 ev_start (EV_A_ (W)w, 1); 1601 ev_start (EV_A_ (W)w, 1);
1503 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1504 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1603 wlist_add (&anfds[fd].head, (WL)w);
1505 1604
1506 fd_change (EV_A_ fd); 1605 fd_change (EV_A_ fd, w->events & EV_IOFDSET);
1606 w->events &= ~ EV_IOFDSET;
1507} 1607}
1508 1608
1509void 1609void noinline
1510ev_io_stop (EV_P_ ev_io *w) 1610ev_io_stop (EV_P_ ev_io *w)
1511{ 1611{
1512 ev_clear_pending (EV_A_ (W)w); 1612 clear_pending (EV_A_ (W)w);
1513 if (expect_false (!ev_is_active (w))) 1613 if (expect_false (!ev_is_active (w)))
1514 return; 1614 return;
1515 1615
1516 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1616 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1517 1617
1518 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1618 wlist_del (&anfds[w->fd].head, (WL)w);
1519 ev_stop (EV_A_ (W)w); 1619 ev_stop (EV_A_ (W)w);
1520 1620
1521 fd_change (EV_A_ w->fd); 1621 fd_change (EV_A_ w->fd, 0);
1522} 1622}
1523 1623
1524void 1624void noinline
1525ev_timer_start (EV_P_ ev_timer *w) 1625ev_timer_start (EV_P_ ev_timer *w)
1526{ 1626{
1527 if (expect_false (ev_is_active (w))) 1627 if (expect_false (ev_is_active (w)))
1528 return; 1628 return;
1529 1629
1530 ((WT)w)->at += mn_now; 1630 ((WT)w)->at += mn_now;
1531 1631
1532 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1632 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1533 1633
1534 ev_start (EV_A_ (W)w, ++timercnt); 1634 ev_start (EV_A_ (W)w, ++timercnt);
1535 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1635 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1536 timers [timercnt - 1] = w; 1636 timers [timercnt - 1] = (WT)w;
1537 upheap ((WT *)timers, timercnt - 1); 1637 upheap (timers, timercnt - 1);
1538 1638
1539 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1639 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1540} 1640}
1541 1641
1542void 1642void noinline
1543ev_timer_stop (EV_P_ ev_timer *w) 1643ev_timer_stop (EV_P_ ev_timer *w)
1544{ 1644{
1545 ev_clear_pending (EV_A_ (W)w); 1645 clear_pending (EV_A_ (W)w);
1546 if (expect_false (!ev_is_active (w))) 1646 if (expect_false (!ev_is_active (w)))
1547 return; 1647 return;
1548 1648
1549 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1649 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1550 1650
1551 { 1651 {
1552 int active = ((W)w)->active; 1652 int active = ((W)w)->active;
1553 1653
1554 if (expect_true (--active < --timercnt)) 1654 if (expect_true (--active < --timercnt))
1555 { 1655 {
1556 timers [active] = timers [timercnt]; 1656 timers [active] = timers [timercnt];
1557 adjustheap ((WT *)timers, timercnt, active); 1657 adjustheap (timers, timercnt, active);
1558 } 1658 }
1559 } 1659 }
1560 1660
1561 ((WT)w)->at -= mn_now; 1661 ((WT)w)->at -= mn_now;
1562 1662
1563 ev_stop (EV_A_ (W)w); 1663 ev_stop (EV_A_ (W)w);
1564} 1664}
1565 1665
1566void 1666void noinline
1567ev_timer_again (EV_P_ ev_timer *w) 1667ev_timer_again (EV_P_ ev_timer *w)
1568{ 1668{
1569 if (ev_is_active (w)) 1669 if (ev_is_active (w))
1570 { 1670 {
1571 if (w->repeat) 1671 if (w->repeat)
1572 { 1672 {
1573 ((WT)w)->at = mn_now + w->repeat; 1673 ((WT)w)->at = mn_now + w->repeat;
1574 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1674 adjustheap (timers, timercnt, ((W)w)->active - 1);
1575 } 1675 }
1576 else 1676 else
1577 ev_timer_stop (EV_A_ w); 1677 ev_timer_stop (EV_A_ w);
1578 } 1678 }
1579 else if (w->repeat) 1679 else if (w->repeat)
… …
1582 ev_timer_start (EV_A_ w); 1682 ev_timer_start (EV_A_ w);
1583 } 1683 }
1584} 1684}
1585 1685
1586#if EV_PERIODIC_ENABLE 1686#if EV_PERIODIC_ENABLE
1587void 1687void noinline
1588ev_periodic_start (EV_P_ ev_periodic *w) 1688ev_periodic_start (EV_P_ ev_periodic *w)
1589{ 1689{
1590 if (expect_false (ev_is_active (w))) 1690 if (expect_false (ev_is_active (w)))
1591 return; 1691 return;
1592 1692
… …
1594 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1694 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1595 else if (w->interval) 1695 else if (w->interval)
1596 { 1696 {
1597 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1697 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1598 /* this formula differs from the one in periodic_reify because we do not always round up */ 1698 /* this formula differs from the one in periodic_reify because we do not always round up */
1599 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1699 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1600 } 1700 }
1701 else
1702 ((WT)w)->at = w->offset;
1601 1703
1602 ev_start (EV_A_ (W)w, ++periodiccnt); 1704 ev_start (EV_A_ (W)w, ++periodiccnt);
1603 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1705 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1604 periodics [periodiccnt - 1] = w; 1706 periodics [periodiccnt - 1] = (WT)w;
1605 upheap ((WT *)periodics, periodiccnt - 1); 1707 upheap (periodics, periodiccnt - 1);
1606 1708
1607 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1709 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1608} 1710}
1609 1711
1610void 1712void noinline
1611ev_periodic_stop (EV_P_ ev_periodic *w) 1713ev_periodic_stop (EV_P_ ev_periodic *w)
1612{ 1714{
1613 ev_clear_pending (EV_A_ (W)w); 1715 clear_pending (EV_A_ (W)w);
1614 if (expect_false (!ev_is_active (w))) 1716 if (expect_false (!ev_is_active (w)))
1615 return; 1717 return;
1616 1718
1617 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1719 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1618 1720
1619 { 1721 {
1620 int active = ((W)w)->active; 1722 int active = ((W)w)->active;
1621 1723
1622 if (expect_true (--active < --periodiccnt)) 1724 if (expect_true (--active < --periodiccnt))
1623 { 1725 {
1624 periodics [active] = periodics [periodiccnt]; 1726 periodics [active] = periodics [periodiccnt];
1625 adjustheap ((WT *)periodics, periodiccnt, active); 1727 adjustheap (periodics, periodiccnt, active);
1626 } 1728 }
1627 } 1729 }
1628 1730
1629 ev_stop (EV_A_ (W)w); 1731 ev_stop (EV_A_ (W)w);
1630} 1732}
1631 1733
1632void 1734void noinline
1633ev_periodic_again (EV_P_ ev_periodic *w) 1735ev_periodic_again (EV_P_ ev_periodic *w)
1634{ 1736{
1635 /* TODO: use adjustheap and recalculation */ 1737 /* TODO: use adjustheap and recalculation */
1636 ev_periodic_stop (EV_A_ w); 1738 ev_periodic_stop (EV_A_ w);
1637 ev_periodic_start (EV_A_ w); 1739 ev_periodic_start (EV_A_ w);
… …
1640 1742
1641#ifndef SA_RESTART 1743#ifndef SA_RESTART
1642# define SA_RESTART 0 1744# define SA_RESTART 0
1643#endif 1745#endif
1644 1746
1645void 1747void noinline
1646ev_signal_start (EV_P_ ev_signal *w) 1748ev_signal_start (EV_P_ ev_signal *w)
1647{ 1749{
1648#if EV_MULTIPLICITY 1750#if EV_MULTIPLICITY
1649 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1751 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1650#endif 1752#endif
1651 if (expect_false (ev_is_active (w))) 1753 if (expect_false (ev_is_active (w)))
1652 return; 1754 return;
1653 1755
1654 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1756 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1655 1757
1758 {
1759#ifndef _WIN32
1760 sigset_t full, prev;
1761 sigfillset (&full);
1762 sigprocmask (SIG_SETMASK, &full, &prev);
1763#endif
1764
1765 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1766
1767#ifndef _WIN32
1768 sigprocmask (SIG_SETMASK, &prev, 0);
1769#endif
1770 }
1771
1656 ev_start (EV_A_ (W)w, 1); 1772 ev_start (EV_A_ (W)w, 1);
1657 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1658 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1773 wlist_add (&signals [w->signum - 1].head, (WL)w);
1659 1774
1660 if (!((WL)w)->next) 1775 if (!((WL)w)->next)
1661 { 1776 {
1662#if _WIN32 1777#if _WIN32
1663 signal (w->signum, sighandler); 1778 signal (w->signum, sighandler);
… …
1669 sigaction (w->signum, &sa, 0); 1784 sigaction (w->signum, &sa, 0);
1670#endif 1785#endif
1671 } 1786 }
1672} 1787}
1673 1788
1674void 1789void noinline
1675ev_signal_stop (EV_P_ ev_signal *w) 1790ev_signal_stop (EV_P_ ev_signal *w)
1676{ 1791{
1677 ev_clear_pending (EV_A_ (W)w); 1792 clear_pending (EV_A_ (W)w);
1678 if (expect_false (!ev_is_active (w))) 1793 if (expect_false (!ev_is_active (w)))
1679 return; 1794 return;
1680 1795
1681 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1796 wlist_del (&signals [w->signum - 1].head, (WL)w);
1682 ev_stop (EV_A_ (W)w); 1797 ev_stop (EV_A_ (W)w);
1683 1798
1684 if (!signals [w->signum - 1].head) 1799 if (!signals [w->signum - 1].head)
1685 signal (w->signum, SIG_DFL); 1800 signal (w->signum, SIG_DFL);
1686} 1801}
… …
1693#endif 1808#endif
1694 if (expect_false (ev_is_active (w))) 1809 if (expect_false (ev_is_active (w)))
1695 return; 1810 return;
1696 1811
1697 ev_start (EV_A_ (W)w, 1); 1812 ev_start (EV_A_ (W)w, 1);
1698 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1813 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1699} 1814}
1700 1815
1701void 1816void
1702ev_child_stop (EV_P_ ev_child *w) 1817ev_child_stop (EV_P_ ev_child *w)
1703{ 1818{
1704 ev_clear_pending (EV_A_ (W)w); 1819 clear_pending (EV_A_ (W)w);
1705 if (expect_false (!ev_is_active (w))) 1820 if (expect_false (!ev_is_active (w)))
1706 return; 1821 return;
1707 1822
1708 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1823 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1709 ev_stop (EV_A_ (W)w); 1824 ev_stop (EV_A_ (W)w);
1710} 1825}
1711 1826
1712#if EV_STAT_ENABLE 1827#if EV_STAT_ENABLE
1713 1828
… …
1945} 2060}
1946 2061
1947void 2062void
1948ev_stat_stop (EV_P_ ev_stat *w) 2063ev_stat_stop (EV_P_ ev_stat *w)
1949{ 2064{
1950 ev_clear_pending (EV_A_ (W)w); 2065 clear_pending (EV_A_ (W)w);
1951 if (expect_false (!ev_is_active (w))) 2066 if (expect_false (!ev_is_active (w)))
1952 return; 2067 return;
1953 2068
1954#if EV_USE_INOTIFY 2069#if EV_USE_INOTIFY
1955 infy_del (EV_A_ w); 2070 infy_del (EV_A_ w);
… …
1958 2073
1959 ev_stop (EV_A_ (W)w); 2074 ev_stop (EV_A_ (W)w);
1960} 2075}
1961#endif 2076#endif
1962 2077
2078#if EV_IDLE_ENABLE
1963void 2079void
1964ev_idle_start (EV_P_ ev_idle *w) 2080ev_idle_start (EV_P_ ev_idle *w)
1965{ 2081{
1966 if (expect_false (ev_is_active (w))) 2082 if (expect_false (ev_is_active (w)))
1967 return; 2083 return;
1968 2084
2085 pri_adjust (EV_A_ (W)w);
2086
2087 {
2088 int active = ++idlecnt [ABSPRI (w)];
2089
2090 ++idleall;
1969 ev_start (EV_A_ (W)w, ++idlecnt); 2091 ev_start (EV_A_ (W)w, active);
2092
1970 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2093 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1971 idles [idlecnt - 1] = w; 2094 idles [ABSPRI (w)][active - 1] = w;
2095 }
1972} 2096}
1973 2097
1974void 2098void
1975ev_idle_stop (EV_P_ ev_idle *w) 2099ev_idle_stop (EV_P_ ev_idle *w)
1976{ 2100{
1977 ev_clear_pending (EV_A_ (W)w); 2101 clear_pending (EV_A_ (W)w);
1978 if (expect_false (!ev_is_active (w))) 2102 if (expect_false (!ev_is_active (w)))
1979 return; 2103 return;
1980 2104
1981 { 2105 {
1982 int active = ((W)w)->active; 2106 int active = ((W)w)->active;
1983 idles [active - 1] = idles [--idlecnt]; 2107
2108 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1984 ((W)idles [active - 1])->active = active; 2109 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2110
2111 ev_stop (EV_A_ (W)w);
2112 --idleall;
1985 } 2113 }
1986
1987 ev_stop (EV_A_ (W)w);
1988} 2114}
2115#endif
1989 2116
1990void 2117void
1991ev_prepare_start (EV_P_ ev_prepare *w) 2118ev_prepare_start (EV_P_ ev_prepare *w)
1992{ 2119{
1993 if (expect_false (ev_is_active (w))) 2120 if (expect_false (ev_is_active (w)))
… …
1999} 2126}
2000 2127
2001void 2128void
2002ev_prepare_stop (EV_P_ ev_prepare *w) 2129ev_prepare_stop (EV_P_ ev_prepare *w)
2003{ 2130{
2004 ev_clear_pending (EV_A_ (W)w); 2131 clear_pending (EV_A_ (W)w);
2005 if (expect_false (!ev_is_active (w))) 2132 if (expect_false (!ev_is_active (w)))
2006 return; 2133 return;
2007 2134
2008 { 2135 {
2009 int active = ((W)w)->active; 2136 int active = ((W)w)->active;
… …
2026} 2153}
2027 2154
2028void 2155void
2029ev_check_stop (EV_P_ ev_check *w) 2156ev_check_stop (EV_P_ ev_check *w)
2030{ 2157{
2031 ev_clear_pending (EV_A_ (W)w); 2158 clear_pending (EV_A_ (W)w);
2032 if (expect_false (!ev_is_active (w))) 2159 if (expect_false (!ev_is_active (w)))
2033 return; 2160 return;
2034 2161
2035 { 2162 {
2036 int active = ((W)w)->active; 2163 int active = ((W)w)->active;
… …
2078} 2205}
2079 2206
2080void 2207void
2081ev_embed_stop (EV_P_ ev_embed *w) 2208ev_embed_stop (EV_P_ ev_embed *w)
2082{ 2209{
2083 ev_clear_pending (EV_A_ (W)w); 2210 clear_pending (EV_A_ (W)w);
2084 if (expect_false (!ev_is_active (w))) 2211 if (expect_false (!ev_is_active (w)))
2085 return; 2212 return;
2086 2213
2087 ev_io_stop (EV_A_ &w->io); 2214 ev_io_stop (EV_A_ &w->io);
2088 2215
… …
2103} 2230}
2104 2231
2105void 2232void
2106ev_fork_stop (EV_P_ ev_fork *w) 2233ev_fork_stop (EV_P_ ev_fork *w)
2107{ 2234{
2108 ev_clear_pending (EV_A_ (W)w); 2235 clear_pending (EV_A_ (W)w);
2109 if (expect_false (!ev_is_active (w))) 2236 if (expect_false (!ev_is_active (w)))
2110 return; 2237 return;
2111 2238
2112 { 2239 {
2113 int active = ((W)w)->active; 2240 int active = ((W)w)->active;

Diff Legend

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