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

Comparing libev/ev.c (file contents):
Revision 1.168 by root, Sat Dec 8 14:12:07 2007 UTC vs.
Revision 1.184 by root, Wed Dec 12 05:30:52 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)
… …
522 { 533 {
523 int fd = fdchanges [i]; 534 int fd = fdchanges [i];
524 ANFD *anfd = anfds + fd; 535 ANFD *anfd = anfds + fd;
525 ev_io *w; 536 ev_io *w;
526 537
527 int events = 0; 538 unsigned char events = 0;
528 539
529 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
530 events |= w->events; 541 events |= (unsigned char)w->events;
531 542
532#if EV_SELECT_IS_WINSOCKET 543#if EV_SELECT_IS_WINSOCKET
533 if (events) 544 if (events)
534 { 545 {
535 unsigned long argp; 546 unsigned long argp;
536 anfd->handle = _get_osfhandle (fd); 547 anfd->handle = _get_osfhandle (fd);
537 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
538 } 549 }
539#endif 550#endif
540 551
552 {
553 unsigned char o_events = anfd->events;
554 unsigned char o_reify = anfd->reify;
555
541 anfd->reify = 0; 556 anfd->reify = 0;
542
543 backend_modify (EV_A_ fd, anfd->events, events);
544 anfd->events = events; 557 anfd->events = events;
558
559 if (o_events != events || o_reify & EV_IOFDSET)
560 backend_modify (EV_A_ fd, o_events, events);
561 }
545 } 562 }
546 563
547 fdchangecnt = 0; 564 fdchangecnt = 0;
548} 565}
549 566
550void inline_size 567void inline_size
551fd_change (EV_P_ int fd) 568fd_change (EV_P_ int fd, int flags)
552{ 569{
553 if (expect_false (anfds [fd].reify)) 570 unsigned char reify = anfds [fd].reify;
554 return;
555
556 anfds [fd].reify = 1; 571 anfds [fd].reify |= flags;
557 572
573 if (expect_true (!reify))
574 {
558 ++fdchangecnt; 575 ++fdchangecnt;
559 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 576 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
560 fdchanges [fdchangecnt - 1] = fd; 577 fdchanges [fdchangecnt - 1] = fd;
578 }
561} 579}
562 580
563void inline_speed 581void inline_speed
564fd_kill (EV_P_ int fd) 582fd_kill (EV_P_ int fd)
565{ 583{
… …
616 634
617 for (fd = 0; fd < anfdmax; ++fd) 635 for (fd = 0; fd < anfdmax; ++fd)
618 if (anfds [fd].events) 636 if (anfds [fd].events)
619 { 637 {
620 anfds [fd].events = 0; 638 anfds [fd].events = 0;
621 fd_change (EV_A_ fd); 639 fd_change (EV_A_ fd, EV_IOFDSET | 1);
622 } 640 }
623} 641}
624 642
625/*****************************************************************************/ 643/*****************************************************************************/
626 644
627void inline_speed 645void inline_speed
628upheap (WT *heap, int k) 646upheap (WT *heap, int k)
629{ 647{
630 WT w = heap [k]; 648 WT w = heap [k];
631 649
632 while (k && heap [k >> 1]->at > w->at) 650 while (k)
633 { 651 {
652 int p = (k - 1) >> 1;
653
654 if (heap [p]->at <= w->at)
655 break;
656
634 heap [k] = heap [k >> 1]; 657 heap [k] = heap [p];
635 ((W)heap [k])->active = k + 1; 658 ((W)heap [k])->active = k + 1;
636 k >>= 1; 659 k = p;
637 } 660 }
638 661
639 heap [k] = w; 662 heap [k] = w;
640 ((W)heap [k])->active = k + 1; 663 ((W)heap [k])->active = k + 1;
641
642} 664}
643 665
644void inline_speed 666void inline_speed
645downheap (WT *heap, int N, int k) 667downheap (WT *heap, int N, int k)
646{ 668{
647 WT w = heap [k]; 669 WT w = heap [k];
648 670
649 while (k < (N >> 1)) 671 for (;;)
650 { 672 {
651 int j = k << 1; 673 int c = (k << 1) + 1;
652 674
653 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 675 if (c >= N)
654 ++j;
655
656 if (w->at <= heap [j]->at)
657 break; 676 break;
658 677
678 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
679 ? 1 : 0;
680
681 if (w->at <= heap [c]->at)
682 break;
683
659 heap [k] = heap [j]; 684 heap [k] = heap [c];
660 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
686
661 k = j; 687 k = c;
662 } 688 }
663 689
664 heap [k] = w; 690 heap [k] = w;
665 ((W)heap [k])->active = k + 1; 691 ((W)heap [k])->active = k + 1;
666} 692}
… …
748 for (signum = signalmax; signum--; ) 774 for (signum = signalmax; signum--; )
749 if (signals [signum].gotsig) 775 if (signals [signum].gotsig)
750 ev_feed_signal_event (EV_A_ signum + 1); 776 ev_feed_signal_event (EV_A_ signum + 1);
751} 777}
752 778
753void inline_size 779void inline_speed
754fd_intern (int fd) 780fd_intern (int fd)
755{ 781{
756#ifdef _WIN32 782#ifdef _WIN32
757 int arg = 1; 783 int arg = 1;
758 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 784 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
773 ev_unref (EV_A); /* child watcher should not keep loop alive */ 799 ev_unref (EV_A); /* child watcher should not keep loop alive */
774} 800}
775 801
776/*****************************************************************************/ 802/*****************************************************************************/
777 803
778static ev_child *childs [EV_PID_HASHSIZE]; 804static WL childs [EV_PID_HASHSIZE];
779 805
780#ifndef _WIN32 806#ifndef _WIN32
781 807
782static ev_signal childev; 808static ev_signal childev;
783 809
… …
1195void inline_size 1221void inline_size
1196timers_reify (EV_P) 1222timers_reify (EV_P)
1197{ 1223{
1198 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1199 { 1225 {
1200 ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1201 1227
1202 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1203 1229
1204 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1205 if (w->repeat) 1231 if (w->repeat)
… …
1208 1234
1209 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1210 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1211 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1212 1238
1213 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1214 } 1240 }
1215 else 1241 else
1216 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1217 1243
1218 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1223void inline_size 1249void inline_size
1224periodics_reify (EV_P) 1250periodics_reify (EV_P)
1225{ 1251{
1226 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1227 { 1253 {
1228 ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1229 1255
1230 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1231 1257
1232 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1233 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1234 { 1260 {
1235 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1261 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1236 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1262 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1237 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1238 } 1264 }
1239 else if (w->interval) 1265 else if (w->interval)
1240 { 1266 {
1241 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1267 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1268 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1242 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1269 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1243 downheap ((WT *)periodics, periodiccnt, 0); 1270 downheap (periodics, periodiccnt, 0);
1244 } 1271 }
1245 else 1272 else
1246 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1247 1274
1248 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1255 int i; 1282 int i;
1256 1283
1257 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1258 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1259 { 1286 {
1260 ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1261 1288
1262 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1263 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1264 else if (w->interval) 1291 else if (w->interval)
1265 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1292 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1266 } 1293 }
1267 1294
1268 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1269 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1270 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1271} 1298}
1272#endif 1299#endif
1273 1300
1274#if EV_IDLE_ENABLE 1301#if EV_IDLE_ENABLE
1275void inline_size 1302void inline_size
… …
1292 } 1319 }
1293 } 1320 }
1294} 1321}
1295#endif 1322#endif
1296 1323
1297int inline_size 1324void inline_speed
1298time_update_monotonic (EV_P) 1325time_update (EV_P_ ev_tstamp max_block)
1299{ 1326{
1327 int i;
1328
1329#if EV_USE_MONOTONIC
1330 if (expect_true (have_monotonic))
1331 {
1332 ev_tstamp odiff = rtmn_diff;
1333
1300 mn_now = get_clock (); 1334 mn_now = get_clock ();
1301 1335
1336 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1337 /* interpolate in the meantime */
1302 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1338 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1303 { 1339 {
1304 ev_rt_now = rtmn_diff + mn_now; 1340 ev_rt_now = rtmn_diff + mn_now;
1305 return 0; 1341 return;
1306 } 1342 }
1307 else 1343
1308 {
1309 now_floor = mn_now; 1344 now_floor = mn_now;
1310 ev_rt_now = ev_time (); 1345 ev_rt_now = ev_time ();
1311 return 1;
1312 }
1313}
1314 1346
1315void inline_size 1347 /* loop a few times, before making important decisions.
1316time_update (EV_P) 1348 * on the choice of "4": one iteration isn't enough,
1317{ 1349 * in case we get preempted during the calls to
1318 int i; 1350 * ev_time and get_clock. a second call is almost guaranteed
1319 1351 * to succeed in that case, though. and looping a few more times
1320#if EV_USE_MONOTONIC 1352 * doesn't hurt either as we only do this on time-jumps or
1321 if (expect_true (have_monotonic)) 1353 * in the unlikely event of having been preempted here.
1322 { 1354 */
1323 if (time_update_monotonic (EV_A)) 1355 for (i = 4; --i; )
1324 { 1356 {
1325 ev_tstamp odiff = rtmn_diff;
1326
1327 /* loop a few times, before making important decisions.
1328 * on the choice of "4": one iteration isn't enough,
1329 * in case we get preempted during the calls to
1330 * ev_time and get_clock. a second call is almost guaranteed
1331 * to succeed in that case, though. and looping a few more times
1332 * doesn't hurt either as we only do this on time-jumps or
1333 * in the unlikely event of having been preempted here.
1334 */
1335 for (i = 4; --i; )
1336 {
1337 rtmn_diff = ev_rt_now - mn_now; 1357 rtmn_diff = ev_rt_now - mn_now;
1338 1358
1339 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1340 return; /* all is well */ 1360 return; /* all is well */
1341 1361
1342 ev_rt_now = ev_time (); 1362 ev_rt_now = ev_time ();
1343 mn_now = get_clock (); 1363 mn_now = get_clock ();
1344 now_floor = mn_now; 1364 now_floor = mn_now;
1345 } 1365 }
1346 1366
1347# if EV_PERIODIC_ENABLE 1367# if EV_PERIODIC_ENABLE
1348 periodics_reschedule (EV_A); 1368 periodics_reschedule (EV_A);
1349# endif 1369# endif
1350 /* no timer adjustment, as the monotonic clock doesn't jump */ 1370 /* no timer adjustment, as the monotonic clock doesn't jump */
1351 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1371 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1352 }
1353 } 1372 }
1354 else 1373 else
1355#endif 1374#endif
1356 { 1375 {
1357 ev_rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1358 1377
1359 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1378 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1360 { 1379 {
1361#if EV_PERIODIC_ENABLE 1380#if EV_PERIODIC_ENABLE
1362 periodics_reschedule (EV_A); 1381 periodics_reschedule (EV_A);
1363#endif 1382#endif
1364
1365 /* adjust timers. this is easy, as the offset is the same for all of them */ 1383 /* adjust timers. this is easy, as the offset is the same for all of them */
1366 for (i = 0; i < timercnt; ++i) 1384 for (i = 0; i < timercnt; ++i)
1367 ((WT)timers [i])->at += ev_rt_now - mn_now; 1385 ((WT)timers [i])->at += ev_rt_now - mn_now;
1368 } 1386 }
1369 1387
… …
1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1431 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1414 call_pending (EV_A); 1432 call_pending (EV_A);
1415 } 1433 }
1416#endif 1434#endif
1417 1435
1418 /* queue check watchers (and execute them) */ 1436 /* queue prepare watchers (and execute them) */
1419 if (expect_false (preparecnt)) 1437 if (expect_false (preparecnt))
1420 { 1438 {
1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1439 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1422 call_pending (EV_A); 1440 call_pending (EV_A);
1423 } 1441 }
… …
1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1440 block = 0.; /* do not block at all */ 1458 block = 0.; /* do not block at all */
1441 else 1459 else
1442 { 1460 {
1443 /* update time to cancel out callback processing overhead */ 1461 /* update time to cancel out callback processing overhead */
1444#if EV_USE_MONOTONIC
1445 if (expect_true (have_monotonic))
1446 time_update_monotonic (EV_A); 1462 time_update (EV_A_ 1e100);
1447 else
1448#endif
1449 {
1450 ev_rt_now = ev_time ();
1451 mn_now = ev_rt_now;
1452 }
1453 1463
1454 block = MAX_BLOCKTIME; 1464 block = MAX_BLOCKTIME;
1455 1465
1456 if (timercnt) 1466 if (timercnt)
1457 { 1467 {
… …
1470 if (expect_false (block < 0.)) block = 0.; 1480 if (expect_false (block < 0.)) block = 0.;
1471 } 1481 }
1472 1482
1473 ++loop_count; 1483 ++loop_count;
1474 backend_poll (EV_A_ block); 1484 backend_poll (EV_A_ block);
1485
1486 /* update ev_rt_now, do magic */
1487 time_update (EV_A_ block);
1475 } 1488 }
1476
1477 /* update ev_rt_now, do magic */
1478 time_update (EV_A);
1479 1489
1480 /* queue pending timers and reschedule them */ 1490 /* queue pending timers and reschedule them */
1481 timers_reify (EV_A); /* relative timers called last */ 1491 timers_reify (EV_A); /* relative timers called last */
1482#if EV_PERIODIC_ENABLE 1492#if EV_PERIODIC_ENABLE
1483 periodics_reify (EV_A); /* absolute timers called first */ 1493 periodics_reify (EV_A); /* absolute timers called first */
… …
1545ev_clear_pending (EV_P_ void *w) 1555ev_clear_pending (EV_P_ void *w)
1546{ 1556{
1547 W w_ = (W)w; 1557 W w_ = (W)w;
1548 int pending = w_->pending; 1558 int pending = w_->pending;
1549 1559
1550 if (!pending) 1560 if (expect_true (pending))
1561 {
1562 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1563 w_->pending = 0;
1564 p->w = 0;
1565 return p->events;
1566 }
1567 else
1551 return 0; 1568 return 0;
1552
1553 w_->pending = 0;
1554 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1555 p->w = 0;
1556
1557 return p->events;
1558} 1569}
1559 1570
1560void inline_size 1571void inline_size
1561pri_adjust (EV_P_ W w) 1572pri_adjust (EV_P_ W w)
1562{ 1573{
… …
1581 w->active = 0; 1592 w->active = 0;
1582} 1593}
1583 1594
1584/*****************************************************************************/ 1595/*****************************************************************************/
1585 1596
1586void 1597void noinline
1587ev_io_start (EV_P_ ev_io *w) 1598ev_io_start (EV_P_ ev_io *w)
1588{ 1599{
1589 int fd = w->fd; 1600 int fd = w->fd;
1590 1601
1591 if (expect_false (ev_is_active (w))) 1602 if (expect_false (ev_is_active (w)))
… …
1593 1604
1594 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1595 1606
1596 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1598 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1599 1610
1600 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1601} 1613}
1602 1614
1603void 1615void noinline
1604ev_io_stop (EV_P_ ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1605{ 1617{
1606 clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1607 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1608 return; 1620 return;
1609 1621
1610 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));
1611 1623
1612 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1613 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1614 1626
1615 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1616} 1628}
1617 1629
1618void 1630void noinline
1619ev_timer_start (EV_P_ ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1620{ 1632{
1621 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1622 return; 1634 return;
1623 1635
1624 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1625 1637
1626 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1638 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1627 1639
1628 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1629 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1630 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1631 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1632 1644
1633 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1634} 1646}
1635 1647
1636void 1648void noinline
1637ev_timer_stop (EV_P_ ev_timer *w) 1649ev_timer_stop (EV_P_ ev_timer *w)
1638{ 1650{
1639 clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1641 return; 1653 return;
1642 1654
1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1644 1656
1645 { 1657 {
1646 int active = ((W)w)->active; 1658 int active = ((W)w)->active;
1647 1659
1648 if (expect_true (--active < --timercnt)) 1660 if (expect_true (--active < --timercnt))
1649 { 1661 {
1650 timers [active] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1651 adjustheap ((WT *)timers, timercnt, active); 1663 adjustheap (timers, timercnt, active);
1652 } 1664 }
1653 } 1665 }
1654 1666
1655 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1656 1668
1657 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1658} 1670}
1659 1671
1660void 1672void noinline
1661ev_timer_again (EV_P_ ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1662{ 1674{
1663 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1664 { 1676 {
1665 if (w->repeat) 1677 if (w->repeat)
1666 { 1678 {
1667 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1668 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1669 } 1681 }
1670 else 1682 else
1671 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1672 } 1684 }
1673 else if (w->repeat) 1685 else if (w->repeat)
… …
1676 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1677 } 1689 }
1678} 1690}
1679 1691
1680#if EV_PERIODIC_ENABLE 1692#if EV_PERIODIC_ENABLE
1681void 1693void noinline
1682ev_periodic_start (EV_P_ ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1683{ 1695{
1684 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1685 return; 1697 return;
1686 1698
… …
1688 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1689 else if (w->interval) 1701 else if (w->interval)
1690 { 1702 {
1691 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.));
1692 /* 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 */
1693 ((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;
1694 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1695 1709
1696 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1697 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1698 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1699 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1700 1714
1701 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1702} 1716}
1703 1717
1704void 1718void noinline
1705ev_periodic_stop (EV_P_ ev_periodic *w) 1719ev_periodic_stop (EV_P_ ev_periodic *w)
1706{ 1720{
1707 clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1709 return; 1723 return;
1710 1724
1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1712 1726
1713 { 1727 {
1714 int active = ((W)w)->active; 1728 int active = ((W)w)->active;
1715 1729
1716 if (expect_true (--active < --periodiccnt)) 1730 if (expect_true (--active < --periodiccnt))
1717 { 1731 {
1718 periodics [active] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1719 adjustheap ((WT *)periodics, periodiccnt, active); 1733 adjustheap (periodics, periodiccnt, active);
1720 } 1734 }
1721 } 1735 }
1722 1736
1723 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1724} 1738}
1725 1739
1726void 1740void noinline
1727ev_periodic_again (EV_P_ ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1728{ 1742{
1729 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1730 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1731 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
… …
1734 1748
1735#ifndef SA_RESTART 1749#ifndef SA_RESTART
1736# define SA_RESTART 0 1750# define SA_RESTART 0
1737#endif 1751#endif
1738 1752
1739void 1753void noinline
1740ev_signal_start (EV_P_ ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1741{ 1755{
1742#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1743 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));
1744#endif 1758#endif
1745 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1746 return; 1760 return;
1747 1761
1748 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1762 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1749 1763
1764 {
1765#ifndef _WIN32
1766 sigset_t full, prev;
1767 sigfillset (&full);
1768 sigprocmask (SIG_SETMASK, &full, &prev);
1769#endif
1770
1771 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1772
1773#ifndef _WIN32
1774 sigprocmask (SIG_SETMASK, &prev, 0);
1775#endif
1776 }
1777
1750 ev_start (EV_A_ (W)w, 1); 1778 ev_start (EV_A_ (W)w, 1);
1751 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1752 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1753 1780
1754 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1755 { 1782 {
1756#if _WIN32 1783#if _WIN32
1757 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
… …
1763 sigaction (w->signum, &sa, 0); 1790 sigaction (w->signum, &sa, 0);
1764#endif 1791#endif
1765 } 1792 }
1766} 1793}
1767 1794
1768void 1795void noinline
1769ev_signal_stop (EV_P_ ev_signal *w) 1796ev_signal_stop (EV_P_ ev_signal *w)
1770{ 1797{
1771 clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1772 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1773 return; 1800 return;
1774 1801
1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1776 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1777 1804
1778 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1779 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1780} 1807}
… …
1787#endif 1814#endif
1788 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1789 return; 1816 return;
1790 1817
1791 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1792 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1793} 1820}
1794 1821
1795void 1822void
1796ev_child_stop (EV_P_ ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1797{ 1824{
1798 clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1799 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1800 return; 1827 return;
1801 1828
1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1803 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1804} 1831}
1805 1832
1806#if EV_STAT_ENABLE 1833#if EV_STAT_ENABLE
1807 1834

Diff Legend

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