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

Comparing libev/ev.c (file contents):
Revision 1.157 by root, Wed Nov 28 20:58:32 2007 UTC vs.
Revision 1.174 by root, Tue Dec 11 03:18:33 2007 UTC

… …
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 222#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 */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
224 224
225#if __GNUC__ >= 3 225#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 226# 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)) 227# 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 228#else
236# define expect(expr,value) (expr) 229# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 230# define noinline
231# if __STDC_VERSION__ < 199901L
232# define inline
233# endif
240#endif 234#endif
241 235
242#define expect_false(expr) expect ((expr) != 0, 0) 236#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 237#define expect_true(expr) expect ((expr) != 0, 1)
238#define inline_size static inline
239
240#if EV_MINIMAL
241# define inline_speed static noinline
242#else
243# define inline_speed static inline
244#endif
244 245
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 246#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) ((w)->priority - EV_MINPRI) 247#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 248
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 249#define EMPTY /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */ 250#define EMPTY2(a,b) /* used to suppress some warnings */
250 251
251typedef ev_watcher *W; 252typedef ev_watcher *W;
252typedef ev_watcher_list *WL; 253typedef ev_watcher_list *WL;
253typedef ev_watcher_time *WT; 254typedef ev_watcher_time *WT;
… …
396{ 397{
397 return ev_rt_now; 398 return ev_rt_now;
398} 399}
399#endif 400#endif
400 401
401#define array_roundsize(type,n) (((n) | 4) & ~3) 402int inline_size
403array_nextsize (int elem, int cur, int cnt)
404{
405 int ncur = cur + 1;
406
407 do
408 ncur <<= 1;
409 while (cnt > ncur);
410
411 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
412 if (elem * ncur > 4096)
413 {
414 ncur *= elem;
415 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
416 ncur = ncur - sizeof (void *) * 4;
417 ncur /= elem;
418 }
419
420 return ncur;
421}
422
423static noinline void *
424array_realloc (int elem, void *base, int *cur, int cnt)
425{
426 *cur = array_nextsize (elem, *cur, cnt);
427 return ev_realloc (base, elem * *cur);
428}
402 429
403#define array_needsize(type,base,cur,cnt,init) \ 430#define array_needsize(type,base,cur,cnt,init) \
404 if (expect_false ((cnt) > cur)) \ 431 if (expect_false ((cnt) > (cur))) \
405 { \ 432 { \
406 int newcnt = cur; \ 433 int ocur_ = (cur); \
407 do \ 434 (base) = (type *)array_realloc \
408 { \ 435 (sizeof (type), (base), &(cur), (cnt)); \
409 newcnt = array_roundsize (type, newcnt << 1); \ 436 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 } 437 }
417 438
439#if 0
418#define array_slim(type,stem) \ 440#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 441 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \ 442 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \ 443 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 444 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 445 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 } 446 }
447#endif
425 448
426#define array_free(stem, idx) \ 449#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 450 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
428 451
429/*****************************************************************************/ 452/*****************************************************************************/
430 453
431void noinline 454void noinline
432ev_feed_event (EV_P_ void *w, int revents) 455ev_feed_event (EV_P_ void *w, int revents)
433{ 456{
434 W w_ = (W)w; 457 W w_ = (W)w;
458 int pri = ABSPRI (w_);
435 459
436 if (expect_false (w_->pending)) 460 if (expect_false (w_->pending))
461 pendings [pri][w_->pending - 1].events |= revents;
462 else
437 { 463 {
464 w_->pending = ++pendingcnt [pri];
465 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
466 pendings [pri][w_->pending - 1].w = w_;
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 467 pendings [pri][w_->pending - 1].events = revents;
439 return;
440 } 468 }
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} 469}
447 470
448void inline_size 471void inline_size
449queue_events (EV_P_ W *events, int eventcnt, int type) 472queue_events (EV_P_ W *events, int eventcnt, int type)
450{ 473{
… …
485} 508}
486 509
487void 510void
488ev_feed_fd_event (EV_P_ int fd, int revents) 511ev_feed_fd_event (EV_P_ int fd, int revents)
489{ 512{
513 if (fd >= 0 && fd < anfdmax)
490 fd_event (EV_A_ fd, revents); 514 fd_event (EV_A_ fd, revents);
491} 515}
492 516
493void inline_size 517void inline_size
494fd_reify (EV_P) 518fd_reify (EV_P)
495{ 519{
… …
725 for (signum = signalmax; signum--; ) 749 for (signum = signalmax; signum--; )
726 if (signals [signum].gotsig) 750 if (signals [signum].gotsig)
727 ev_feed_signal_event (EV_A_ signum + 1); 751 ev_feed_signal_event (EV_A_ signum + 1);
728} 752}
729 753
730void inline_size 754void inline_speed
731fd_intern (int fd) 755fd_intern (int fd)
732{ 756{
733#ifdef _WIN32 757#ifdef _WIN32
734 int arg = 1; 758 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
764 ev_child *w; 788 ev_child *w;
765 789
766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 790 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
767 if (w->pid == pid || !w->pid) 791 if (w->pid == pid || !w->pid)
768 { 792 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 793 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
770 w->rpid = pid; 794 w->rpid = pid;
771 w->rstatus = status; 795 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD); 796 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 } 797 }
774} 798}
775 799
776#ifndef WCONTINUED 800#ifndef WCONTINUED
… …
886ev_backend (EV_P) 910ev_backend (EV_P)
887{ 911{
888 return backend; 912 return backend;
889} 913}
890 914
915unsigned int
916ev_loop_count (EV_P)
917{
918 return loop_count;
919}
920
891static void noinline 921static void noinline
892loop_init (EV_P_ unsigned int flags) 922loop_init (EV_P_ unsigned int flags)
893{ 923{
894 if (!backend) 924 if (!backend)
895 { 925 {
… …
904 ev_rt_now = ev_time (); 934 ev_rt_now = ev_time ();
905 mn_now = get_clock (); 935 mn_now = get_clock ();
906 now_floor = mn_now; 936 now_floor = mn_now;
907 rtmn_diff = ev_rt_now - mn_now; 937 rtmn_diff = ev_rt_now - mn_now;
908 938
939 /* pid check not overridable via env */
940#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid ();
943#endif
944
909 if (!(flags & EVFLAG_NOENV) 945 if (!(flags & EVFLAG_NOENV)
910 && !enable_secure () 946 && !enable_secure ()
911 && getenv ("LIBEV_FLAGS")) 947 && getenv ("LIBEV_FLAGS"))
912 flags = atoi (getenv ("LIBEV_FLAGS")); 948 flags = atoi (getenv ("LIBEV_FLAGS"));
913 949
… …
969#if EV_USE_SELECT 1005#if EV_USE_SELECT
970 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1006 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
971#endif 1007#endif
972 1008
973 for (i = NUMPRI; i--; ) 1009 for (i = NUMPRI; i--; )
1010 {
974 array_free (pending, [i]); 1011 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE
1013 array_free (idle, [i]);
1014#endif
1015 }
975 1016
976 /* have to use the microsoft-never-gets-it-right macro */ 1017 /* have to use the microsoft-never-gets-it-right macro */
977 array_free (fdchange, EMPTY0); 1018 array_free (fdchange, EMPTY);
978 array_free (timer, EMPTY0); 1019 array_free (timer, EMPTY);
979#if EV_PERIODIC_ENABLE 1020#if EV_PERIODIC_ENABLE
980 array_free (periodic, EMPTY0); 1021 array_free (periodic, EMPTY);
981#endif 1022#endif
982 array_free (idle, EMPTY0);
983 array_free (prepare, EMPTY0); 1023 array_free (prepare, EMPTY);
984 array_free (check, EMPTY0); 1024 array_free (check, EMPTY);
985 1025
986 backend = 0; 1026 backend = 0;
987} 1027}
988 1028
989void inline_size infy_fork (EV_P); 1029void inline_size infy_fork (EV_P);
… …
1125 postfork = 1; 1165 postfork = 1;
1126} 1166}
1127 1167
1128/*****************************************************************************/ 1168/*****************************************************************************/
1129 1169
1130int inline_size 1170void
1131any_pending (EV_P) 1171ev_invoke (EV_P_ void *w, int revents)
1132{ 1172{
1133 int pri; 1173 EV_CB_INVOKE ((W)w, revents);
1134
1135 for (pri = NUMPRI; pri--; )
1136 if (pendingcnt [pri])
1137 return 1;
1138
1139 return 0;
1140} 1174}
1141 1175
1142void inline_speed 1176void inline_speed
1143call_pending (EV_P) 1177call_pending (EV_P)
1144{ 1178{
… …
1197 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1198 1232
1199 /* first reschedule or stop timer */ 1233 /* first reschedule or stop timer */
1200 if (w->reschedule_cb) 1234 if (w->reschedule_cb)
1201 { 1235 {
1202 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001220703125 /* 1/8192 */);
1203 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1204 downheap ((WT *)periodics, periodiccnt, 0); 1238 downheap ((WT *)periodics, periodiccnt, 0);
1205 } 1239 }
1206 else if (w->interval) 1240 else if (w->interval)
1207 { 1241 {
1208 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1242 ((WT)w)->at = w->offset + floor ((ev_rt_now - w->offset) / w->interval + 1.) * w->interval;
1209 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1210 downheap ((WT *)periodics, periodiccnt, 0); 1244 downheap ((WT *)periodics, periodiccnt, 0);
1211 } 1245 }
1212 else 1246 else
1213 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
1227 ev_periodic *w = periodics [i]; 1261 ev_periodic *w = periodics [i];
1228 1262
1229 if (w->reschedule_cb) 1263 if (w->reschedule_cb)
1230 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1231 else if (w->interval) 1265 else if (w->interval)
1232 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1266 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1233 } 1267 }
1234 1268
1235 /* now rebuild the heap */ 1269 /* now rebuild the heap */
1236 for (i = periodiccnt >> 1; i--; ) 1270 for (i = periodiccnt >> 1; i--; )
1237 downheap ((WT *)periodics, periodiccnt, i); 1271 downheap ((WT *)periodics, periodiccnt, i);
1272}
1273#endif
1274
1275#if EV_IDLE_ENABLE
1276void inline_size
1277idle_reify (EV_P)
1278{
1279 if (expect_false (idleall))
1280 {
1281 int pri;
1282
1283 for (pri = NUMPRI; pri--; )
1284 {
1285 if (pendingcnt [pri])
1286 break;
1287
1288 if (idlecnt [pri])
1289 {
1290 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1291 break;
1292 }
1293 }
1294 }
1238} 1295}
1239#endif 1296#endif
1240 1297
1241int inline_size 1298int inline_size
1242time_update_monotonic (EV_P) 1299time_update_monotonic (EV_P)
… …
1334{ 1391{
1335 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1392 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1336 ? EVUNLOOP_ONE 1393 ? EVUNLOOP_ONE
1337 : EVUNLOOP_CANCEL; 1394 : EVUNLOOP_CANCEL;
1338 1395
1339 while (activecnt) 1396 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1397
1398 do
1340 { 1399 {
1400#ifndef _WIN32
1401 if (expect_false (curpid)) /* penalise the forking check even more */
1402 if (expect_false (getpid () != curpid))
1403 {
1404 curpid = getpid ();
1405 postfork = 1;
1406 }
1407#endif
1408
1341#if EV_FORK_ENABLE 1409#if EV_FORK_ENABLE
1342 /* we might have forked, so queue fork handlers */ 1410 /* we might have forked, so queue fork handlers */
1343 if (expect_false (postfork)) 1411 if (expect_false (postfork))
1344 if (forkcnt) 1412 if (forkcnt)
1345 { 1413 {
1346 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1347 call_pending (EV_A); 1415 call_pending (EV_A);
1348 } 1416 }
1349#endif 1417#endif
1350 1418
1351 /* queue check watchers (and execute them) */ 1419 /* queue prepare watchers (and execute them) */
1352 if (expect_false (preparecnt)) 1420 if (expect_false (preparecnt))
1353 { 1421 {
1354 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1355 call_pending (EV_A); 1423 call_pending (EV_A);
1356 } 1424 }
1357 1425
1426 if (expect_false (!activecnt))
1427 break;
1428
1358 /* we might have forked, so reify kernel state if necessary */ 1429 /* we might have forked, so reify kernel state if necessary */
1359 if (expect_false (postfork)) 1430 if (expect_false (postfork))
1360 loop_fork (EV_A); 1431 loop_fork (EV_A);
1361 1432
1362 /* update fd-related kernel structures */ 1433 /* update fd-related kernel structures */
… …
1364 1435
1365 /* calculate blocking time */ 1436 /* calculate blocking time */
1366 { 1437 {
1367 ev_tstamp block; 1438 ev_tstamp block;
1368 1439
1369 if (flags & EVLOOP_NONBLOCK || idlecnt) 1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1370 block = 0.; /* do not block at all */ 1441 block = 0.; /* do not block at all */
1371 else 1442 else
1372 { 1443 {
1373 /* update time to cancel out callback processing overhead */ 1444 /* update time to cancel out callback processing overhead */
1374#if EV_USE_MONOTONIC 1445#if EV_USE_MONOTONIC
… …
1398#endif 1469#endif
1399 1470
1400 if (expect_false (block < 0.)) block = 0.; 1471 if (expect_false (block < 0.)) block = 0.;
1401 } 1472 }
1402 1473
1474 ++loop_count;
1403 backend_poll (EV_A_ block); 1475 backend_poll (EV_A_ block);
1404 } 1476 }
1405 1477
1406 /* update ev_rt_now, do magic */ 1478 /* update ev_rt_now, do magic */
1407 time_update (EV_A); 1479 time_update (EV_A);
… …
1410 timers_reify (EV_A); /* relative timers called last */ 1482 timers_reify (EV_A); /* relative timers called last */
1411#if EV_PERIODIC_ENABLE 1483#if EV_PERIODIC_ENABLE
1412 periodics_reify (EV_A); /* absolute timers called first */ 1484 periodics_reify (EV_A); /* absolute timers called first */
1413#endif 1485#endif
1414 1486
1487#if EV_IDLE_ENABLE
1415 /* queue idle watchers unless other events are pending */ 1488 /* queue idle watchers unless other events are pending */
1416 if (idlecnt && !any_pending (EV_A)) 1489 idle_reify (EV_A);
1417 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1490#endif
1418 1491
1419 /* queue check watchers, to be executed first */ 1492 /* queue check watchers, to be executed first */
1420 if (expect_false (checkcnt)) 1493 if (expect_false (checkcnt))
1421 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1494 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1422 1495
1423 call_pending (EV_A); 1496 call_pending (EV_A);
1424 1497
1425 if (expect_false (loop_done))
1426 break;
1427 } 1498 }
1499 while (expect_true (activecnt && !loop_done));
1428 1500
1429 if (loop_done == EVUNLOOP_ONE) 1501 if (loop_done == EVUNLOOP_ONE)
1430 loop_done = EVUNLOOP_CANCEL; 1502 loop_done = EVUNLOOP_CANCEL;
1431} 1503}
1432 1504
… …
1459 head = &(*head)->next; 1531 head = &(*head)->next;
1460 } 1532 }
1461} 1533}
1462 1534
1463void inline_speed 1535void inline_speed
1464ev_clear_pending (EV_P_ W w) 1536clear_pending (EV_P_ W w)
1465{ 1537{
1466 if (w->pending) 1538 if (w->pending)
1467 { 1539 {
1468 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1540 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1469 w->pending = 0; 1541 w->pending = 0;
1470 } 1542 }
1471} 1543}
1472 1544
1545int
1546ev_clear_pending (EV_P_ void *w)
1547{
1548 W w_ = (W)w;
1549 int pending = w_->pending;
1550
1551 if (expect_true (pending))
1552 {
1553 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1554 w_->pending = 0;
1555 p->w = 0;
1556 return p->events;
1557 }
1558 else
1559 return 0;
1560}
1561
1562void inline_size
1563pri_adjust (EV_P_ W w)
1564{
1565 int pri = w->priority;
1566 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1567 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1568 w->priority = pri;
1569}
1570
1473void inline_speed 1571void inline_speed
1474ev_start (EV_P_ W w, int active) 1572ev_start (EV_P_ W w, int active)
1475{ 1573{
1476 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1574 pri_adjust (EV_A_ w);
1477 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1478
1479 w->active = active; 1575 w->active = active;
1480 ev_ref (EV_A); 1576 ev_ref (EV_A);
1481} 1577}
1482 1578
1483void inline_size 1579void inline_size
… …
1487 w->active = 0; 1583 w->active = 0;
1488} 1584}
1489 1585
1490/*****************************************************************************/ 1586/*****************************************************************************/
1491 1587
1492void 1588void noinline
1493ev_io_start (EV_P_ ev_io *w) 1589ev_io_start (EV_P_ ev_io *w)
1494{ 1590{
1495 int fd = w->fd; 1591 int fd = w->fd;
1496 1592
1497 if (expect_false (ev_is_active (w))) 1593 if (expect_false (ev_is_active (w)))
… …
1504 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1600 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1505 1601
1506 fd_change (EV_A_ fd); 1602 fd_change (EV_A_ fd);
1507} 1603}
1508 1604
1509void 1605void noinline
1510ev_io_stop (EV_P_ ev_io *w) 1606ev_io_stop (EV_P_ ev_io *w)
1511{ 1607{
1512 ev_clear_pending (EV_A_ (W)w); 1608 clear_pending (EV_A_ (W)w);
1513 if (expect_false (!ev_is_active (w))) 1609 if (expect_false (!ev_is_active (w)))
1514 return; 1610 return;
1515 1611
1516 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1612 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1517 1613
… …
1519 ev_stop (EV_A_ (W)w); 1615 ev_stop (EV_A_ (W)w);
1520 1616
1521 fd_change (EV_A_ w->fd); 1617 fd_change (EV_A_ w->fd);
1522} 1618}
1523 1619
1524void 1620void noinline
1525ev_timer_start (EV_P_ ev_timer *w) 1621ev_timer_start (EV_P_ ev_timer *w)
1526{ 1622{
1527 if (expect_false (ev_is_active (w))) 1623 if (expect_false (ev_is_active (w)))
1528 return; 1624 return;
1529 1625
… …
1537 upheap ((WT *)timers, timercnt - 1); 1633 upheap ((WT *)timers, timercnt - 1);
1538 1634
1539 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1635 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1540} 1636}
1541 1637
1542void 1638void noinline
1543ev_timer_stop (EV_P_ ev_timer *w) 1639ev_timer_stop (EV_P_ ev_timer *w)
1544{ 1640{
1545 ev_clear_pending (EV_A_ (W)w); 1641 clear_pending (EV_A_ (W)w);
1546 if (expect_false (!ev_is_active (w))) 1642 if (expect_false (!ev_is_active (w)))
1547 return; 1643 return;
1548 1644
1549 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1645 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1550 1646
… …
1561 ((WT)w)->at -= mn_now; 1657 ((WT)w)->at -= mn_now;
1562 1658
1563 ev_stop (EV_A_ (W)w); 1659 ev_stop (EV_A_ (W)w);
1564} 1660}
1565 1661
1566void 1662void noinline
1567ev_timer_again (EV_P_ ev_timer *w) 1663ev_timer_again (EV_P_ ev_timer *w)
1568{ 1664{
1569 if (ev_is_active (w)) 1665 if (ev_is_active (w))
1570 { 1666 {
1571 if (w->repeat) 1667 if (w->repeat)
… …
1582 ev_timer_start (EV_A_ w); 1678 ev_timer_start (EV_A_ w);
1583 } 1679 }
1584} 1680}
1585 1681
1586#if EV_PERIODIC_ENABLE 1682#if EV_PERIODIC_ENABLE
1587void 1683void noinline
1588ev_periodic_start (EV_P_ ev_periodic *w) 1684ev_periodic_start (EV_P_ ev_periodic *w)
1589{ 1685{
1590 if (expect_false (ev_is_active (w))) 1686 if (expect_false (ev_is_active (w)))
1591 return; 1687 return;
1592 1688
… …
1594 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1690 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1595 else if (w->interval) 1691 else if (w->interval)
1596 { 1692 {
1597 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1693 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1598 /* this formula differs from the one in periodic_reify because we do not always round up */ 1694 /* this formula differs from the one in periodic_reify because we do not always round up */
1599 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1695 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1600 } 1696 }
1697 else
1698 ((WT)w)->at = w->offset;
1601 1699
1602 ev_start (EV_A_ (W)w, ++periodiccnt); 1700 ev_start (EV_A_ (W)w, ++periodiccnt);
1603 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1701 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1604 periodics [periodiccnt - 1] = w; 1702 periodics [periodiccnt - 1] = w;
1605 upheap ((WT *)periodics, periodiccnt - 1); 1703 upheap ((WT *)periodics, periodiccnt - 1);
1606 1704
1607 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1705 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1608} 1706}
1609 1707
1610void 1708void noinline
1611ev_periodic_stop (EV_P_ ev_periodic *w) 1709ev_periodic_stop (EV_P_ ev_periodic *w)
1612{ 1710{
1613 ev_clear_pending (EV_A_ (W)w); 1711 clear_pending (EV_A_ (W)w);
1614 if (expect_false (!ev_is_active (w))) 1712 if (expect_false (!ev_is_active (w)))
1615 return; 1713 return;
1616 1714
1617 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1715 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1618 1716
… …
1627 } 1725 }
1628 1726
1629 ev_stop (EV_A_ (W)w); 1727 ev_stop (EV_A_ (W)w);
1630} 1728}
1631 1729
1632void 1730void noinline
1633ev_periodic_again (EV_P_ ev_periodic *w) 1731ev_periodic_again (EV_P_ ev_periodic *w)
1634{ 1732{
1635 /* TODO: use adjustheap and recalculation */ 1733 /* TODO: use adjustheap and recalculation */
1636 ev_periodic_stop (EV_A_ w); 1734 ev_periodic_stop (EV_A_ w);
1637 ev_periodic_start (EV_A_ w); 1735 ev_periodic_start (EV_A_ w);
… …
1640 1738
1641#ifndef SA_RESTART 1739#ifndef SA_RESTART
1642# define SA_RESTART 0 1740# define SA_RESTART 0
1643#endif 1741#endif
1644 1742
1645void 1743void noinline
1646ev_signal_start (EV_P_ ev_signal *w) 1744ev_signal_start (EV_P_ ev_signal *w)
1647{ 1745{
1648#if EV_MULTIPLICITY 1746#if EV_MULTIPLICITY
1649 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1747 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1650#endif 1748#endif
… …
1669 sigaction (w->signum, &sa, 0); 1767 sigaction (w->signum, &sa, 0);
1670#endif 1768#endif
1671 } 1769 }
1672} 1770}
1673 1771
1674void 1772void noinline
1675ev_signal_stop (EV_P_ ev_signal *w) 1773ev_signal_stop (EV_P_ ev_signal *w)
1676{ 1774{
1677 ev_clear_pending (EV_A_ (W)w); 1775 clear_pending (EV_A_ (W)w);
1678 if (expect_false (!ev_is_active (w))) 1776 if (expect_false (!ev_is_active (w)))
1679 return; 1777 return;
1680 1778
1681 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1682 ev_stop (EV_A_ (W)w); 1780 ev_stop (EV_A_ (W)w);
… …
1699} 1797}
1700 1798
1701void 1799void
1702ev_child_stop (EV_P_ ev_child *w) 1800ev_child_stop (EV_P_ ev_child *w)
1703{ 1801{
1704 ev_clear_pending (EV_A_ (W)w); 1802 clear_pending (EV_A_ (W)w);
1705 if (expect_false (!ev_is_active (w))) 1803 if (expect_false (!ev_is_active (w)))
1706 return; 1804 return;
1707 1805
1708 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1806 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1709 ev_stop (EV_A_ (W)w); 1807 ev_stop (EV_A_ (W)w);
… …
1945} 2043}
1946 2044
1947void 2045void
1948ev_stat_stop (EV_P_ ev_stat *w) 2046ev_stat_stop (EV_P_ ev_stat *w)
1949{ 2047{
1950 ev_clear_pending (EV_A_ (W)w); 2048 clear_pending (EV_A_ (W)w);
1951 if (expect_false (!ev_is_active (w))) 2049 if (expect_false (!ev_is_active (w)))
1952 return; 2050 return;
1953 2051
1954#if EV_USE_INOTIFY 2052#if EV_USE_INOTIFY
1955 infy_del (EV_A_ w); 2053 infy_del (EV_A_ w);
… …
1958 2056
1959 ev_stop (EV_A_ (W)w); 2057 ev_stop (EV_A_ (W)w);
1960} 2058}
1961#endif 2059#endif
1962 2060
2061#if EV_IDLE_ENABLE
1963void 2062void
1964ev_idle_start (EV_P_ ev_idle *w) 2063ev_idle_start (EV_P_ ev_idle *w)
1965{ 2064{
1966 if (expect_false (ev_is_active (w))) 2065 if (expect_false (ev_is_active (w)))
1967 return; 2066 return;
1968 2067
2068 pri_adjust (EV_A_ (W)w);
2069
2070 {
2071 int active = ++idlecnt [ABSPRI (w)];
2072
2073 ++idleall;
1969 ev_start (EV_A_ (W)w, ++idlecnt); 2074 ev_start (EV_A_ (W)w, active);
2075
1970 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2076 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1971 idles [idlecnt - 1] = w; 2077 idles [ABSPRI (w)][active - 1] = w;
2078 }
1972} 2079}
1973 2080
1974void 2081void
1975ev_idle_stop (EV_P_ ev_idle *w) 2082ev_idle_stop (EV_P_ ev_idle *w)
1976{ 2083{
1977 ev_clear_pending (EV_A_ (W)w); 2084 clear_pending (EV_A_ (W)w);
1978 if (expect_false (!ev_is_active (w))) 2085 if (expect_false (!ev_is_active (w)))
1979 return; 2086 return;
1980 2087
1981 { 2088 {
1982 int active = ((W)w)->active; 2089 int active = ((W)w)->active;
1983 idles [active - 1] = idles [--idlecnt]; 2090
2091 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1984 ((W)idles [active - 1])->active = active; 2092 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2093
2094 ev_stop (EV_A_ (W)w);
2095 --idleall;
1985 } 2096 }
1986
1987 ev_stop (EV_A_ (W)w);
1988} 2097}
2098#endif
1989 2099
1990void 2100void
1991ev_prepare_start (EV_P_ ev_prepare *w) 2101ev_prepare_start (EV_P_ ev_prepare *w)
1992{ 2102{
1993 if (expect_false (ev_is_active (w))) 2103 if (expect_false (ev_is_active (w)))
… …
1999} 2109}
2000 2110
2001void 2111void
2002ev_prepare_stop (EV_P_ ev_prepare *w) 2112ev_prepare_stop (EV_P_ ev_prepare *w)
2003{ 2113{
2004 ev_clear_pending (EV_A_ (W)w); 2114 clear_pending (EV_A_ (W)w);
2005 if (expect_false (!ev_is_active (w))) 2115 if (expect_false (!ev_is_active (w)))
2006 return; 2116 return;
2007 2117
2008 { 2118 {
2009 int active = ((W)w)->active; 2119 int active = ((W)w)->active;
… …
2026} 2136}
2027 2137
2028void 2138void
2029ev_check_stop (EV_P_ ev_check *w) 2139ev_check_stop (EV_P_ ev_check *w)
2030{ 2140{
2031 ev_clear_pending (EV_A_ (W)w); 2141 clear_pending (EV_A_ (W)w);
2032 if (expect_false (!ev_is_active (w))) 2142 if (expect_false (!ev_is_active (w)))
2033 return; 2143 return;
2034 2144
2035 { 2145 {
2036 int active = ((W)w)->active; 2146 int active = ((W)w)->active;
… …
2078} 2188}
2079 2189
2080void 2190void
2081ev_embed_stop (EV_P_ ev_embed *w) 2191ev_embed_stop (EV_P_ ev_embed *w)
2082{ 2192{
2083 ev_clear_pending (EV_A_ (W)w); 2193 clear_pending (EV_A_ (W)w);
2084 if (expect_false (!ev_is_active (w))) 2194 if (expect_false (!ev_is_active (w)))
2085 return; 2195 return;
2086 2196
2087 ev_io_stop (EV_A_ &w->io); 2197 ev_io_stop (EV_A_ &w->io);
2088 2198
… …
2103} 2213}
2104 2214
2105void 2215void
2106ev_fork_stop (EV_P_ ev_fork *w) 2216ev_fork_stop (EV_P_ ev_fork *w)
2107{ 2217{
2108 ev_clear_pending (EV_A_ (W)w); 2218 clear_pending (EV_A_ (W)w);
2109 if (expect_false (!ev_is_active (w))) 2219 if (expect_false (!ev_is_active (w)))
2110 return; 2220 return;
2111 2221
2112 { 2222 {
2113 int active = ((W)w)->active; 2223 int active = ((W)w)->active;

Diff Legend

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