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

Comparing libev/ev.c (file contents):
Revision 1.158 by root, Thu Nov 29 17:28:13 2007 UTC vs.
Revision 1.177 by root, Tue Dec 11 15:06:50 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_size
449queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 483{
… …
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{
… …
725 for (signum = signalmax; signum--; ) 759 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig) 760 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1); 761 ev_feed_signal_event (EV_A_ signum + 1);
728} 762}
729 763
730void inline_size 764void inline_speed
731fd_intern (int fd) 765fd_intern (int fd)
732{ 766{
733#ifdef _WIN32 767#ifdef _WIN32
734 int arg = 1; 768 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 769 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
764 ev_child *w; 798 ev_child *w;
765 799
766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 800 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
767 if (w->pid == pid || !w->pid) 801 if (w->pid == pid || !w->pid)
768 { 802 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 803 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
770 w->rpid = pid; 804 w->rpid = pid;
771 w->rstatus = status; 805 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 806 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 807 }
774} 808}
775 809
776#ifndef WCONTINUED 810#ifndef WCONTINUED
… …
886ev_backend (EV_P) 920ev_backend (EV_P)
887{ 921{
888 return backend; 922 return backend;
889} 923}
890 924
925unsigned int
926ev_loop_count (EV_P)
927{
928 return loop_count;
929}
930
891static void noinline 931static void noinline
892loop_init (EV_P_ unsigned int flags) 932loop_init (EV_P_ unsigned int flags)
893{ 933{
894 if (!backend) 934 if (!backend)
895 { 935 {
… …
975#if EV_USE_SELECT 1015#if EV_USE_SELECT
976 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1016 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
977#endif 1017#endif
978 1018
979 for (i = NUMPRI; i--; ) 1019 for (i = NUMPRI; i--; )
1020 {
980 array_free (pending, [i]); 1021 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE
1023 array_free (idle, [i]);
1024#endif
1025 }
981 1026
982 /* have to use the microsoft-never-gets-it-right macro */ 1027 /* have to use the microsoft-never-gets-it-right macro */
983 array_free (fdchange, EMPTY0); 1028 array_free (fdchange, EMPTY);
984 array_free (timer, EMPTY0); 1029 array_free (timer, EMPTY);
985#if EV_PERIODIC_ENABLE 1030#if EV_PERIODIC_ENABLE
986 array_free (periodic, EMPTY0); 1031 array_free (periodic, EMPTY);
987#endif 1032#endif
988 array_free (idle, EMPTY0);
989 array_free (prepare, EMPTY0); 1033 array_free (prepare, EMPTY);
990 array_free (check, EMPTY0); 1034 array_free (check, EMPTY);
991 1035
992 backend = 0; 1036 backend = 0;
993} 1037}
994 1038
995void inline_size infy_fork (EV_P); 1039void inline_size infy_fork (EV_P);
… …
1131 postfork = 1; 1175 postfork = 1;
1132} 1176}
1133 1177
1134/*****************************************************************************/ 1178/*****************************************************************************/
1135 1179
1136int inline_size 1180void
1137any_pending (EV_P) 1181ev_invoke (EV_P_ void *w, int revents)
1138{ 1182{
1139 int pri; 1183 EV_CB_INVOKE ((W)w, revents);
1140
1141 for (pri = NUMPRI; pri--; )
1142 if (pendingcnt [pri])
1143 return 1;
1144
1145 return 0;
1146} 1184}
1147 1185
1148void inline_speed 1186void inline_speed
1149call_pending (EV_P) 1187call_pending (EV_P)
1150{ 1188{
… …
1203 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1204 1242
1205 /* first reschedule or stop timer */ 1243 /* first reschedule or stop timer */
1206 if (w->reschedule_cb) 1244 if (w->reschedule_cb)
1207 { 1245 {
1208 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1246 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1209 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1247 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1248 downheap ((WT *)periodics, periodiccnt, 0);
1211 } 1249 }
1212 else if (w->interval) 1250 else if (w->interval)
1213 { 1251 {
1214 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1252 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1253 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1215 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1216 downheap ((WT *)periodics, periodiccnt, 0); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1217 } 1256 }
1218 else 1257 else
1219 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1233 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1234 1273
1235 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1237 else if (w->interval) 1276 else if (w->interval)
1238 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1239 } 1278 }
1240 1279
1241 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1242 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1243 downheap ((WT *)periodics, periodiccnt, i); 1282 downheap ((WT *)periodics, periodiccnt, i);
1283}
1284#endif
1285
1286#if EV_IDLE_ENABLE
1287void inline_size
1288idle_reify (EV_P)
1289{
1290 if (expect_false (idleall))
1291 {
1292 int pri;
1293
1294 for (pri = NUMPRI; pri--; )
1295 {
1296 if (pendingcnt [pri])
1297 break;
1298
1299 if (idlecnt [pri])
1300 {
1301 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1302 break;
1303 }
1304 }
1305 }
1244} 1306}
1245#endif 1307#endif
1246 1308
1247int inline_size 1309int inline_size
1248time_update_monotonic (EV_P) 1310time_update_monotonic (EV_P)
… …
1309 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 || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1310 { 1372 {
1311#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1312 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1313#endif 1375#endif
1314
1315 /* 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 */
1316 for (i = 0; i < timercnt; ++i) 1377 for (i = 0; i < timercnt; ++i)
1317 ((WT)timers [i])->at += ev_rt_now - mn_now; 1378 ((WT)timers [i])->at += ev_rt_now - mn_now;
1318 } 1379 }
1319 1380
… …
1342 ? EVUNLOOP_ONE 1403 ? EVUNLOOP_ONE
1343 : EVUNLOOP_CANCEL; 1404 : EVUNLOOP_CANCEL;
1344 1405
1345 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1406 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1346 1407
1347 while (activecnt) 1408 do
1348 { 1409 {
1349#ifndef _WIN32 1410#ifndef _WIN32
1350 if (expect_false (curpid)) /* penalise the forking check even more */ 1411 if (expect_false (curpid)) /* penalise the forking check even more */
1351 if (expect_false (getpid () != curpid)) 1412 if (expect_false (getpid () != curpid))
1352 { 1413 {
… …
1363 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1424 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1364 call_pending (EV_A); 1425 call_pending (EV_A);
1365 } 1426 }
1366#endif 1427#endif
1367 1428
1368 /* queue check watchers (and execute them) */ 1429 /* queue prepare watchers (and execute them) */
1369 if (expect_false (preparecnt)) 1430 if (expect_false (preparecnt))
1370 { 1431 {
1371 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1432 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1372 call_pending (EV_A); 1433 call_pending (EV_A);
1373 } 1434 }
1374 1435
1436 if (expect_false (!activecnt))
1437 break;
1438
1375 /* we might have forked, so reify kernel state if necessary */ 1439 /* we might have forked, so reify kernel state if necessary */
1376 if (expect_false (postfork)) 1440 if (expect_false (postfork))
1377 loop_fork (EV_A); 1441 loop_fork (EV_A);
1378 1442
1379 /* update fd-related kernel structures */ 1443 /* update fd-related kernel structures */
… …
1381 1445
1382 /* calculate blocking time */ 1446 /* calculate blocking time */
1383 { 1447 {
1384 ev_tstamp block; 1448 ev_tstamp block;
1385 1449
1386 if (flags & EVLOOP_NONBLOCK || idlecnt) 1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1387 block = 0.; /* do not block at all */ 1451 block = 0.; /* do not block at all */
1388 else 1452 else
1389 { 1453 {
1390 /* update time to cancel out callback processing overhead */ 1454 /* update time to cancel out callback processing overhead */
1391#if EV_USE_MONOTONIC 1455#if EV_USE_MONOTONIC
… …
1415#endif 1479#endif
1416 1480
1417 if (expect_false (block < 0.)) block = 0.; 1481 if (expect_false (block < 0.)) block = 0.;
1418 } 1482 }
1419 1483
1484 ++loop_count;
1420 backend_poll (EV_A_ block); 1485 backend_poll (EV_A_ block);
1421 } 1486 }
1422 1487
1423 /* update ev_rt_now, do magic */ 1488 /* update ev_rt_now, do magic */
1424 time_update (EV_A); 1489 time_update (EV_A);
… …
1427 timers_reify (EV_A); /* relative timers called last */ 1492 timers_reify (EV_A); /* relative timers called last */
1428#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1429 periodics_reify (EV_A); /* absolute timers called first */ 1494 periodics_reify (EV_A); /* absolute timers called first */
1430#endif 1495#endif
1431 1496
1497#if EV_IDLE_ENABLE
1432 /* queue idle watchers unless other events are pending */ 1498 /* queue idle watchers unless other events are pending */
1433 if (idlecnt && !any_pending (EV_A)) 1499 idle_reify (EV_A);
1434 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1500#endif
1435 1501
1436 /* queue check watchers, to be executed first */ 1502 /* queue check watchers, to be executed first */
1437 if (expect_false (checkcnt)) 1503 if (expect_false (checkcnt))
1438 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1504 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1439 1505
1440 call_pending (EV_A); 1506 call_pending (EV_A);
1441 1507
1442 if (expect_false (loop_done))
1443 break;
1444 } 1508 }
1509 while (expect_true (activecnt && !loop_done));
1445 1510
1446 if (loop_done == EVUNLOOP_ONE) 1511 if (loop_done == EVUNLOOP_ONE)
1447 loop_done = EVUNLOOP_CANCEL; 1512 loop_done = EVUNLOOP_CANCEL;
1448} 1513}
1449 1514
… …
1476 head = &(*head)->next; 1541 head = &(*head)->next;
1477 } 1542 }
1478} 1543}
1479 1544
1480void inline_speed 1545void inline_speed
1481ev_clear_pending (EV_P_ W w) 1546clear_pending (EV_P_ W w)
1482{ 1547{
1483 if (w->pending) 1548 if (w->pending)
1484 { 1549 {
1485 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1550 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1486 w->pending = 0; 1551 w->pending = 0;
1487 } 1552 }
1488} 1553}
1489 1554
1555int
1556ev_clear_pending (EV_P_ void *w)
1557{
1558 W w_ = (W)w;
1559 int pending = w_->pending;
1560
1561 if (expect_true (pending))
1562 {
1563 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1564 w_->pending = 0;
1565 p->w = 0;
1566 return p->events;
1567 }
1568 else
1569 return 0;
1570}
1571
1572void inline_size
1573pri_adjust (EV_P_ W w)
1574{
1575 int pri = w->priority;
1576 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1577 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1578 w->priority = pri;
1579}
1580
1490void inline_speed 1581void inline_speed
1491ev_start (EV_P_ W w, int active) 1582ev_start (EV_P_ W w, int active)
1492{ 1583{
1493 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1584 pri_adjust (EV_A_ w);
1494 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1495
1496 w->active = active; 1585 w->active = active;
1497 ev_ref (EV_A); 1586 ev_ref (EV_A);
1498} 1587}
1499 1588
1500void inline_size 1589void inline_size
… …
1504 w->active = 0; 1593 w->active = 0;
1505} 1594}
1506 1595
1507/*****************************************************************************/ 1596/*****************************************************************************/
1508 1597
1509void 1598void noinline
1510ev_io_start (EV_P_ ev_io *w) 1599ev_io_start (EV_P_ ev_io *w)
1511{ 1600{
1512 int fd = w->fd; 1601 int fd = w->fd;
1513 1602
1514 if (expect_false (ev_is_active (w))) 1603 if (expect_false (ev_is_active (w)))
… …
1521 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1610 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1522 1611
1523 fd_change (EV_A_ fd); 1612 fd_change (EV_A_ fd);
1524} 1613}
1525 1614
1526void 1615void noinline
1527ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1528{ 1617{
1529 ev_clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1530 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1531 return; 1620 return;
1532 1621
1533 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1622 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1534 1623
… …
1536 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1537 1626
1538 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd);
1539} 1628}
1540 1629
1541void 1630void noinline
1542ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1543{ 1632{
1544 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1545 return; 1634 return;
1546 1635
… …
1554 upheap ((WT *)timers, timercnt - 1); 1643 upheap ((WT *)timers, timercnt - 1);
1555 1644
1556 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1557} 1646}
1558 1647
1559void 1648void noinline
1560ev_timer_stop (EV_P_ ev_timer *w) 1649ev_timer_stop (EV_P_ ev_timer *w)
1561{ 1650{
1562 ev_clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1563 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1564 return; 1653 return;
1565 1654
1566 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1567 1656
… …
1578 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1579 1668
1580 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1581} 1670}
1582 1671
1583void 1672void noinline
1584ev_timer_again (EV_P_ ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1585{ 1674{
1586 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1587 { 1676 {
1588 if (w->repeat) 1677 if (w->repeat)
… …
1599 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1600 } 1689 }
1601} 1690}
1602 1691
1603#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1604void 1693void noinline
1605ev_periodic_start (EV_P_ ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1606{ 1695{
1607 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1608 return; 1697 return;
1609 1698
… …
1611 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1612 else if (w->interval) 1701 else if (w->interval)
1613 { 1702 {
1614 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1703 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1615 /* this formula differs from the one in periodic_reify because we do not always round up */ 1704 /* this formula differs from the one in periodic_reify because we do not always round up */
1616 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1705 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1617 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1618 1709
1619 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1620 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1621 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = w;
1622 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap ((WT *)periodics, periodiccnt - 1);
1623 1714
1624 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1625} 1716}
1626 1717
1627void 1718void noinline
1628ev_periodic_stop (EV_P_ ev_periodic *w) 1719ev_periodic_stop (EV_P_ ev_periodic *w)
1629{ 1720{
1630 ev_clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1631 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1632 return; 1723 return;
1633 1724
1634 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1635 1726
… …
1644 } 1735 }
1645 1736
1646 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1647} 1738}
1648 1739
1649void 1740void noinline
1650ev_periodic_again (EV_P_ ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1651{ 1742{
1652 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1653 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1654 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
… …
1657 1748
1658#ifndef SA_RESTART 1749#ifndef SA_RESTART
1659# define SA_RESTART 0 1750# define SA_RESTART 0
1660#endif 1751#endif
1661 1752
1662void 1753void noinline
1663ev_signal_start (EV_P_ ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1664{ 1755{
1665#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1666 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1757 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1667#endif 1758#endif
… …
1686 sigaction (w->signum, &sa, 0); 1777 sigaction (w->signum, &sa, 0);
1687#endif 1778#endif
1688 } 1779 }
1689} 1780}
1690 1781
1691void 1782void noinline
1692ev_signal_stop (EV_P_ ev_signal *w) 1783ev_signal_stop (EV_P_ ev_signal *w)
1693{ 1784{
1694 ev_clear_pending (EV_A_ (W)w); 1785 clear_pending (EV_A_ (W)w);
1695 if (expect_false (!ev_is_active (w))) 1786 if (expect_false (!ev_is_active (w)))
1696 return; 1787 return;
1697 1788
1698 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1789 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1699 ev_stop (EV_A_ (W)w); 1790 ev_stop (EV_A_ (W)w);
… …
1716} 1807}
1717 1808
1718void 1809void
1719ev_child_stop (EV_P_ ev_child *w) 1810ev_child_stop (EV_P_ ev_child *w)
1720{ 1811{
1721 ev_clear_pending (EV_A_ (W)w); 1812 clear_pending (EV_A_ (W)w);
1722 if (expect_false (!ev_is_active (w))) 1813 if (expect_false (!ev_is_active (w)))
1723 return; 1814 return;
1724 1815
1725 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1816 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1726 ev_stop (EV_A_ (W)w); 1817 ev_stop (EV_A_ (W)w);
… …
1962} 2053}
1963 2054
1964void 2055void
1965ev_stat_stop (EV_P_ ev_stat *w) 2056ev_stat_stop (EV_P_ ev_stat *w)
1966{ 2057{
1967 ev_clear_pending (EV_A_ (W)w); 2058 clear_pending (EV_A_ (W)w);
1968 if (expect_false (!ev_is_active (w))) 2059 if (expect_false (!ev_is_active (w)))
1969 return; 2060 return;
1970 2061
1971#if EV_USE_INOTIFY 2062#if EV_USE_INOTIFY
1972 infy_del (EV_A_ w); 2063 infy_del (EV_A_ w);
… …
1975 2066
1976 ev_stop (EV_A_ (W)w); 2067 ev_stop (EV_A_ (W)w);
1977} 2068}
1978#endif 2069#endif
1979 2070
2071#if EV_IDLE_ENABLE
1980void 2072void
1981ev_idle_start (EV_P_ ev_idle *w) 2073ev_idle_start (EV_P_ ev_idle *w)
1982{ 2074{
1983 if (expect_false (ev_is_active (w))) 2075 if (expect_false (ev_is_active (w)))
1984 return; 2076 return;
1985 2077
2078 pri_adjust (EV_A_ (W)w);
2079
2080 {
2081 int active = ++idlecnt [ABSPRI (w)];
2082
2083 ++idleall;
1986 ev_start (EV_A_ (W)w, ++idlecnt); 2084 ev_start (EV_A_ (W)w, active);
2085
1987 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2086 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1988 idles [idlecnt - 1] = w; 2087 idles [ABSPRI (w)][active - 1] = w;
2088 }
1989} 2089}
1990 2090
1991void 2091void
1992ev_idle_stop (EV_P_ ev_idle *w) 2092ev_idle_stop (EV_P_ ev_idle *w)
1993{ 2093{
1994 ev_clear_pending (EV_A_ (W)w); 2094 clear_pending (EV_A_ (W)w);
1995 if (expect_false (!ev_is_active (w))) 2095 if (expect_false (!ev_is_active (w)))
1996 return; 2096 return;
1997 2097
1998 { 2098 {
1999 int active = ((W)w)->active; 2099 int active = ((W)w)->active;
2000 idles [active - 1] = idles [--idlecnt]; 2100
2101 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2001 ((W)idles [active - 1])->active = active; 2102 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2103
2104 ev_stop (EV_A_ (W)w);
2105 --idleall;
2002 } 2106 }
2003
2004 ev_stop (EV_A_ (W)w);
2005} 2107}
2108#endif
2006 2109
2007void 2110void
2008ev_prepare_start (EV_P_ ev_prepare *w) 2111ev_prepare_start (EV_P_ ev_prepare *w)
2009{ 2112{
2010 if (expect_false (ev_is_active (w))) 2113 if (expect_false (ev_is_active (w)))
… …
2016} 2119}
2017 2120
2018void 2121void
2019ev_prepare_stop (EV_P_ ev_prepare *w) 2122ev_prepare_stop (EV_P_ ev_prepare *w)
2020{ 2123{
2021 ev_clear_pending (EV_A_ (W)w); 2124 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2125 if (expect_false (!ev_is_active (w)))
2023 return; 2126 return;
2024 2127
2025 { 2128 {
2026 int active = ((W)w)->active; 2129 int active = ((W)w)->active;
… …
2043} 2146}
2044 2147
2045void 2148void
2046ev_check_stop (EV_P_ ev_check *w) 2149ev_check_stop (EV_P_ ev_check *w)
2047{ 2150{
2048 ev_clear_pending (EV_A_ (W)w); 2151 clear_pending (EV_A_ (W)w);
2049 if (expect_false (!ev_is_active (w))) 2152 if (expect_false (!ev_is_active (w)))
2050 return; 2153 return;
2051 2154
2052 { 2155 {
2053 int active = ((W)w)->active; 2156 int active = ((W)w)->active;
… …
2095} 2198}
2096 2199
2097void 2200void
2098ev_embed_stop (EV_P_ ev_embed *w) 2201ev_embed_stop (EV_P_ ev_embed *w)
2099{ 2202{
2100 ev_clear_pending (EV_A_ (W)w); 2203 clear_pending (EV_A_ (W)w);
2101 if (expect_false (!ev_is_active (w))) 2204 if (expect_false (!ev_is_active (w)))
2102 return; 2205 return;
2103 2206
2104 ev_io_stop (EV_A_ &w->io); 2207 ev_io_stop (EV_A_ &w->io);
2105 2208
… …
2120} 2223}
2121 2224
2122void 2225void
2123ev_fork_stop (EV_P_ ev_fork *w) 2226ev_fork_stop (EV_P_ ev_fork *w)
2124{ 2227{
2125 ev_clear_pending (EV_A_ (W)w); 2228 clear_pending (EV_A_ (W)w);
2126 if (expect_false (!ev_is_active (w))) 2229 if (expect_false (!ev_is_active (w)))
2127 return; 2230 return;
2128 2231
2129 { 2232 {
2130 int active = ((W)w)->active; 2233 int active = ((W)w)->active;

Diff Legend

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