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

Comparing libev/ev.c (file contents):
Revision 1.163 by root, Wed Dec 5 13:54:36 2007 UTC vs.
Revision 1.181 by root, Wed Dec 12 00:17:08 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;
… …
417 } 428 }
418 429
419 return ncur; 430 return ncur;
420} 431}
421 432
422inline_speed void * 433static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 434array_realloc (int elem, void *base, int *cur, int cnt)
424{ 435{
425 *cur = array_nextsize (elem, *cur, cnt); 436 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 437 return ev_realloc (base, elem * *cur);
427} 438}
… …
452 463
453void noinline 464void noinline
454ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
455{ 466{
456 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
457 469
458 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
459 { 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_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 478 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 479}
469 480
470void inline_size 481void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 483{
473 int i; 484 int i;
474 485
475 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
… …
507} 518}
508 519
509void 520void
510ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 522{
523 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
513} 525}
514 526
515void inline_size 527void inline_size
516fd_reify (EV_P) 528fd_reify (EV_P)
517{ 529{
… …
626void inline_speed 638void inline_speed
627upheap (WT *heap, int k) 639upheap (WT *heap, int k)
628{ 640{
629 WT w = heap [k]; 641 WT w = heap [k];
630 642
631 while (k && heap [k >> 1]->at > w->at) 643 while (k)
632 { 644 {
645 int p = (k - 1) >> 1;
646
647 if (heap [p]->at <= w->at)
648 break;
649
633 heap [k] = heap [k >> 1]; 650 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 651 ((W)heap [k])->active = k + 1;
635 k >>= 1; 652 k = p;
636 } 653 }
637 654
638 heap [k] = w; 655 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 656 ((W)heap [k])->active = k + 1;
640
641} 657}
642 658
643void inline_speed 659void inline_speed
644downheap (WT *heap, int N, int k) 660downheap (WT *heap, int N, int k)
645{ 661{
646 WT w = heap [k]; 662 WT w = heap [k];
647 663
648 while (k < (N >> 1)) 664 for (;;)
649 { 665 {
650 int j = k << 1; 666 int c = (k << 1) + 1;
651 667
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 668 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 669 break;
657 670
671 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
672 ? 1 : 0;
673
674 if (w->at <= heap [c]->at)
675 break;
676
658 heap [k] = heap [j]; 677 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 678 ((W)heap [k])->active = k + 1;
679
660 k = j; 680 k = c;
661 } 681 }
662 682
663 heap [k] = w; 683 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 684 ((W)heap [k])->active = k + 1;
665} 685}
… …
747 for (signum = signalmax; signum--; ) 767 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 768 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 769 ev_feed_signal_event (EV_A_ signum + 1);
750} 770}
751 771
752void inline_size 772void inline_speed
753fd_intern (int fd) 773fd_intern (int fd)
754{ 774{
755#ifdef _WIN32 775#ifdef _WIN32
756 int arg = 1; 776 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 777 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
786 ev_child *w; 806 ev_child *w;
787 807
788 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 808 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
789 if (w->pid == pid || !w->pid) 809 if (w->pid == pid || !w->pid)
790 { 810 {
791 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 811 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
792 w->rpid = pid; 812 w->rpid = pid;
793 w->rstatus = status; 813 w->rstatus = status;
794 ev_feed_event (EV_A_ (W)w, EV_CHILD); 814 ev_feed_event (EV_A_ (W)w, EV_CHILD);
795 } 815 }
796} 816}
797 817
798#ifndef WCONTINUED 818#ifndef WCONTINUED
… …
1003#if EV_USE_SELECT 1023#if EV_USE_SELECT
1004 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1024 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
1005#endif 1025#endif
1006 1026
1007 for (i = NUMPRI; i--; ) 1027 for (i = NUMPRI; i--; )
1028 {
1008 array_free (pending, [i]); 1029 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE
1031 array_free (idle, [i]);
1032#endif
1033 }
1009 1034
1010 /* have to use the microsoft-never-gets-it-right macro */ 1035 /* have to use the microsoft-never-gets-it-right macro */
1011 array_free (fdchange, EMPTY0); 1036 array_free (fdchange, EMPTY);
1012 array_free (timer, EMPTY0); 1037 array_free (timer, EMPTY);
1013#if EV_PERIODIC_ENABLE 1038#if EV_PERIODIC_ENABLE
1014 array_free (periodic, EMPTY0); 1039 array_free (periodic, EMPTY);
1015#endif 1040#endif
1016 array_free (idle, EMPTY0);
1017 array_free (prepare, EMPTY0); 1041 array_free (prepare, EMPTY);
1018 array_free (check, EMPTY0); 1042 array_free (check, EMPTY);
1019 1043
1020 backend = 0; 1044 backend = 0;
1021} 1045}
1022 1046
1023void inline_size infy_fork (EV_P); 1047void inline_size infy_fork (EV_P);
… …
1159 postfork = 1; 1183 postfork = 1;
1160} 1184}
1161 1185
1162/*****************************************************************************/ 1186/*****************************************************************************/
1163 1187
1164int inline_size 1188void
1165any_pending (EV_P) 1189ev_invoke (EV_P_ void *w, int revents)
1166{ 1190{
1167 int pri; 1191 EV_CB_INVOKE ((W)w, revents);
1168
1169 for (pri = NUMPRI; pri--; )
1170 if (pendingcnt [pri])
1171 return 1;
1172
1173 return 0;
1174} 1192}
1175 1193
1176void inline_speed 1194void inline_speed
1177call_pending (EV_P) 1195call_pending (EV_P)
1178{ 1196{
… …
1196void inline_size 1214void inline_size
1197timers_reify (EV_P) 1215timers_reify (EV_P)
1198{ 1216{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1217 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1218 {
1201 ev_timer *w = timers [0]; 1219 ev_timer *w = (ev_timer *)timers [0];
1202 1220
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1221 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1222
1205 /* first reschedule or stop timer */ 1223 /* first reschedule or stop timer */
1206 if (w->repeat) 1224 if (w->repeat)
… …
1209 1227
1210 ((WT)w)->at += w->repeat; 1228 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1229 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1230 ((WT)w)->at = mn_now;
1213 1231
1214 downheap ((WT *)timers, timercnt, 0); 1232 downheap (timers, timercnt, 0);
1215 } 1233 }
1216 else 1234 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1235 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1236
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1237 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1242void inline_size
1225periodics_reify (EV_P) 1243periodics_reify (EV_P)
1226{ 1244{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1245 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1246 {
1229 ev_periodic *w = periodics [0]; 1247 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1248
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1249 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1250
1233 /* first reschedule or stop timer */ 1251 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1252 if (w->reschedule_cb)
1235 { 1253 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1254 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1255 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1256 downheap (periodics, periodiccnt, 0);
1239 } 1257 }
1240 else if (w->interval) 1258 else if (w->interval)
1241 { 1259 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1260 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1261 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1262 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1245 } 1264 }
1246 else 1265 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1266 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1267
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1268 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1275 int i;
1257 1276
1258 /* adjust periodics after time jump */ 1277 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1278 for (i = 0; i < periodiccnt; ++i)
1260 { 1279 {
1261 ev_periodic *w = periodics [i]; 1280 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1281
1263 if (w->reschedule_cb) 1282 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1283 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1284 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1285 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1286 }
1268 1287
1269 /* now rebuild the heap */ 1288 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1289 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1290 downheap (periodics, periodiccnt, i);
1272} 1291}
1273#endif 1292#endif
1274 1293
1294#if EV_IDLE_ENABLE
1275int inline_size 1295void inline_size
1276time_update_monotonic (EV_P) 1296idle_reify (EV_P)
1277{ 1297{
1298 if (expect_false (idleall))
1299 {
1300 int pri;
1301
1302 for (pri = NUMPRI; pri--; )
1303 {
1304 if (pendingcnt [pri])
1305 break;
1306
1307 if (idlecnt [pri])
1308 {
1309 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1310 break;
1311 }
1312 }
1313 }
1314}
1315#endif
1316
1317void inline_speed
1318time_update (EV_P_ ev_tstamp max_block)
1319{
1320 int i;
1321
1322#if EV_USE_MONOTONIC
1323 if (expect_true (have_monotonic))
1324 {
1325 ev_tstamp odiff = rtmn_diff;
1326
1278 mn_now = get_clock (); 1327 mn_now = get_clock ();
1279 1328
1329 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1330 /* interpolate in the meantime */
1280 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1331 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1281 { 1332 {
1282 ev_rt_now = rtmn_diff + mn_now; 1333 ev_rt_now = rtmn_diff + mn_now;
1283 return 0; 1334 return;
1284 } 1335 }
1285 else 1336
1286 {
1287 now_floor = mn_now; 1337 now_floor = mn_now;
1288 ev_rt_now = ev_time (); 1338 ev_rt_now = ev_time ();
1289 return 1;
1290 }
1291}
1292 1339
1293void inline_size 1340 /* loop a few times, before making important decisions.
1294time_update (EV_P) 1341 * on the choice of "4": one iteration isn't enough,
1295{ 1342 * in case we get preempted during the calls to
1296 int i; 1343 * ev_time and get_clock. a second call is almost guaranteed
1297 1344 * to succeed in that case, though. and looping a few more times
1298#if EV_USE_MONOTONIC 1345 * doesn't hurt either as we only do this on time-jumps or
1299 if (expect_true (have_monotonic)) 1346 * in the unlikely event of having been preempted here.
1300 { 1347 */
1301 if (time_update_monotonic (EV_A)) 1348 for (i = 4; --i; )
1302 { 1349 {
1303 ev_tstamp odiff = rtmn_diff;
1304
1305 /* loop a few times, before making important decisions.
1306 * on the choice of "4": one iteration isn't enough,
1307 * in case we get preempted during the calls to
1308 * ev_time and get_clock. a second call is almost guaranteed
1309 * to succeed in that case, though. and looping a few more times
1310 * doesn't hurt either as we only do this on time-jumps or
1311 * in the unlikely event of having been preempted here.
1312 */
1313 for (i = 4; --i; )
1314 {
1315 rtmn_diff = ev_rt_now - mn_now; 1350 rtmn_diff = ev_rt_now - mn_now;
1316 1351
1317 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1352 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1318 return; /* all is well */ 1353 return; /* all is well */
1319 1354
1320 ev_rt_now = ev_time (); 1355 ev_rt_now = ev_time ();
1321 mn_now = get_clock (); 1356 mn_now = get_clock ();
1322 now_floor = mn_now; 1357 now_floor = mn_now;
1323 } 1358 }
1324 1359
1325# if EV_PERIODIC_ENABLE 1360# if EV_PERIODIC_ENABLE
1326 periodics_reschedule (EV_A); 1361 periodics_reschedule (EV_A);
1327# endif 1362# endif
1328 /* no timer adjustment, as the monotonic clock doesn't jump */ 1363 /* no timer adjustment, as the monotonic clock doesn't jump */
1329 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1364 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1330 }
1331 } 1365 }
1332 else 1366 else
1333#endif 1367#endif
1334 { 1368 {
1335 ev_rt_now = ev_time (); 1369 ev_rt_now = ev_time ();
1336 1370
1337 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1371 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1338 { 1372 {
1339#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1340 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1341#endif 1375#endif
1342
1343 /* adjust timers. this is easy, as the offset is the same for all of them */ 1376 /* adjust timers. this is easy, as the offset is the same for all of them */
1344 for (i = 0; i < timercnt; ++i) 1377 for (i = 0; i < timercnt; ++i)
1345 ((WT)timers [i])->at += ev_rt_now - mn_now; 1378 ((WT)timers [i])->at += ev_rt_now - mn_now;
1346 } 1379 }
1347 1380
… …
1391 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1424 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1392 call_pending (EV_A); 1425 call_pending (EV_A);
1393 } 1426 }
1394#endif 1427#endif
1395 1428
1396 /* queue check watchers (and execute them) */ 1429 /* queue prepare watchers (and execute them) */
1397 if (expect_false (preparecnt)) 1430 if (expect_false (preparecnt))
1398 { 1431 {
1399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1432 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1400 call_pending (EV_A); 1433 call_pending (EV_A);
1401 } 1434 }
… …
1412 1445
1413 /* calculate blocking time */ 1446 /* calculate blocking time */
1414 { 1447 {
1415 ev_tstamp block; 1448 ev_tstamp block;
1416 1449
1417 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1418 block = 0.; /* do not block at all */ 1451 block = 0.; /* do not block at all */
1419 else 1452 else
1420 { 1453 {
1421 /* update time to cancel out callback processing overhead */ 1454 /* update time to cancel out callback processing overhead */
1422#if EV_USE_MONOTONIC
1423 if (expect_true (have_monotonic))
1424 time_update_monotonic (EV_A); 1455 time_update (EV_A_ 1e100);
1425 else
1426#endif
1427 {
1428 ev_rt_now = ev_time ();
1429 mn_now = ev_rt_now;
1430 }
1431 1456
1432 block = MAX_BLOCKTIME; 1457 block = MAX_BLOCKTIME;
1433 1458
1434 if (timercnt) 1459 if (timercnt)
1435 { 1460 {
… …
1448 if (expect_false (block < 0.)) block = 0.; 1473 if (expect_false (block < 0.)) block = 0.;
1449 } 1474 }
1450 1475
1451 ++loop_count; 1476 ++loop_count;
1452 backend_poll (EV_A_ block); 1477 backend_poll (EV_A_ block);
1478
1479 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block);
1453 } 1481 }
1454
1455 /* update ev_rt_now, do magic */
1456 time_update (EV_A);
1457 1482
1458 /* queue pending timers and reschedule them */ 1483 /* queue pending timers and reschedule them */
1459 timers_reify (EV_A); /* relative timers called last */ 1484 timers_reify (EV_A); /* relative timers called last */
1460#if EV_PERIODIC_ENABLE 1485#if EV_PERIODIC_ENABLE
1461 periodics_reify (EV_A); /* absolute timers called first */ 1486 periodics_reify (EV_A); /* absolute timers called first */
1462#endif 1487#endif
1463 1488
1489#if EV_IDLE_ENABLE
1464 /* queue idle watchers unless other events are pending */ 1490 /* queue idle watchers unless other events are pending */
1465 if (idlecnt && !any_pending (EV_A)) 1491 idle_reify (EV_A);
1466 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1492#endif
1467 1493
1468 /* queue check watchers, to be executed first */ 1494 /* queue check watchers, to be executed first */
1469 if (expect_false (checkcnt)) 1495 if (expect_false (checkcnt))
1470 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1496 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1471 1497
… …
1507 head = &(*head)->next; 1533 head = &(*head)->next;
1508 } 1534 }
1509} 1535}
1510 1536
1511void inline_speed 1537void inline_speed
1512ev_clear_pending (EV_P_ W w) 1538clear_pending (EV_P_ W w)
1513{ 1539{
1514 if (w->pending) 1540 if (w->pending)
1515 { 1541 {
1516 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1542 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1517 w->pending = 0; 1543 w->pending = 0;
1518 } 1544 }
1519} 1545}
1520 1546
1547int
1548ev_clear_pending (EV_P_ void *w)
1549{
1550 W w_ = (W)w;
1551 int pending = w_->pending;
1552
1553 if (expect_true (pending))
1554 {
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 w_->pending = 0;
1557 p->w = 0;
1558 return p->events;
1559 }
1560 else
1561 return 0;
1562}
1563
1564void inline_size
1565pri_adjust (EV_P_ W w)
1566{
1567 int pri = w->priority;
1568 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1569 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1570 w->priority = pri;
1571}
1572
1521void inline_speed 1573void inline_speed
1522ev_start (EV_P_ W w, int active) 1574ev_start (EV_P_ W w, int active)
1523{ 1575{
1524 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1576 pri_adjust (EV_A_ w);
1525 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1526
1527 w->active = active; 1577 w->active = active;
1528 ev_ref (EV_A); 1578 ev_ref (EV_A);
1529} 1579}
1530 1580
1531void inline_size 1581void inline_size
… …
1535 w->active = 0; 1585 w->active = 0;
1536} 1586}
1537 1587
1538/*****************************************************************************/ 1588/*****************************************************************************/
1539 1589
1540void 1590void noinline
1541ev_io_start (EV_P_ ev_io *w) 1591ev_io_start (EV_P_ ev_io *w)
1542{ 1592{
1543 int fd = w->fd; 1593 int fd = w->fd;
1544 1594
1545 if (expect_false (ev_is_active (w))) 1595 if (expect_false (ev_is_active (w)))
… …
1552 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1602 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1553 1603
1554 fd_change (EV_A_ fd); 1604 fd_change (EV_A_ fd);
1555} 1605}
1556 1606
1557void 1607void noinline
1558ev_io_stop (EV_P_ ev_io *w) 1608ev_io_stop (EV_P_ ev_io *w)
1559{ 1609{
1560 ev_clear_pending (EV_A_ (W)w); 1610 clear_pending (EV_A_ (W)w);
1561 if (expect_false (!ev_is_active (w))) 1611 if (expect_false (!ev_is_active (w)))
1562 return; 1612 return;
1563 1613
1564 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1565 1615
… …
1567 ev_stop (EV_A_ (W)w); 1617 ev_stop (EV_A_ (W)w);
1568 1618
1569 fd_change (EV_A_ w->fd); 1619 fd_change (EV_A_ w->fd);
1570} 1620}
1571 1621
1572void 1622void noinline
1573ev_timer_start (EV_P_ ev_timer *w) 1623ev_timer_start (EV_P_ ev_timer *w)
1574{ 1624{
1575 if (expect_false (ev_is_active (w))) 1625 if (expect_false (ev_is_active (w)))
1576 return; 1626 return;
1577 1627
1578 ((WT)w)->at += mn_now; 1628 ((WT)w)->at += mn_now;
1579 1629
1580 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1630 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1581 1631
1582 ev_start (EV_A_ (W)w, ++timercnt); 1632 ev_start (EV_A_ (W)w, ++timercnt);
1583 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1633 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1584 timers [timercnt - 1] = w; 1634 timers [timercnt - 1] = (WT)w;
1585 upheap ((WT *)timers, timercnt - 1); 1635 upheap (timers, timercnt - 1);
1586 1636
1587 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1637 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1588} 1638}
1589 1639
1590void 1640void noinline
1591ev_timer_stop (EV_P_ ev_timer *w) 1641ev_timer_stop (EV_P_ ev_timer *w)
1592{ 1642{
1593 ev_clear_pending (EV_A_ (W)w); 1643 clear_pending (EV_A_ (W)w);
1594 if (expect_false (!ev_is_active (w))) 1644 if (expect_false (!ev_is_active (w)))
1595 return; 1645 return;
1596 1646
1597 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1647 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1598 1648
1599 { 1649 {
1600 int active = ((W)w)->active; 1650 int active = ((W)w)->active;
1601 1651
1602 if (expect_true (--active < --timercnt)) 1652 if (expect_true (--active < --timercnt))
1603 { 1653 {
1604 timers [active] = timers [timercnt]; 1654 timers [active] = timers [timercnt];
1605 adjustheap ((WT *)timers, timercnt, active); 1655 adjustheap (timers, timercnt, active);
1606 } 1656 }
1607 } 1657 }
1608 1658
1609 ((WT)w)->at -= mn_now; 1659 ((WT)w)->at -= mn_now;
1610 1660
1611 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1612} 1662}
1613 1663
1614void 1664void noinline
1615ev_timer_again (EV_P_ ev_timer *w) 1665ev_timer_again (EV_P_ ev_timer *w)
1616{ 1666{
1617 if (ev_is_active (w)) 1667 if (ev_is_active (w))
1618 { 1668 {
1619 if (w->repeat) 1669 if (w->repeat)
1620 { 1670 {
1621 ((WT)w)->at = mn_now + w->repeat; 1671 ((WT)w)->at = mn_now + w->repeat;
1622 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1672 adjustheap (timers, timercnt, ((W)w)->active - 1);
1623 } 1673 }
1624 else 1674 else
1625 ev_timer_stop (EV_A_ w); 1675 ev_timer_stop (EV_A_ w);
1626 } 1676 }
1627 else if (w->repeat) 1677 else if (w->repeat)
… …
1630 ev_timer_start (EV_A_ w); 1680 ev_timer_start (EV_A_ w);
1631 } 1681 }
1632} 1682}
1633 1683
1634#if EV_PERIODIC_ENABLE 1684#if EV_PERIODIC_ENABLE
1635void 1685void noinline
1636ev_periodic_start (EV_P_ ev_periodic *w) 1686ev_periodic_start (EV_P_ ev_periodic *w)
1637{ 1687{
1638 if (expect_false (ev_is_active (w))) 1688 if (expect_false (ev_is_active (w)))
1639 return; 1689 return;
1640 1690
… …
1642 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1692 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1643 else if (w->interval) 1693 else if (w->interval)
1644 { 1694 {
1645 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1695 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1646 /* this formula differs from the one in periodic_reify because we do not always round up */ 1696 /* this formula differs from the one in periodic_reify because we do not always round up */
1647 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1697 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1648 } 1698 }
1699 else
1700 ((WT)w)->at = w->offset;
1649 1701
1650 ev_start (EV_A_ (W)w, ++periodiccnt); 1702 ev_start (EV_A_ (W)w, ++periodiccnt);
1651 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1703 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1652 periodics [periodiccnt - 1] = w; 1704 periodics [periodiccnt - 1] = (WT)w;
1653 upheap ((WT *)periodics, periodiccnt - 1); 1705 upheap (periodics, periodiccnt - 1);
1654 1706
1655 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1707 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1656} 1708}
1657 1709
1658void 1710void noinline
1659ev_periodic_stop (EV_P_ ev_periodic *w) 1711ev_periodic_stop (EV_P_ ev_periodic *w)
1660{ 1712{
1661 ev_clear_pending (EV_A_ (W)w); 1713 clear_pending (EV_A_ (W)w);
1662 if (expect_false (!ev_is_active (w))) 1714 if (expect_false (!ev_is_active (w)))
1663 return; 1715 return;
1664 1716
1665 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1717 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1666 1718
1667 { 1719 {
1668 int active = ((W)w)->active; 1720 int active = ((W)w)->active;
1669 1721
1670 if (expect_true (--active < --periodiccnt)) 1722 if (expect_true (--active < --periodiccnt))
1671 { 1723 {
1672 periodics [active] = periodics [periodiccnt]; 1724 periodics [active] = periodics [periodiccnt];
1673 adjustheap ((WT *)periodics, periodiccnt, active); 1725 adjustheap (periodics, periodiccnt, active);
1674 } 1726 }
1675 } 1727 }
1676 1728
1677 ev_stop (EV_A_ (W)w); 1729 ev_stop (EV_A_ (W)w);
1678} 1730}
1679 1731
1680void 1732void noinline
1681ev_periodic_again (EV_P_ ev_periodic *w) 1733ev_periodic_again (EV_P_ ev_periodic *w)
1682{ 1734{
1683 /* TODO: use adjustheap and recalculation */ 1735 /* TODO: use adjustheap and recalculation */
1684 ev_periodic_stop (EV_A_ w); 1736 ev_periodic_stop (EV_A_ w);
1685 ev_periodic_start (EV_A_ w); 1737 ev_periodic_start (EV_A_ w);
… …
1688 1740
1689#ifndef SA_RESTART 1741#ifndef SA_RESTART
1690# define SA_RESTART 0 1742# define SA_RESTART 0
1691#endif 1743#endif
1692 1744
1693void 1745void noinline
1694ev_signal_start (EV_P_ ev_signal *w) 1746ev_signal_start (EV_P_ ev_signal *w)
1695{ 1747{
1696#if EV_MULTIPLICITY 1748#if EV_MULTIPLICITY
1697 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1749 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1698#endif 1750#endif
1699 if (expect_false (ev_is_active (w))) 1751 if (expect_false (ev_is_active (w)))
1700 return; 1752 return;
1701 1753
1702 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1754 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1703 1755
1756 {
1757#ifndef _WIN32
1758 sigset_t full, prev;
1759 sigfillset (&full);
1760 sigprocmask (SIG_SETMASK, &full, &prev);
1761#endif
1762
1763 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1764
1765#ifndef _WIN32
1766 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif
1768 }
1769
1704 ev_start (EV_A_ (W)w, 1); 1770 ev_start (EV_A_ (W)w, 1);
1705 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1706 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1707 1772
1708 if (!((WL)w)->next) 1773 if (!((WL)w)->next)
1709 { 1774 {
1710#if _WIN32 1775#if _WIN32
… …
1717 sigaction (w->signum, &sa, 0); 1782 sigaction (w->signum, &sa, 0);
1718#endif 1783#endif
1719 } 1784 }
1720} 1785}
1721 1786
1722void 1787void noinline
1723ev_signal_stop (EV_P_ ev_signal *w) 1788ev_signal_stop (EV_P_ ev_signal *w)
1724{ 1789{
1725 ev_clear_pending (EV_A_ (W)w); 1790 clear_pending (EV_A_ (W)w);
1726 if (expect_false (!ev_is_active (w))) 1791 if (expect_false (!ev_is_active (w)))
1727 return; 1792 return;
1728 1793
1729 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1730 ev_stop (EV_A_ (W)w); 1795 ev_stop (EV_A_ (W)w);
… …
1747} 1812}
1748 1813
1749void 1814void
1750ev_child_stop (EV_P_ ev_child *w) 1815ev_child_stop (EV_P_ ev_child *w)
1751{ 1816{
1752 ev_clear_pending (EV_A_ (W)w); 1817 clear_pending (EV_A_ (W)w);
1753 if (expect_false (!ev_is_active (w))) 1818 if (expect_false (!ev_is_active (w)))
1754 return; 1819 return;
1755 1820
1756 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1757 ev_stop (EV_A_ (W)w); 1822 ev_stop (EV_A_ (W)w);
… …
1993} 2058}
1994 2059
1995void 2060void
1996ev_stat_stop (EV_P_ ev_stat *w) 2061ev_stat_stop (EV_P_ ev_stat *w)
1997{ 2062{
1998 ev_clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1999 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
2000 return; 2065 return;
2001 2066
2002#if EV_USE_INOTIFY 2067#if EV_USE_INOTIFY
2003 infy_del (EV_A_ w); 2068 infy_del (EV_A_ w);
… …
2006 2071
2007 ev_stop (EV_A_ (W)w); 2072 ev_stop (EV_A_ (W)w);
2008} 2073}
2009#endif 2074#endif
2010 2075
2076#if EV_IDLE_ENABLE
2011void 2077void
2012ev_idle_start (EV_P_ ev_idle *w) 2078ev_idle_start (EV_P_ ev_idle *w)
2013{ 2079{
2014 if (expect_false (ev_is_active (w))) 2080 if (expect_false (ev_is_active (w)))
2015 return; 2081 return;
2016 2082
2083 pri_adjust (EV_A_ (W)w);
2084
2085 {
2086 int active = ++idlecnt [ABSPRI (w)];
2087
2088 ++idleall;
2017 ev_start (EV_A_ (W)w, ++idlecnt); 2089 ev_start (EV_A_ (W)w, active);
2090
2018 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2091 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2019 idles [idlecnt - 1] = w; 2092 idles [ABSPRI (w)][active - 1] = w;
2093 }
2020} 2094}
2021 2095
2022void 2096void
2023ev_idle_stop (EV_P_ ev_idle *w) 2097ev_idle_stop (EV_P_ ev_idle *w)
2024{ 2098{
2025 ev_clear_pending (EV_A_ (W)w); 2099 clear_pending (EV_A_ (W)w);
2026 if (expect_false (!ev_is_active (w))) 2100 if (expect_false (!ev_is_active (w)))
2027 return; 2101 return;
2028 2102
2029 { 2103 {
2030 int active = ((W)w)->active; 2104 int active = ((W)w)->active;
2031 idles [active - 1] = idles [--idlecnt]; 2105
2106 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2032 ((W)idles [active - 1])->active = active; 2107 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2108
2109 ev_stop (EV_A_ (W)w);
2110 --idleall;
2033 } 2111 }
2034
2035 ev_stop (EV_A_ (W)w);
2036} 2112}
2113#endif
2037 2114
2038void 2115void
2039ev_prepare_start (EV_P_ ev_prepare *w) 2116ev_prepare_start (EV_P_ ev_prepare *w)
2040{ 2117{
2041 if (expect_false (ev_is_active (w))) 2118 if (expect_false (ev_is_active (w)))
… …
2047} 2124}
2048 2125
2049void 2126void
2050ev_prepare_stop (EV_P_ ev_prepare *w) 2127ev_prepare_stop (EV_P_ ev_prepare *w)
2051{ 2128{
2052 ev_clear_pending (EV_A_ (W)w); 2129 clear_pending (EV_A_ (W)w);
2053 if (expect_false (!ev_is_active (w))) 2130 if (expect_false (!ev_is_active (w)))
2054 return; 2131 return;
2055 2132
2056 { 2133 {
2057 int active = ((W)w)->active; 2134 int active = ((W)w)->active;
… …
2074} 2151}
2075 2152
2076void 2153void
2077ev_check_stop (EV_P_ ev_check *w) 2154ev_check_stop (EV_P_ ev_check *w)
2078{ 2155{
2079 ev_clear_pending (EV_A_ (W)w); 2156 clear_pending (EV_A_ (W)w);
2080 if (expect_false (!ev_is_active (w))) 2157 if (expect_false (!ev_is_active (w)))
2081 return; 2158 return;
2082 2159
2083 { 2160 {
2084 int active = ((W)w)->active; 2161 int active = ((W)w)->active;
… …
2126} 2203}
2127 2204
2128void 2205void
2129ev_embed_stop (EV_P_ ev_embed *w) 2206ev_embed_stop (EV_P_ ev_embed *w)
2130{ 2207{
2131 ev_clear_pending (EV_A_ (W)w); 2208 clear_pending (EV_A_ (W)w);
2132 if (expect_false (!ev_is_active (w))) 2209 if (expect_false (!ev_is_active (w)))
2133 return; 2210 return;
2134 2211
2135 ev_io_stop (EV_A_ &w->io); 2212 ev_io_stop (EV_A_ &w->io);
2136 2213
… …
2151} 2228}
2152 2229
2153void 2230void
2154ev_fork_stop (EV_P_ ev_fork *w) 2231ev_fork_stop (EV_P_ ev_fork *w)
2155{ 2232{
2156 ev_clear_pending (EV_A_ (W)w); 2233 clear_pending (EV_A_ (W)w);
2157 if (expect_false (!ev_is_active (w))) 2234 if (expect_false (!ev_is_active (w)))
2158 return; 2235 return;
2159 2236
2160 { 2237 {
2161 int active = ((W)w)->active; 2238 int active = ((W)w)->active;

Diff Legend

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