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.179 by root, Tue Dec 11 21:04:40 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 657
… …
643void inline_speed 660void inline_speed
644downheap (WT *heap, int N, int k) 661downheap (WT *heap, int N, int k)
645{ 662{
646 WT w = heap [k]; 663 WT w = heap [k];
647 664
648 while (k < (N >> 1)) 665 for (;;)
649 { 666 {
650 int j = k << 1; 667 int c = (k << 1) + 1;
651 668
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 669 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 670 break;
657 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
658 heap [k] = heap [j]; 678 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 679 ((W)heap [k])->active = k + 1;
680
660 k = j; 681 k = c;
661 } 682 }
662 683
663 heap [k] = w; 684 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
665} 686}
… …
747 for (signum = signalmax; signum--; ) 768 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 769 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 770 ev_feed_signal_event (EV_A_ signum + 1);
750} 771}
751 772
752void inline_size 773void inline_speed
753fd_intern (int fd) 774fd_intern (int fd)
754{ 775{
755#ifdef _WIN32 776#ifdef _WIN32
756 int arg = 1; 777 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 778 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
786 ev_child *w; 807 ev_child *w;
787 808
788 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)
789 if (w->pid == pid || !w->pid) 810 if (w->pid == pid || !w->pid)
790 { 811 {
791 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 812 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
792 w->rpid = pid; 813 w->rpid = pid;
793 w->rstatus = status; 814 w->rstatus = status;
794 ev_feed_event (EV_A_ (W)w, EV_CHILD); 815 ev_feed_event (EV_A_ (W)w, EV_CHILD);
795 } 816 }
796} 817}
797 818
798#ifndef WCONTINUED 819#ifndef WCONTINUED
… …
1003#if EV_USE_SELECT 1024#if EV_USE_SELECT
1004 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1025 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
1005#endif 1026#endif
1006 1027
1007 for (i = NUMPRI; i--; ) 1028 for (i = NUMPRI; i--; )
1029 {
1008 array_free (pending, [i]); 1030 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE
1032 array_free (idle, [i]);
1033#endif
1034 }
1009 1035
1010 /* have to use the microsoft-never-gets-it-right macro */ 1036 /* have to use the microsoft-never-gets-it-right macro */
1011 array_free (fdchange, EMPTY0); 1037 array_free (fdchange, EMPTY);
1012 array_free (timer, EMPTY0); 1038 array_free (timer, EMPTY);
1013#if EV_PERIODIC_ENABLE 1039#if EV_PERIODIC_ENABLE
1014 array_free (periodic, EMPTY0); 1040 array_free (periodic, EMPTY);
1015#endif 1041#endif
1016 array_free (idle, EMPTY0);
1017 array_free (prepare, EMPTY0); 1042 array_free (prepare, EMPTY);
1018 array_free (check, EMPTY0); 1043 array_free (check, EMPTY);
1019 1044
1020 backend = 0; 1045 backend = 0;
1021} 1046}
1022 1047
1023void inline_size infy_fork (EV_P); 1048void inline_size infy_fork (EV_P);
… …
1159 postfork = 1; 1184 postfork = 1;
1160} 1185}
1161 1186
1162/*****************************************************************************/ 1187/*****************************************************************************/
1163 1188
1164int inline_size 1189void
1165any_pending (EV_P) 1190ev_invoke (EV_P_ void *w, int revents)
1166{ 1191{
1167 int pri; 1192 EV_CB_INVOKE ((W)w, revents);
1168
1169 for (pri = NUMPRI; pri--; )
1170 if (pendingcnt [pri])
1171 return 1;
1172
1173 return 0;
1174} 1193}
1175 1194
1176void inline_speed 1195void inline_speed
1177call_pending (EV_P) 1196call_pending (EV_P)
1178{ 1197{
… …
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1251
1233 /* first reschedule or stop timer */ 1252 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1253 if (w->reschedule_cb)
1235 { 1254 {
1236 ((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);
1237 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));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1257 downheap ((WT *)periodics, periodiccnt, 0);
1239 } 1258 }
1240 else if (w->interval) 1259 else if (w->interval)
1241 { 1260 {
1242 ((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;
1243 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));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap ((WT *)periodics, periodiccnt, 0);
1245 } 1265 }
1246 else 1266 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1261 ev_periodic *w = periodics [i]; 1281 ev_periodic *w = periodics [i];
1262 1282
1263 if (w->reschedule_cb) 1283 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1285 else if (w->interval)
1266 ((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;
1267 } 1287 }
1268 1288
1269 /* now rebuild the heap */ 1289 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1290 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1291 downheap ((WT *)periodics, periodiccnt, i);
1272} 1292}
1273#endif 1293#endif
1274 1294
1295#if EV_IDLE_ENABLE
1275int inline_size 1296void inline_size
1276time_update_monotonic (EV_P) 1297idle_reify (EV_P)
1277{ 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
1278 mn_now = get_clock (); 1328 mn_now = get_clock ();
1279 1329
1330 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1331 /* interpolate in the meantime */
1280 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1332 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1281 { 1333 {
1282 ev_rt_now = rtmn_diff + mn_now; 1334 ev_rt_now = rtmn_diff + mn_now;
1283 return 0; 1335 return;
1284 } 1336 }
1285 else 1337
1286 {
1287 now_floor = mn_now; 1338 now_floor = mn_now;
1288 ev_rt_now = ev_time (); 1339 ev_rt_now = ev_time ();
1289 return 1;
1290 }
1291}
1292 1340
1293void inline_size 1341 /* loop a few times, before making important decisions.
1294time_update (EV_P) 1342 * on the choice of "4": one iteration isn't enough,
1295{ 1343 * in case we get preempted during the calls to
1296 int i; 1344 * ev_time and get_clock. a second call is almost guaranteed
1297 1345 * to succeed in that case, though. and looping a few more times
1298#if EV_USE_MONOTONIC 1346 * doesn't hurt either as we only do this on time-jumps or
1299 if (expect_true (have_monotonic)) 1347 * in the unlikely event of having been preempted here.
1300 { 1348 */
1301 if (time_update_monotonic (EV_A)) 1349 for (i = 4; --i; )
1302 { 1350 {
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; 1351 rtmn_diff = ev_rt_now - mn_now;
1316 1352
1317 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1353 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1318 return; /* all is well */ 1354 return; /* all is well */
1319 1355
1320 ev_rt_now = ev_time (); 1356 ev_rt_now = ev_time ();
1321 mn_now = get_clock (); 1357 mn_now = get_clock ();
1322 now_floor = mn_now; 1358 now_floor = mn_now;
1323 } 1359 }
1324 1360
1325# if EV_PERIODIC_ENABLE 1361# if EV_PERIODIC_ENABLE
1326 periodics_reschedule (EV_A); 1362 periodics_reschedule (EV_A);
1327# endif 1363# endif
1328 /* no timer adjustment, as the monotonic clock doesn't jump */ 1364 /* no timer adjustment, as the monotonic clock doesn't jump */
1329 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1365 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1330 }
1331 } 1366 }
1332 else 1367 else
1333#endif 1368#endif
1334 { 1369 {
1335 ev_rt_now = ev_time (); 1370 ev_rt_now = ev_time ();
1336 1371
1337 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))
1338 { 1373 {
1339#if EV_PERIODIC_ENABLE 1374#if EV_PERIODIC_ENABLE
1340 periodics_reschedule (EV_A); 1375 periodics_reschedule (EV_A);
1341#endif 1376#endif
1342
1343 /* 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 */
1344 for (i = 0; i < timercnt; ++i) 1378 for (i = 0; i < timercnt; ++i)
1345 ((WT)timers [i])->at += ev_rt_now - mn_now; 1379 ((WT)timers [i])->at += ev_rt_now - mn_now;
1346 } 1380 }
1347 1381
… …
1391 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1425 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1392 call_pending (EV_A); 1426 call_pending (EV_A);
1393 } 1427 }
1394#endif 1428#endif
1395 1429
1396 /* queue check watchers (and execute them) */ 1430 /* queue prepare watchers (and execute them) */
1397 if (expect_false (preparecnt)) 1431 if (expect_false (preparecnt))
1398 { 1432 {
1399 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1433 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1400 call_pending (EV_A); 1434 call_pending (EV_A);
1401 } 1435 }
… …
1412 1446
1413 /* calculate blocking time */ 1447 /* calculate blocking time */
1414 { 1448 {
1415 ev_tstamp block; 1449 ev_tstamp block;
1416 1450
1417 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1418 block = 0.; /* do not block at all */ 1452 block = 0.; /* do not block at all */
1419 else 1453 else
1420 { 1454 {
1421 /* update time to cancel out callback processing overhead */ 1455 /* 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); 1456 time_update (EV_A_ 1e100);
1425 else
1426#endif
1427 {
1428 ev_rt_now = ev_time ();
1429 mn_now = ev_rt_now;
1430 }
1431 1457
1432 block = MAX_BLOCKTIME; 1458 block = MAX_BLOCKTIME;
1433 1459
1434 if (timercnt) 1460 if (timercnt)
1435 { 1461 {
… …
1448 if (expect_false (block < 0.)) block = 0.; 1474 if (expect_false (block < 0.)) block = 0.;
1449 } 1475 }
1450 1476
1451 ++loop_count; 1477 ++loop_count;
1452 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);
1453 } 1482 }
1454
1455 /* update ev_rt_now, do magic */
1456 time_update (EV_A);
1457 1483
1458 /* queue pending timers and reschedule them */ 1484 /* queue pending timers and reschedule them */
1459 timers_reify (EV_A); /* relative timers called last */ 1485 timers_reify (EV_A); /* relative timers called last */
1460#if EV_PERIODIC_ENABLE 1486#if EV_PERIODIC_ENABLE
1461 periodics_reify (EV_A); /* absolute timers called first */ 1487 periodics_reify (EV_A); /* absolute timers called first */
1462#endif 1488#endif
1463 1489
1490#if EV_IDLE_ENABLE
1464 /* queue idle watchers unless other events are pending */ 1491 /* queue idle watchers unless other events are pending */
1465 if (idlecnt && !any_pending (EV_A)) 1492 idle_reify (EV_A);
1466 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1493#endif
1467 1494
1468 /* queue check watchers, to be executed first */ 1495 /* queue check watchers, to be executed first */
1469 if (expect_false (checkcnt)) 1496 if (expect_false (checkcnt))
1470 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1497 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1471 1498
… …
1507 head = &(*head)->next; 1534 head = &(*head)->next;
1508 } 1535 }
1509} 1536}
1510 1537
1511void inline_speed 1538void inline_speed
1512ev_clear_pending (EV_P_ W w) 1539clear_pending (EV_P_ W w)
1513{ 1540{
1514 if (w->pending) 1541 if (w->pending)
1515 { 1542 {
1516 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1543 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1517 w->pending = 0; 1544 w->pending = 0;
1518 } 1545 }
1519} 1546}
1520 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
1521void inline_speed 1574void inline_speed
1522ev_start (EV_P_ W w, int active) 1575ev_start (EV_P_ W w, int active)
1523{ 1576{
1524 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1577 pri_adjust (EV_A_ w);
1525 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1526
1527 w->active = active; 1578 w->active = active;
1528 ev_ref (EV_A); 1579 ev_ref (EV_A);
1529} 1580}
1530 1581
1531void inline_size 1582void inline_size
… …
1535 w->active = 0; 1586 w->active = 0;
1536} 1587}
1537 1588
1538/*****************************************************************************/ 1589/*****************************************************************************/
1539 1590
1540void 1591void noinline
1541ev_io_start (EV_P_ ev_io *w) 1592ev_io_start (EV_P_ ev_io *w)
1542{ 1593{
1543 int fd = w->fd; 1594 int fd = w->fd;
1544 1595
1545 if (expect_false (ev_is_active (w))) 1596 if (expect_false (ev_is_active (w)))
… …
1552 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1603 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1553 1604
1554 fd_change (EV_A_ fd); 1605 fd_change (EV_A_ fd);
1555} 1606}
1556 1607
1557void 1608void noinline
1558ev_io_stop (EV_P_ ev_io *w) 1609ev_io_stop (EV_P_ ev_io *w)
1559{ 1610{
1560 ev_clear_pending (EV_A_ (W)w); 1611 clear_pending (EV_A_ (W)w);
1561 if (expect_false (!ev_is_active (w))) 1612 if (expect_false (!ev_is_active (w)))
1562 return; 1613 return;
1563 1614
1564 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1565 1616
… …
1567 ev_stop (EV_A_ (W)w); 1618 ev_stop (EV_A_ (W)w);
1568 1619
1569 fd_change (EV_A_ w->fd); 1620 fd_change (EV_A_ w->fd);
1570} 1621}
1571 1622
1572void 1623void noinline
1573ev_timer_start (EV_P_ ev_timer *w) 1624ev_timer_start (EV_P_ ev_timer *w)
1574{ 1625{
1575 if (expect_false (ev_is_active (w))) 1626 if (expect_false (ev_is_active (w)))
1576 return; 1627 return;
1577 1628
… …
1585 upheap ((WT *)timers, timercnt - 1); 1636 upheap ((WT *)timers, timercnt - 1);
1586 1637
1587 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1588} 1639}
1589 1640
1590void 1641void noinline
1591ev_timer_stop (EV_P_ ev_timer *w) 1642ev_timer_stop (EV_P_ ev_timer *w)
1592{ 1643{
1593 ev_clear_pending (EV_A_ (W)w); 1644 clear_pending (EV_A_ (W)w);
1594 if (expect_false (!ev_is_active (w))) 1645 if (expect_false (!ev_is_active (w)))
1595 return; 1646 return;
1596 1647
1597 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1598 1649
… …
1609 ((WT)w)->at -= mn_now; 1660 ((WT)w)->at -= mn_now;
1610 1661
1611 ev_stop (EV_A_ (W)w); 1662 ev_stop (EV_A_ (W)w);
1612} 1663}
1613 1664
1614void 1665void noinline
1615ev_timer_again (EV_P_ ev_timer *w) 1666ev_timer_again (EV_P_ ev_timer *w)
1616{ 1667{
1617 if (ev_is_active (w)) 1668 if (ev_is_active (w))
1618 { 1669 {
1619 if (w->repeat) 1670 if (w->repeat)
… …
1630 ev_timer_start (EV_A_ w); 1681 ev_timer_start (EV_A_ w);
1631 } 1682 }
1632} 1683}
1633 1684
1634#if EV_PERIODIC_ENABLE 1685#if EV_PERIODIC_ENABLE
1635void 1686void noinline
1636ev_periodic_start (EV_P_ ev_periodic *w) 1687ev_periodic_start (EV_P_ ev_periodic *w)
1637{ 1688{
1638 if (expect_false (ev_is_active (w))) 1689 if (expect_false (ev_is_active (w)))
1639 return; 1690 return;
1640 1691
… …
1642 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1693 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1643 else if (w->interval) 1694 else if (w->interval)
1644 { 1695 {
1645 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1696 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 */ 1697 /* 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; 1698 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1648 } 1699 }
1700 else
1701 ((WT)w)->at = w->offset;
1649 1702
1650 ev_start (EV_A_ (W)w, ++periodiccnt); 1703 ev_start (EV_A_ (W)w, ++periodiccnt);
1651 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1652 periodics [periodiccnt - 1] = w; 1705 periodics [periodiccnt - 1] = w;
1653 upheap ((WT *)periodics, periodiccnt - 1); 1706 upheap ((WT *)periodics, periodiccnt - 1);
1654 1707
1655 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1656} 1709}
1657 1710
1658void 1711void noinline
1659ev_periodic_stop (EV_P_ ev_periodic *w) 1712ev_periodic_stop (EV_P_ ev_periodic *w)
1660{ 1713{
1661 ev_clear_pending (EV_A_ (W)w); 1714 clear_pending (EV_A_ (W)w);
1662 if (expect_false (!ev_is_active (w))) 1715 if (expect_false (!ev_is_active (w)))
1663 return; 1716 return;
1664 1717
1665 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1666 1719
… …
1675 } 1728 }
1676 1729
1677 ev_stop (EV_A_ (W)w); 1730 ev_stop (EV_A_ (W)w);
1678} 1731}
1679 1732
1680void 1733void noinline
1681ev_periodic_again (EV_P_ ev_periodic *w) 1734ev_periodic_again (EV_P_ ev_periodic *w)
1682{ 1735{
1683 /* TODO: use adjustheap and recalculation */ 1736 /* TODO: use adjustheap and recalculation */
1684 ev_periodic_stop (EV_A_ w); 1737 ev_periodic_stop (EV_A_ w);
1685 ev_periodic_start (EV_A_ w); 1738 ev_periodic_start (EV_A_ w);
… …
1688 1741
1689#ifndef SA_RESTART 1742#ifndef SA_RESTART
1690# define SA_RESTART 0 1743# define SA_RESTART 0
1691#endif 1744#endif
1692 1745
1693void 1746void noinline
1694ev_signal_start (EV_P_ ev_signal *w) 1747ev_signal_start (EV_P_ ev_signal *w)
1695{ 1748{
1696#if EV_MULTIPLICITY 1749#if EV_MULTIPLICITY
1697 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1750 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1698#endif 1751#endif
… …
1717 sigaction (w->signum, &sa, 0); 1770 sigaction (w->signum, &sa, 0);
1718#endif 1771#endif
1719 } 1772 }
1720} 1773}
1721 1774
1722void 1775void noinline
1723ev_signal_stop (EV_P_ ev_signal *w) 1776ev_signal_stop (EV_P_ ev_signal *w)
1724{ 1777{
1725 ev_clear_pending (EV_A_ (W)w); 1778 clear_pending (EV_A_ (W)w);
1726 if (expect_false (!ev_is_active (w))) 1779 if (expect_false (!ev_is_active (w)))
1727 return; 1780 return;
1728 1781
1729 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1782 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1730 ev_stop (EV_A_ (W)w); 1783 ev_stop (EV_A_ (W)w);
… …
1747} 1800}
1748 1801
1749void 1802void
1750ev_child_stop (EV_P_ ev_child *w) 1803ev_child_stop (EV_P_ ev_child *w)
1751{ 1804{
1752 ev_clear_pending (EV_A_ (W)w); 1805 clear_pending (EV_A_ (W)w);
1753 if (expect_false (!ev_is_active (w))) 1806 if (expect_false (!ev_is_active (w)))
1754 return; 1807 return;
1755 1808
1756 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1809 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1757 ev_stop (EV_A_ (W)w); 1810 ev_stop (EV_A_ (W)w);
… …
1993} 2046}
1994 2047
1995void 2048void
1996ev_stat_stop (EV_P_ ev_stat *w) 2049ev_stat_stop (EV_P_ ev_stat *w)
1997{ 2050{
1998 ev_clear_pending (EV_A_ (W)w); 2051 clear_pending (EV_A_ (W)w);
1999 if (expect_false (!ev_is_active (w))) 2052 if (expect_false (!ev_is_active (w)))
2000 return; 2053 return;
2001 2054
2002#if EV_USE_INOTIFY 2055#if EV_USE_INOTIFY
2003 infy_del (EV_A_ w); 2056 infy_del (EV_A_ w);
… …
2006 2059
2007 ev_stop (EV_A_ (W)w); 2060 ev_stop (EV_A_ (W)w);
2008} 2061}
2009#endif 2062#endif
2010 2063
2064#if EV_IDLE_ENABLE
2011void 2065void
2012ev_idle_start (EV_P_ ev_idle *w) 2066ev_idle_start (EV_P_ ev_idle *w)
2013{ 2067{
2014 if (expect_false (ev_is_active (w))) 2068 if (expect_false (ev_is_active (w)))
2015 return; 2069 return;
2016 2070
2071 pri_adjust (EV_A_ (W)w);
2072
2073 {
2074 int active = ++idlecnt [ABSPRI (w)];
2075
2076 ++idleall;
2017 ev_start (EV_A_ (W)w, ++idlecnt); 2077 ev_start (EV_A_ (W)w, active);
2078
2018 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2079 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2019 idles [idlecnt - 1] = w; 2080 idles [ABSPRI (w)][active - 1] = w;
2081 }
2020} 2082}
2021 2083
2022void 2084void
2023ev_idle_stop (EV_P_ ev_idle *w) 2085ev_idle_stop (EV_P_ ev_idle *w)
2024{ 2086{
2025 ev_clear_pending (EV_A_ (W)w); 2087 clear_pending (EV_A_ (W)w);
2026 if (expect_false (!ev_is_active (w))) 2088 if (expect_false (!ev_is_active (w)))
2027 return; 2089 return;
2028 2090
2029 { 2091 {
2030 int active = ((W)w)->active; 2092 int active = ((W)w)->active;
2031 idles [active - 1] = idles [--idlecnt]; 2093
2094 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2032 ((W)idles [active - 1])->active = active; 2095 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2096
2097 ev_stop (EV_A_ (W)w);
2098 --idleall;
2033 } 2099 }
2034
2035 ev_stop (EV_A_ (W)w);
2036} 2100}
2101#endif
2037 2102
2038void 2103void
2039ev_prepare_start (EV_P_ ev_prepare *w) 2104ev_prepare_start (EV_P_ ev_prepare *w)
2040{ 2105{
2041 if (expect_false (ev_is_active (w))) 2106 if (expect_false (ev_is_active (w)))
… …
2047} 2112}
2048 2113
2049void 2114void
2050ev_prepare_stop (EV_P_ ev_prepare *w) 2115ev_prepare_stop (EV_P_ ev_prepare *w)
2051{ 2116{
2052 ev_clear_pending (EV_A_ (W)w); 2117 clear_pending (EV_A_ (W)w);
2053 if (expect_false (!ev_is_active (w))) 2118 if (expect_false (!ev_is_active (w)))
2054 return; 2119 return;
2055 2120
2056 { 2121 {
2057 int active = ((W)w)->active; 2122 int active = ((W)w)->active;
… …
2074} 2139}
2075 2140
2076void 2141void
2077ev_check_stop (EV_P_ ev_check *w) 2142ev_check_stop (EV_P_ ev_check *w)
2078{ 2143{
2079 ev_clear_pending (EV_A_ (W)w); 2144 clear_pending (EV_A_ (W)w);
2080 if (expect_false (!ev_is_active (w))) 2145 if (expect_false (!ev_is_active (w)))
2081 return; 2146 return;
2082 2147
2083 { 2148 {
2084 int active = ((W)w)->active; 2149 int active = ((W)w)->active;
… …
2126} 2191}
2127 2192
2128void 2193void
2129ev_embed_stop (EV_P_ ev_embed *w) 2194ev_embed_stop (EV_P_ ev_embed *w)
2130{ 2195{
2131 ev_clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2132 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2133 return; 2198 return;
2134 2199
2135 ev_io_stop (EV_A_ &w->io); 2200 ev_io_stop (EV_A_ &w->io);
2136 2201
… …
2151} 2216}
2152 2217
2153void 2218void
2154ev_fork_stop (EV_P_ ev_fork *w) 2219ev_fork_stop (EV_P_ ev_fork *w)
2155{ 2220{
2156 ev_clear_pending (EV_A_ (W)w); 2221 clear_pending (EV_A_ (W)w);
2157 if (expect_false (!ev_is_active (w))) 2222 if (expect_false (!ev_is_active (w)))
2158 return; 2223 return;
2159 2224
2160 { 2225 {
2161 int active = ((W)w)->active; 2226 int active = ((W)w)->active;

Diff Legend

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