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

Comparing libev/ev.c (file contents):
Revision 1.164 by root, Fri Dec 7 16:44:10 2007 UTC vs.
Revision 1.181 by root, Wed Dec 12 00:17:08 2007 UTC

… …
216# include <sys/inotify.h> 216# include <sys/inotify.h>
217#endif 217#endif
218 218
219/**/ 219/**/
220 220
221/*
222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding
225 * errors are against us.
226 * This value is good at least till the year 4000.
227 * Better solutions welcome.
228 */
229#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
230
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 234
225#if __GNUC__ >= 3 235#if __GNUC__ >= 3
226# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 237# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
235#else 238#else
236# define expect(expr,value) (expr) 239# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 240# define noinline
241# if __STDC_VERSION__ < 199901L
242# define inline
243# endif
240#endif 244#endif
241 245
242#define expect_false(expr) expect ((expr) != 0, 0) 246#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 247#define expect_true(expr) expect ((expr) != 0, 1)
248#define inline_size static inline
249
250#if EV_MINIMAL
251# define inline_speed static noinline
252#else
253# define inline_speed static inline
254#endif
244 255
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 256#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 257#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 258
248#define EMPTY /* required for microsofts broken pseudo-c compiler */ 259#define EMPTY /* required for microsofts broken pseudo-c compiler */
… …
417 } 428 }
418 429
419 return ncur; 430 return ncur;
420} 431}
421 432
422inline_speed void * 433static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 434array_realloc (int elem, void *base, int *cur, int cnt)
424{ 435{
425 *cur = array_nextsize (elem, *cur, cnt); 436 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 437 return ev_realloc (base, elem * *cur);
427} 438}
… …
452 463
453void noinline 464void noinline
454ev_feed_event (EV_P_ void *w, int revents) 465ev_feed_event (EV_P_ void *w, int revents)
455{ 466{
456 W w_ = (W)w; 467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
457 469
458 if (expect_false (w_->pending)) 470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
459 { 473 {
474 w_->pending = ++pendingcnt [pri];
475 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
476 pendings [pri][w_->pending - 1].w = w_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 477 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 478 }
463
464 w_->pending = ++pendingcnt [ABSPRI (w_)];
465 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
466 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
467 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
468} 479}
469 480
470void inline_size 481void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 482queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 483{
473 int i; 484 int i;
474 485
475 for (i = 0; i < eventcnt; ++i) 486 for (i = 0; i < eventcnt; ++i)
… …
507} 518}
508 519
509void 520void
510ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 522{
523 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
513} 525}
514 526
515void inline_size 527void inline_size
516fd_reify (EV_P) 528fd_reify (EV_P)
517{ 529{
… …
626void inline_speed 638void inline_speed
627upheap (WT *heap, int k) 639upheap (WT *heap, int k)
628{ 640{
629 WT w = heap [k]; 641 WT w = heap [k];
630 642
631 while (k && heap [k >> 1]->at > w->at) 643 while (k)
632 { 644 {
645 int p = (k - 1) >> 1;
646
647 if (heap [p]->at <= w->at)
648 break;
649
633 heap [k] = heap [k >> 1]; 650 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 651 ((W)heap [k])->active = k + 1;
635 k >>= 1; 652 k = p;
636 } 653 }
637 654
638 heap [k] = w; 655 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 656 ((W)heap [k])->active = k + 1;
640
641} 657}
642 658
643void inline_speed 659void inline_speed
644downheap (WT *heap, int N, int k) 660downheap (WT *heap, int N, int k)
645{ 661{
646 WT w = heap [k]; 662 WT w = heap [k];
647 663
648 while (k < (N >> 1)) 664 for (;;)
649 { 665 {
650 int j = k << 1; 666 int c = (k << 1) + 1;
651 667
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 668 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 669 break;
657 670
671 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
672 ? 1 : 0;
673
674 if (w->at <= heap [c]->at)
675 break;
676
658 heap [k] = heap [j]; 677 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 678 ((W)heap [k])->active = k + 1;
679
660 k = j; 680 k = c;
661 } 681 }
662 682
663 heap [k] = w; 683 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 684 ((W)heap [k])->active = k + 1;
665} 685}
… …
747 for (signum = signalmax; signum--; ) 767 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 768 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 769 ev_feed_signal_event (EV_A_ signum + 1);
750} 770}
751 771
752void inline_size 772void inline_speed
753fd_intern (int fd) 773fd_intern (int fd)
754{ 774{
755#ifdef _WIN32 775#ifdef _WIN32
756 int arg = 1; 776 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 777 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1163 postfork = 1; 1183 postfork = 1;
1164} 1184}
1165 1185
1166/*****************************************************************************/ 1186/*****************************************************************************/
1167 1187
1188void
1189ev_invoke (EV_P_ void *w, int revents)
1190{
1191 EV_CB_INVOKE ((W)w, revents);
1192}
1193
1168void inline_speed 1194void inline_speed
1169call_pending (EV_P) 1195call_pending (EV_P)
1170{ 1196{
1171 int pri; 1197 int pri;
1172 1198
… …
1188void inline_size 1214void inline_size
1189timers_reify (EV_P) 1215timers_reify (EV_P)
1190{ 1216{
1191 while (timercnt && ((WT)timers [0])->at <= mn_now) 1217 while (timercnt && ((WT)timers [0])->at <= mn_now)
1192 { 1218 {
1193 ev_timer *w = timers [0]; 1219 ev_timer *w = (ev_timer *)timers [0];
1194 1220
1195 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1221 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1196 1222
1197 /* first reschedule or stop timer */ 1223 /* first reschedule or stop timer */
1198 if (w->repeat) 1224 if (w->repeat)
… …
1201 1227
1202 ((WT)w)->at += w->repeat; 1228 ((WT)w)->at += w->repeat;
1203 if (((WT)w)->at < mn_now) 1229 if (((WT)w)->at < mn_now)
1204 ((WT)w)->at = mn_now; 1230 ((WT)w)->at = mn_now;
1205 1231
1206 downheap ((WT *)timers, timercnt, 0); 1232 downheap (timers, timercnt, 0);
1207 } 1233 }
1208 else 1234 else
1209 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1235 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1210 1236
1211 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1237 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1216void inline_size 1242void inline_size
1217periodics_reify (EV_P) 1243periodics_reify (EV_P)
1218{ 1244{
1219 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1245 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1220 { 1246 {
1221 ev_periodic *w = periodics [0]; 1247 ev_periodic *w = (ev_periodic *)periodics [0];
1222 1248
1223 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1249 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1224 1250
1225 /* first reschedule or stop timer */ 1251 /* first reschedule or stop timer */
1226 if (w->reschedule_cb) 1252 if (w->reschedule_cb)
1227 { 1253 {
1228 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1254 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1229 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1255 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1230 downheap ((WT *)periodics, periodiccnt, 0); 1256 downheap (periodics, periodiccnt, 0);
1231 } 1257 }
1232 else if (w->interval) 1258 else if (w->interval)
1233 { 1259 {
1234 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1260 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1261 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1235 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1262 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1236 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1237 } 1264 }
1238 else 1265 else
1239 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1266 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1240 1267
1241 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1268 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1248 int i; 1275 int i;
1249 1276
1250 /* adjust periodics after time jump */ 1277 /* adjust periodics after time jump */
1251 for (i = 0; i < periodiccnt; ++i) 1278 for (i = 0; i < periodiccnt; ++i)
1252 { 1279 {
1253 ev_periodic *w = periodics [i]; 1280 ev_periodic *w = (ev_periodic *)periodics [i];
1254 1281
1255 if (w->reschedule_cb) 1282 if (w->reschedule_cb)
1256 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1283 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257 else if (w->interval) 1284 else if (w->interval)
1258 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1285 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1259 } 1286 }
1260 1287
1261 /* now rebuild the heap */ 1288 /* now rebuild the heap */
1262 for (i = periodiccnt >> 1; i--; ) 1289 for (i = periodiccnt >> 1; i--; )
1263 downheap ((WT *)periodics, periodiccnt, i); 1290 downheap (periodics, periodiccnt, i);
1264} 1291}
1265#endif 1292#endif
1266 1293
1267#if EV_IDLE_ENABLE 1294#if EV_IDLE_ENABLE
1268void inline_size 1295void inline_size
1269idle_reify (EV_P) 1296idle_reify (EV_P)
1270{ 1297{
1271 if (expect_false (!idleall)) 1298 if (expect_false (idleall))
1272 { 1299 {
1273 int pri; 1300 int pri;
1274 1301
1275 for (pri = NUMPRI; pri--; ) 1302 for (pri = NUMPRI; pri--; )
1276 { 1303 {
… …
1285 } 1312 }
1286 } 1313 }
1287} 1314}
1288#endif 1315#endif
1289 1316
1290int inline_size 1317void inline_speed
1291time_update_monotonic (EV_P) 1318time_update (EV_P_ ev_tstamp max_block)
1292{ 1319{
1320 int i;
1321
1322#if EV_USE_MONOTONIC
1323 if (expect_true (have_monotonic))
1324 {
1325 ev_tstamp odiff = rtmn_diff;
1326
1293 mn_now = get_clock (); 1327 mn_now = get_clock ();
1294 1328
1329 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1330 /* interpolate in the meantime */
1295 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1331 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1296 { 1332 {
1297 ev_rt_now = rtmn_diff + mn_now; 1333 ev_rt_now = rtmn_diff + mn_now;
1298 return 0; 1334 return;
1299 } 1335 }
1300 else 1336
1301 {
1302 now_floor = mn_now; 1337 now_floor = mn_now;
1303 ev_rt_now = ev_time (); 1338 ev_rt_now = ev_time ();
1304 return 1;
1305 }
1306}
1307 1339
1308void inline_size 1340 /* loop a few times, before making important decisions.
1309time_update (EV_P) 1341 * on the choice of "4": one iteration isn't enough,
1310{ 1342 * in case we get preempted during the calls to
1311 int i; 1343 * ev_time and get_clock. a second call is almost guaranteed
1312 1344 * to succeed in that case, though. and looping a few more times
1313#if EV_USE_MONOTONIC 1345 * doesn't hurt either as we only do this on time-jumps or
1314 if (expect_true (have_monotonic)) 1346 * in the unlikely event of having been preempted here.
1315 { 1347 */
1316 if (time_update_monotonic (EV_A)) 1348 for (i = 4; --i; )
1317 { 1349 {
1318 ev_tstamp odiff = rtmn_diff;
1319
1320 /* loop a few times, before making important decisions.
1321 * on the choice of "4": one iteration isn't enough,
1322 * in case we get preempted during the calls to
1323 * ev_time and get_clock. a second call is almost guaranteed
1324 * to succeed in that case, though. and looping a few more times
1325 * doesn't hurt either as we only do this on time-jumps or
1326 * in the unlikely event of having been preempted here.
1327 */
1328 for (i = 4; --i; )
1329 {
1330 rtmn_diff = ev_rt_now - mn_now; 1350 rtmn_diff = ev_rt_now - mn_now;
1331 1351
1332 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1352 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1333 return; /* all is well */ 1353 return; /* all is well */
1334 1354
1335 ev_rt_now = ev_time (); 1355 ev_rt_now = ev_time ();
1336 mn_now = get_clock (); 1356 mn_now = get_clock ();
1337 now_floor = mn_now; 1357 now_floor = mn_now;
1338 } 1358 }
1339 1359
1340# if EV_PERIODIC_ENABLE 1360# if EV_PERIODIC_ENABLE
1341 periodics_reschedule (EV_A); 1361 periodics_reschedule (EV_A);
1342# endif 1362# endif
1343 /* no timer adjustment, as the monotonic clock doesn't jump */ 1363 /* no timer adjustment, as the monotonic clock doesn't jump */
1344 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1364 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1345 }
1346 } 1365 }
1347 else 1366 else
1348#endif 1367#endif
1349 { 1368 {
1350 ev_rt_now = ev_time (); 1369 ev_rt_now = ev_time ();
1351 1370
1352 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1371 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1353 { 1372 {
1354#if EV_PERIODIC_ENABLE 1373#if EV_PERIODIC_ENABLE
1355 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1356#endif 1375#endif
1357
1358 /* 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 */
1359 for (i = 0; i < timercnt; ++i) 1377 for (i = 0; i < timercnt; ++i)
1360 ((WT)timers [i])->at += ev_rt_now - mn_now; 1378 ((WT)timers [i])->at += ev_rt_now - mn_now;
1361 } 1379 }
1362 1380
… …
1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1424 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407 call_pending (EV_A); 1425 call_pending (EV_A);
1408 } 1426 }
1409#endif 1427#endif
1410 1428
1411 /* queue check watchers (and execute them) */ 1429 /* queue prepare watchers (and execute them) */
1412 if (expect_false (preparecnt)) 1430 if (expect_false (preparecnt))
1413 { 1431 {
1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1432 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415 call_pending (EV_A); 1433 call_pending (EV_A);
1416 } 1434 }
… …
1432 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1433 block = 0.; /* do not block at all */ 1451 block = 0.; /* do not block at all */
1434 else 1452 else
1435 { 1453 {
1436 /* update time to cancel out callback processing overhead */ 1454 /* update time to cancel out callback processing overhead */
1437#if EV_USE_MONOTONIC
1438 if (expect_true (have_monotonic))
1439 time_update_monotonic (EV_A); 1455 time_update (EV_A_ 1e100);
1440 else
1441#endif
1442 {
1443 ev_rt_now = ev_time ();
1444 mn_now = ev_rt_now;
1445 }
1446 1456
1447 block = MAX_BLOCKTIME; 1457 block = MAX_BLOCKTIME;
1448 1458
1449 if (timercnt) 1459 if (timercnt)
1450 { 1460 {
… …
1463 if (expect_false (block < 0.)) block = 0.; 1473 if (expect_false (block < 0.)) block = 0.;
1464 } 1474 }
1465 1475
1466 ++loop_count; 1476 ++loop_count;
1467 backend_poll (EV_A_ block); 1477 backend_poll (EV_A_ block);
1478
1479 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block);
1468 } 1481 }
1469
1470 /* update ev_rt_now, do magic */
1471 time_update (EV_A);
1472 1482
1473 /* queue pending timers and reschedule them */ 1483 /* queue pending timers and reschedule them */
1474 timers_reify (EV_A); /* relative timers called last */ 1484 timers_reify (EV_A); /* relative timers called last */
1475#if EV_PERIODIC_ENABLE 1485#if EV_PERIODIC_ENABLE
1476 periodics_reify (EV_A); /* absolute timers called first */ 1486 periodics_reify (EV_A); /* absolute timers called first */
… …
1523 head = &(*head)->next; 1533 head = &(*head)->next;
1524 } 1534 }
1525} 1535}
1526 1536
1527void inline_speed 1537void inline_speed
1528ev_clear_pending (EV_P_ W w) 1538clear_pending (EV_P_ W w)
1529{ 1539{
1530 if (w->pending) 1540 if (w->pending)
1531 { 1541 {
1532 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1542 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533 w->pending = 0; 1543 w->pending = 0;
1534 } 1544 }
1545}
1546
1547int
1548ev_clear_pending (EV_P_ void *w)
1549{
1550 W w_ = (W)w;
1551 int pending = w_->pending;
1552
1553 if (expect_true (pending))
1554 {
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 w_->pending = 0;
1557 p->w = 0;
1558 return p->events;
1559 }
1560 else
1561 return 0;
1535} 1562}
1536 1563
1537void inline_size 1564void inline_size
1538pri_adjust (EV_P_ W w) 1565pri_adjust (EV_P_ W w)
1539{ 1566{
… …
1558 w->active = 0; 1585 w->active = 0;
1559} 1586}
1560 1587
1561/*****************************************************************************/ 1588/*****************************************************************************/
1562 1589
1563void 1590void noinline
1564ev_io_start (EV_P_ ev_io *w) 1591ev_io_start (EV_P_ ev_io *w)
1565{ 1592{
1566 int fd = w->fd; 1593 int fd = w->fd;
1567 1594
1568 if (expect_false (ev_is_active (w))) 1595 if (expect_false (ev_is_active (w)))
… …
1575 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1602 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1576 1603
1577 fd_change (EV_A_ fd); 1604 fd_change (EV_A_ fd);
1578} 1605}
1579 1606
1580void 1607void noinline
1581ev_io_stop (EV_P_ ev_io *w) 1608ev_io_stop (EV_P_ ev_io *w)
1582{ 1609{
1583 ev_clear_pending (EV_A_ (W)w); 1610 clear_pending (EV_A_ (W)w);
1584 if (expect_false (!ev_is_active (w))) 1611 if (expect_false (!ev_is_active (w)))
1585 return; 1612 return;
1586 1613
1587 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1588 1615
… …
1590 ev_stop (EV_A_ (W)w); 1617 ev_stop (EV_A_ (W)w);
1591 1618
1592 fd_change (EV_A_ w->fd); 1619 fd_change (EV_A_ w->fd);
1593} 1620}
1594 1621
1595void 1622void noinline
1596ev_timer_start (EV_P_ ev_timer *w) 1623ev_timer_start (EV_P_ ev_timer *w)
1597{ 1624{
1598 if (expect_false (ev_is_active (w))) 1625 if (expect_false (ev_is_active (w)))
1599 return; 1626 return;
1600 1627
1601 ((WT)w)->at += mn_now; 1628 ((WT)w)->at += mn_now;
1602 1629
1603 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1630 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1604 1631
1605 ev_start (EV_A_ (W)w, ++timercnt); 1632 ev_start (EV_A_ (W)w, ++timercnt);
1606 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1633 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1607 timers [timercnt - 1] = w; 1634 timers [timercnt - 1] = (WT)w;
1608 upheap ((WT *)timers, timercnt - 1); 1635 upheap (timers, timercnt - 1);
1609 1636
1610 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1637 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1611} 1638}
1612 1639
1613void 1640void noinline
1614ev_timer_stop (EV_P_ ev_timer *w) 1641ev_timer_stop (EV_P_ ev_timer *w)
1615{ 1642{
1616 ev_clear_pending (EV_A_ (W)w); 1643 clear_pending (EV_A_ (W)w);
1617 if (expect_false (!ev_is_active (w))) 1644 if (expect_false (!ev_is_active (w)))
1618 return; 1645 return;
1619 1646
1620 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1647 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1621 1648
1622 { 1649 {
1623 int active = ((W)w)->active; 1650 int active = ((W)w)->active;
1624 1651
1625 if (expect_true (--active < --timercnt)) 1652 if (expect_true (--active < --timercnt))
1626 { 1653 {
1627 timers [active] = timers [timercnt]; 1654 timers [active] = timers [timercnt];
1628 adjustheap ((WT *)timers, timercnt, active); 1655 adjustheap (timers, timercnt, active);
1629 } 1656 }
1630 } 1657 }
1631 1658
1632 ((WT)w)->at -= mn_now; 1659 ((WT)w)->at -= mn_now;
1633 1660
1634 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1635} 1662}
1636 1663
1637void 1664void noinline
1638ev_timer_again (EV_P_ ev_timer *w) 1665ev_timer_again (EV_P_ ev_timer *w)
1639{ 1666{
1640 if (ev_is_active (w)) 1667 if (ev_is_active (w))
1641 { 1668 {
1642 if (w->repeat) 1669 if (w->repeat)
1643 { 1670 {
1644 ((WT)w)->at = mn_now + w->repeat; 1671 ((WT)w)->at = mn_now + w->repeat;
1645 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1672 adjustheap (timers, timercnt, ((W)w)->active - 1);
1646 } 1673 }
1647 else 1674 else
1648 ev_timer_stop (EV_A_ w); 1675 ev_timer_stop (EV_A_ w);
1649 } 1676 }
1650 else if (w->repeat) 1677 else if (w->repeat)
… …
1653 ev_timer_start (EV_A_ w); 1680 ev_timer_start (EV_A_ w);
1654 } 1681 }
1655} 1682}
1656 1683
1657#if EV_PERIODIC_ENABLE 1684#if EV_PERIODIC_ENABLE
1658void 1685void noinline
1659ev_periodic_start (EV_P_ ev_periodic *w) 1686ev_periodic_start (EV_P_ ev_periodic *w)
1660{ 1687{
1661 if (expect_false (ev_is_active (w))) 1688 if (expect_false (ev_is_active (w)))
1662 return; 1689 return;
1663 1690
… …
1665 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1692 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1693 else if (w->interval)
1667 { 1694 {
1668 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1695 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1669 /* this formula differs from the one in periodic_reify because we do not always round up */ 1696 /* this formula differs from the one in periodic_reify because we do not always round up */
1670 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1697 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1671 } 1698 }
1699 else
1700 ((WT)w)->at = w->offset;
1672 1701
1673 ev_start (EV_A_ (W)w, ++periodiccnt); 1702 ev_start (EV_A_ (W)w, ++periodiccnt);
1674 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1703 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1675 periodics [periodiccnt - 1] = w; 1704 periodics [periodiccnt - 1] = (WT)w;
1676 upheap ((WT *)periodics, periodiccnt - 1); 1705 upheap (periodics, periodiccnt - 1);
1677 1706
1678 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1707 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1679} 1708}
1680 1709
1681void 1710void noinline
1682ev_periodic_stop (EV_P_ ev_periodic *w) 1711ev_periodic_stop (EV_P_ ev_periodic *w)
1683{ 1712{
1684 ev_clear_pending (EV_A_ (W)w); 1713 clear_pending (EV_A_ (W)w);
1685 if (expect_false (!ev_is_active (w))) 1714 if (expect_false (!ev_is_active (w)))
1686 return; 1715 return;
1687 1716
1688 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1717 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1689 1718
1690 { 1719 {
1691 int active = ((W)w)->active; 1720 int active = ((W)w)->active;
1692 1721
1693 if (expect_true (--active < --periodiccnt)) 1722 if (expect_true (--active < --periodiccnt))
1694 { 1723 {
1695 periodics [active] = periodics [periodiccnt]; 1724 periodics [active] = periodics [periodiccnt];
1696 adjustheap ((WT *)periodics, periodiccnt, active); 1725 adjustheap (periodics, periodiccnt, active);
1697 } 1726 }
1698 } 1727 }
1699 1728
1700 ev_stop (EV_A_ (W)w); 1729 ev_stop (EV_A_ (W)w);
1701} 1730}
1702 1731
1703void 1732void noinline
1704ev_periodic_again (EV_P_ ev_periodic *w) 1733ev_periodic_again (EV_P_ ev_periodic *w)
1705{ 1734{
1706 /* TODO: use adjustheap and recalculation */ 1735 /* TODO: use adjustheap and recalculation */
1707 ev_periodic_stop (EV_A_ w); 1736 ev_periodic_stop (EV_A_ w);
1708 ev_periodic_start (EV_A_ w); 1737 ev_periodic_start (EV_A_ w);
… …
1711 1740
1712#ifndef SA_RESTART 1741#ifndef SA_RESTART
1713# define SA_RESTART 0 1742# define SA_RESTART 0
1714#endif 1743#endif
1715 1744
1716void 1745void noinline
1717ev_signal_start (EV_P_ ev_signal *w) 1746ev_signal_start (EV_P_ ev_signal *w)
1718{ 1747{
1719#if EV_MULTIPLICITY 1748#if EV_MULTIPLICITY
1720 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1749 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1721#endif 1750#endif
1722 if (expect_false (ev_is_active (w))) 1751 if (expect_false (ev_is_active (w)))
1723 return; 1752 return;
1724 1753
1725 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1754 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1726 1755
1756 {
1757#ifndef _WIN32
1758 sigset_t full, prev;
1759 sigfillset (&full);
1760 sigprocmask (SIG_SETMASK, &full, &prev);
1761#endif
1762
1763 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1764
1765#ifndef _WIN32
1766 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif
1768 }
1769
1727 ev_start (EV_A_ (W)w, 1); 1770 ev_start (EV_A_ (W)w, 1);
1728 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1729 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1730 1772
1731 if (!((WL)w)->next) 1773 if (!((WL)w)->next)
1732 { 1774 {
1733#if _WIN32 1775#if _WIN32
… …
1740 sigaction (w->signum, &sa, 0); 1782 sigaction (w->signum, &sa, 0);
1741#endif 1783#endif
1742 } 1784 }
1743} 1785}
1744 1786
1745void 1787void noinline
1746ev_signal_stop (EV_P_ ev_signal *w) 1788ev_signal_stop (EV_P_ ev_signal *w)
1747{ 1789{
1748 ev_clear_pending (EV_A_ (W)w); 1790 clear_pending (EV_A_ (W)w);
1749 if (expect_false (!ev_is_active (w))) 1791 if (expect_false (!ev_is_active (w)))
1750 return; 1792 return;
1751 1793
1752 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1753 ev_stop (EV_A_ (W)w); 1795 ev_stop (EV_A_ (W)w);
… …
1770} 1812}
1771 1813
1772void 1814void
1773ev_child_stop (EV_P_ ev_child *w) 1815ev_child_stop (EV_P_ ev_child *w)
1774{ 1816{
1775 ev_clear_pending (EV_A_ (W)w); 1817 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1818 if (expect_false (!ev_is_active (w)))
1777 return; 1819 return;
1778 1820
1779 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1780 ev_stop (EV_A_ (W)w); 1822 ev_stop (EV_A_ (W)w);
… …
2016} 2058}
2017 2059
2018void 2060void
2019ev_stat_stop (EV_P_ ev_stat *w) 2061ev_stat_stop (EV_P_ ev_stat *w)
2020{ 2062{
2021 ev_clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
2023 return; 2065 return;
2024 2066
2025#if EV_USE_INOTIFY 2067#if EV_USE_INOTIFY
2026 infy_del (EV_A_ w); 2068 infy_del (EV_A_ w);
… …
2052} 2094}
2053 2095
2054void 2096void
2055ev_idle_stop (EV_P_ ev_idle *w) 2097ev_idle_stop (EV_P_ ev_idle *w)
2056{ 2098{
2057 ev_clear_pending (EV_A_ (W)w); 2099 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2100 if (expect_false (!ev_is_active (w)))
2059 return; 2101 return;
2060 2102
2061 { 2103 {
2062 int active = ((W)w)->active; 2104 int active = ((W)w)->active;
… …
2082} 2124}
2083 2125
2084void 2126void
2085ev_prepare_stop (EV_P_ ev_prepare *w) 2127ev_prepare_stop (EV_P_ ev_prepare *w)
2086{ 2128{
2087 ev_clear_pending (EV_A_ (W)w); 2129 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2130 if (expect_false (!ev_is_active (w)))
2089 return; 2131 return;
2090 2132
2091 { 2133 {
2092 int active = ((W)w)->active; 2134 int active = ((W)w)->active;
… …
2109} 2151}
2110 2152
2111void 2153void
2112ev_check_stop (EV_P_ ev_check *w) 2154ev_check_stop (EV_P_ ev_check *w)
2113{ 2155{
2114 ev_clear_pending (EV_A_ (W)w); 2156 clear_pending (EV_A_ (W)w);
2115 if (expect_false (!ev_is_active (w))) 2157 if (expect_false (!ev_is_active (w)))
2116 return; 2158 return;
2117 2159
2118 { 2160 {
2119 int active = ((W)w)->active; 2161 int active = ((W)w)->active;
… …
2161} 2203}
2162 2204
2163void 2205void
2164ev_embed_stop (EV_P_ ev_embed *w) 2206ev_embed_stop (EV_P_ ev_embed *w)
2165{ 2207{
2166 ev_clear_pending (EV_A_ (W)w); 2208 clear_pending (EV_A_ (W)w);
2167 if (expect_false (!ev_is_active (w))) 2209 if (expect_false (!ev_is_active (w)))
2168 return; 2210 return;
2169 2211
2170 ev_io_stop (EV_A_ &w->io); 2212 ev_io_stop (EV_A_ &w->io);
2171 2213
… …
2186} 2228}
2187 2229
2188void 2230void
2189ev_fork_stop (EV_P_ ev_fork *w) 2231ev_fork_stop (EV_P_ ev_fork *w)
2190{ 2232{
2191 ev_clear_pending (EV_A_ (W)w); 2233 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2234 if (expect_false (!ev_is_active (w)))
2193 return; 2235 return;
2194 2236
2195 { 2237 {
2196 int active = ((W)w)->active; 2238 int active = ((W)w)->active;

Diff Legend

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