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

Comparing libev/ev.c (file contents):
Revision 1.162 by root, Mon Dec 3 13:41:24 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
… …
981#if EV_USE_SELECT 1015#if EV_USE_SELECT
982 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1016 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
983#endif 1017#endif
984 1018
985 for (i = NUMPRI; i--; ) 1019 for (i = NUMPRI; i--; )
1020 {
986 array_free (pending, [i]); 1021 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE
1023 array_free (idle, [i]);
1024#endif
1025 }
987 1026
988 /* have to use the microsoft-never-gets-it-right macro */ 1027 /* have to use the microsoft-never-gets-it-right macro */
989 array_free (fdchange, EMPTY0); 1028 array_free (fdchange, EMPTY);
990 array_free (timer, EMPTY0); 1029 array_free (timer, EMPTY);
991#if EV_PERIODIC_ENABLE 1030#if EV_PERIODIC_ENABLE
992 array_free (periodic, EMPTY0); 1031 array_free (periodic, EMPTY);
993#endif 1032#endif
994 array_free (idle, EMPTY0);
995 array_free (prepare, EMPTY0); 1033 array_free (prepare, EMPTY);
996 array_free (check, EMPTY0); 1034 array_free (check, EMPTY);
997 1035
998 backend = 0; 1036 backend = 0;
999} 1037}
1000 1038
1001void inline_size infy_fork (EV_P); 1039void inline_size infy_fork (EV_P);
… …
1137 postfork = 1; 1175 postfork = 1;
1138} 1176}
1139 1177
1140/*****************************************************************************/ 1178/*****************************************************************************/
1141 1179
1142int inline_size 1180void
1143any_pending (EV_P) 1181ev_invoke (EV_P_ void *w, int revents)
1144{ 1182{
1145 int pri; 1183 EV_CB_INVOKE ((W)w, revents);
1146
1147 for (pri = NUMPRI; pri--; )
1148 if (pendingcnt [pri])
1149 return 1;
1150
1151 return 0;
1152} 1184}
1153 1185
1154void inline_speed 1186void inline_speed
1155call_pending (EV_P) 1187call_pending (EV_P)
1156{ 1188{
… …
1209 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1210 1242
1211 /* first reschedule or stop timer */ 1243 /* first reschedule or stop timer */
1212 if (w->reschedule_cb) 1244 if (w->reschedule_cb)
1213 { 1245 {
1214 ((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);
1215 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));
1216 downheap ((WT *)periodics, periodiccnt, 0); 1248 downheap ((WT *)periodics, periodiccnt, 0);
1217 } 1249 }
1218 else if (w->interval) 1250 else if (w->interval)
1219 { 1251 {
1220 ((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;
1221 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));
1222 downheap ((WT *)periodics, periodiccnt, 0); 1255 downheap ((WT *)periodics, periodiccnt, 0);
1223 } 1256 }
1224 else 1257 else
1225 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1239 ev_periodic *w = periodics [i]; 1272 ev_periodic *w = periodics [i];
1240 1273
1241 if (w->reschedule_cb) 1274 if (w->reschedule_cb)
1242 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1243 else if (w->interval) 1276 else if (w->interval)
1244 ((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;
1245 } 1278 }
1246 1279
1247 /* now rebuild the heap */ 1280 /* now rebuild the heap */
1248 for (i = periodiccnt >> 1; i--; ) 1281 for (i = periodiccnt >> 1; i--; )
1249 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 }
1250} 1306}
1251#endif 1307#endif
1252 1308
1253int inline_size 1309int inline_size
1254time_update_monotonic (EV_P) 1310time_update_monotonic (EV_P)
… …
1315 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))
1316 { 1372 {
1317#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1318 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1319#endif 1375#endif
1320
1321 /* 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 */
1322 for (i = 0; i < timercnt; ++i) 1377 for (i = 0; i < timercnt; ++i)
1323 ((WT)timers [i])->at += ev_rt_now - mn_now; 1378 ((WT)timers [i])->at += ev_rt_now - mn_now;
1324 } 1379 }
1325 1380
… …
1369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1424 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1370 call_pending (EV_A); 1425 call_pending (EV_A);
1371 } 1426 }
1372#endif 1427#endif
1373 1428
1374 /* queue check watchers (and execute them) */ 1429 /* queue prepare watchers (and execute them) */
1375 if (expect_false (preparecnt)) 1430 if (expect_false (preparecnt))
1376 { 1431 {
1377 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1432 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1378 call_pending (EV_A); 1433 call_pending (EV_A);
1379 } 1434 }
… …
1390 1445
1391 /* calculate blocking time */ 1446 /* calculate blocking time */
1392 { 1447 {
1393 ev_tstamp block; 1448 ev_tstamp block;
1394 1449
1395 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt)) 1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1396 block = 0.; /* do not block at all */ 1451 block = 0.; /* do not block at all */
1397 else 1452 else
1398 { 1453 {
1399 /* update time to cancel out callback processing overhead */ 1454 /* update time to cancel out callback processing overhead */
1400#if EV_USE_MONOTONIC 1455#if EV_USE_MONOTONIC
… …
1437 timers_reify (EV_A); /* relative timers called last */ 1492 timers_reify (EV_A); /* relative timers called last */
1438#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1439 periodics_reify (EV_A); /* absolute timers called first */ 1494 periodics_reify (EV_A); /* absolute timers called first */
1440#endif 1495#endif
1441 1496
1497#if EV_IDLE_ENABLE
1442 /* queue idle watchers unless other events are pending */ 1498 /* queue idle watchers unless other events are pending */
1443 if (idlecnt && !any_pending (EV_A)) 1499 idle_reify (EV_A);
1444 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1500#endif
1445 1501
1446 /* queue check watchers, to be executed first */ 1502 /* queue check watchers, to be executed first */
1447 if (expect_false (checkcnt)) 1503 if (expect_false (checkcnt))
1448 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1504 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1449 1505
… …
1485 head = &(*head)->next; 1541 head = &(*head)->next;
1486 } 1542 }
1487} 1543}
1488 1544
1489void inline_speed 1545void inline_speed
1490ev_clear_pending (EV_P_ W w) 1546clear_pending (EV_P_ W w)
1491{ 1547{
1492 if (w->pending) 1548 if (w->pending)
1493 { 1549 {
1494 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1550 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1495 w->pending = 0; 1551 w->pending = 0;
1496 } 1552 }
1497} 1553}
1498 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
1499void inline_speed 1581void inline_speed
1500ev_start (EV_P_ W w, int active) 1582ev_start (EV_P_ W w, int active)
1501{ 1583{
1502 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1584 pri_adjust (EV_A_ w);
1503 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1504
1505 w->active = active; 1585 w->active = active;
1506 ev_ref (EV_A); 1586 ev_ref (EV_A);
1507} 1587}
1508 1588
1509void inline_size 1589void inline_size
… …
1513 w->active = 0; 1593 w->active = 0;
1514} 1594}
1515 1595
1516/*****************************************************************************/ 1596/*****************************************************************************/
1517 1597
1518void 1598void noinline
1519ev_io_start (EV_P_ ev_io *w) 1599ev_io_start (EV_P_ ev_io *w)
1520{ 1600{
1521 int fd = w->fd; 1601 int fd = w->fd;
1522 1602
1523 if (expect_false (ev_is_active (w))) 1603 if (expect_false (ev_is_active (w)))
… …
1530 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1610 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1531 1611
1532 fd_change (EV_A_ fd); 1612 fd_change (EV_A_ fd);
1533} 1613}
1534 1614
1535void 1615void noinline
1536ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1537{ 1617{
1538 ev_clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1539 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1540 return; 1620 return;
1541 1621
1542 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));
1543 1623
… …
1545 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1546 1626
1547 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd);
1548} 1628}
1549 1629
1550void 1630void noinline
1551ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1552{ 1632{
1553 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1554 return; 1634 return;
1555 1635
… …
1563 upheap ((WT *)timers, timercnt - 1); 1643 upheap ((WT *)timers, timercnt - 1);
1564 1644
1565 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1566} 1646}
1567 1647
1568void 1648void noinline
1569ev_timer_stop (EV_P_ ev_timer *w) 1649ev_timer_stop (EV_P_ ev_timer *w)
1570{ 1650{
1571 ev_clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1572 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1573 return; 1653 return;
1574 1654
1575 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1576 1656
… …
1587 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1588 1668
1589 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1590} 1670}
1591 1671
1592void 1672void noinline
1593ev_timer_again (EV_P_ ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1594{ 1674{
1595 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1596 { 1676 {
1597 if (w->repeat) 1677 if (w->repeat)
… …
1608 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1609 } 1689 }
1610} 1690}
1611 1691
1612#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1613void 1693void noinline
1614ev_periodic_start (EV_P_ ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1615{ 1695{
1616 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1617 return; 1697 return;
1618 1698
… …
1620 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1621 else if (w->interval) 1701 else if (w->interval)
1622 { 1702 {
1623 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.));
1624 /* 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 */
1625 ((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;
1626 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1627 1709
1628 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1629 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1630 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = w;
1631 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap ((WT *)periodics, periodiccnt - 1);
1632 1714
1633 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1634} 1716}
1635 1717
1636void 1718void noinline
1637ev_periodic_stop (EV_P_ ev_periodic *w) 1719ev_periodic_stop (EV_P_ ev_periodic *w)
1638{ 1720{
1639 ev_clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1641 return; 1723 return;
1642 1724
1643 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1644 1726
… …
1653 } 1735 }
1654 1736
1655 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1656} 1738}
1657 1739
1658void 1740void noinline
1659ev_periodic_again (EV_P_ ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1660{ 1742{
1661 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1662 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1663 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
… …
1666 1748
1667#ifndef SA_RESTART 1749#ifndef SA_RESTART
1668# define SA_RESTART 0 1750# define SA_RESTART 0
1669#endif 1751#endif
1670 1752
1671void 1753void noinline
1672ev_signal_start (EV_P_ ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1673{ 1755{
1674#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1675 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));
1676#endif 1758#endif
… …
1695 sigaction (w->signum, &sa, 0); 1777 sigaction (w->signum, &sa, 0);
1696#endif 1778#endif
1697 } 1779 }
1698} 1780}
1699 1781
1700void 1782void noinline
1701ev_signal_stop (EV_P_ ev_signal *w) 1783ev_signal_stop (EV_P_ ev_signal *w)
1702{ 1784{
1703 ev_clear_pending (EV_A_ (W)w); 1785 clear_pending (EV_A_ (W)w);
1704 if (expect_false (!ev_is_active (w))) 1786 if (expect_false (!ev_is_active (w)))
1705 return; 1787 return;
1706 1788
1707 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1789 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1708 ev_stop (EV_A_ (W)w); 1790 ev_stop (EV_A_ (W)w);
… …
1725} 1807}
1726 1808
1727void 1809void
1728ev_child_stop (EV_P_ ev_child *w) 1810ev_child_stop (EV_P_ ev_child *w)
1729{ 1811{
1730 ev_clear_pending (EV_A_ (W)w); 1812 clear_pending (EV_A_ (W)w);
1731 if (expect_false (!ev_is_active (w))) 1813 if (expect_false (!ev_is_active (w)))
1732 return; 1814 return;
1733 1815
1734 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);
1735 ev_stop (EV_A_ (W)w); 1817 ev_stop (EV_A_ (W)w);
… …
1971} 2053}
1972 2054
1973void 2055void
1974ev_stat_stop (EV_P_ ev_stat *w) 2056ev_stat_stop (EV_P_ ev_stat *w)
1975{ 2057{
1976 ev_clear_pending (EV_A_ (W)w); 2058 clear_pending (EV_A_ (W)w);
1977 if (expect_false (!ev_is_active (w))) 2059 if (expect_false (!ev_is_active (w)))
1978 return; 2060 return;
1979 2061
1980#if EV_USE_INOTIFY 2062#if EV_USE_INOTIFY
1981 infy_del (EV_A_ w); 2063 infy_del (EV_A_ w);
… …
1984 2066
1985 ev_stop (EV_A_ (W)w); 2067 ev_stop (EV_A_ (W)w);
1986} 2068}
1987#endif 2069#endif
1988 2070
2071#if EV_IDLE_ENABLE
1989void 2072void
1990ev_idle_start (EV_P_ ev_idle *w) 2073ev_idle_start (EV_P_ ev_idle *w)
1991{ 2074{
1992 if (expect_false (ev_is_active (w))) 2075 if (expect_false (ev_is_active (w)))
1993 return; 2076 return;
1994 2077
2078 pri_adjust (EV_A_ (W)w);
2079
2080 {
2081 int active = ++idlecnt [ABSPRI (w)];
2082
2083 ++idleall;
1995 ev_start (EV_A_ (W)w, ++idlecnt); 2084 ev_start (EV_A_ (W)w, active);
2085
1996 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2086 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1997 idles [idlecnt - 1] = w; 2087 idles [ABSPRI (w)][active - 1] = w;
2088 }
1998} 2089}
1999 2090
2000void 2091void
2001ev_idle_stop (EV_P_ ev_idle *w) 2092ev_idle_stop (EV_P_ ev_idle *w)
2002{ 2093{
2003 ev_clear_pending (EV_A_ (W)w); 2094 clear_pending (EV_A_ (W)w);
2004 if (expect_false (!ev_is_active (w))) 2095 if (expect_false (!ev_is_active (w)))
2005 return; 2096 return;
2006 2097
2007 { 2098 {
2008 int active = ((W)w)->active; 2099 int active = ((W)w)->active;
2009 idles [active - 1] = idles [--idlecnt]; 2100
2101 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2010 ((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;
2011 } 2106 }
2012
2013 ev_stop (EV_A_ (W)w);
2014} 2107}
2108#endif
2015 2109
2016void 2110void
2017ev_prepare_start (EV_P_ ev_prepare *w) 2111ev_prepare_start (EV_P_ ev_prepare *w)
2018{ 2112{
2019 if (expect_false (ev_is_active (w))) 2113 if (expect_false (ev_is_active (w)))
… …
2025} 2119}
2026 2120
2027void 2121void
2028ev_prepare_stop (EV_P_ ev_prepare *w) 2122ev_prepare_stop (EV_P_ ev_prepare *w)
2029{ 2123{
2030 ev_clear_pending (EV_A_ (W)w); 2124 clear_pending (EV_A_ (W)w);
2031 if (expect_false (!ev_is_active (w))) 2125 if (expect_false (!ev_is_active (w)))
2032 return; 2126 return;
2033 2127
2034 { 2128 {
2035 int active = ((W)w)->active; 2129 int active = ((W)w)->active;
… …
2052} 2146}
2053 2147
2054void 2148void
2055ev_check_stop (EV_P_ ev_check *w) 2149ev_check_stop (EV_P_ ev_check *w)
2056{ 2150{
2057 ev_clear_pending (EV_A_ (W)w); 2151 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2152 if (expect_false (!ev_is_active (w)))
2059 return; 2153 return;
2060 2154
2061 { 2155 {
2062 int active = ((W)w)->active; 2156 int active = ((W)w)->active;
… …
2104} 2198}
2105 2199
2106void 2200void
2107ev_embed_stop (EV_P_ ev_embed *w) 2201ev_embed_stop (EV_P_ ev_embed *w)
2108{ 2202{
2109 ev_clear_pending (EV_A_ (W)w); 2203 clear_pending (EV_A_ (W)w);
2110 if (expect_false (!ev_is_active (w))) 2204 if (expect_false (!ev_is_active (w)))
2111 return; 2205 return;
2112 2206
2113 ev_io_stop (EV_A_ &w->io); 2207 ev_io_stop (EV_A_ &w->io);
2114 2208
… …
2129} 2223}
2130 2224
2131void 2225void
2132ev_fork_stop (EV_P_ ev_fork *w) 2226ev_fork_stop (EV_P_ ev_fork *w)
2133{ 2227{
2134 ev_clear_pending (EV_A_ (W)w); 2228 clear_pending (EV_A_ (W)w);
2135 if (expect_false (!ev_is_active (w))) 2229 if (expect_false (!ev_is_active (w)))
2136 return; 2230 return;
2137 2231
2138 { 2232 {
2139 int active = ((W)w)->active; 2233 int active = ((W)w)->active;

Diff Legend

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