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

Comparing libev/ev.c (file contents):
Revision 1.170 by root, Sat Dec 8 22:11:14 2007 UTC vs.
Revision 1.189 by root, Thu Dec 20 10:12:22 2007 UTC

… …
202#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
205#endif 205#endif
206 206
207#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0
210#endif
211
212#if EV_USE_INOTIFY
213# include <sys/inotify.h>
214#endif
215
207#if EV_SELECT_IS_WINSOCKET 216#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 217# include <winsock.h>
209#endif 218#endif
210 219
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
219/**/ 220/**/
221
222/*
223 * This is used to avoid floating point rounding problems.
224 * It is added to ev_rt_now when scheduling periodics
225 * to ensure progress, time-wise, even when rounding
226 * errors are against us.
227 * This value is good at least till the year 4000.
228 * Better solutions welcome.
229 */
230#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 231
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 232#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) */ 233#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 */ 234/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 235
225#if __GNUC__ >= 3 236#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 237# define expect(expr,value) __builtin_expect ((expr),(value))
227# define noinline __attribute__ ((noinline)) 238# define noinline __attribute__ ((noinline))
228#else 239#else
229# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
230# define noinline 241# define noinline
… …
418 } 429 }
419 430
420 return ncur; 431 return ncur;
421} 432}
422 433
423inline_speed void * 434static noinline void *
424array_realloc (int elem, void *base, int *cur, int cnt) 435array_realloc (int elem, void *base, int *cur, int cnt)
425{ 436{
426 *cur = array_nextsize (elem, *cur, cnt); 437 *cur = array_nextsize (elem, *cur, cnt);
427 return ev_realloc (base, elem * *cur); 438 return ev_realloc (base, elem * *cur);
428} 439}
… …
453 464
454void noinline 465void noinline
455ev_feed_event (EV_P_ void *w, int revents) 466ev_feed_event (EV_P_ void *w, int revents)
456{ 467{
457 W w_ = (W)w; 468 W w_ = (W)w;
469 int pri = ABSPRI (w_);
458 470
459 if (expect_false (w_->pending)) 471 if (expect_false (w_->pending))
472 pendings [pri][w_->pending - 1].events |= revents;
473 else
460 { 474 {
475 w_->pending = ++pendingcnt [pri];
476 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
477 pendings [pri][w_->pending - 1].w = w_;
461 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 478 pendings [pri][w_->pending - 1].events = revents;
462 return;
463 } 479 }
464
465 w_->pending = ++pendingcnt [ABSPRI (w_)];
466 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
467 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
468 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
469} 480}
470 481
471void inline_size 482void inline_speed
472queue_events (EV_P_ W *events, int eventcnt, int type) 483queue_events (EV_P_ W *events, int eventcnt, int type)
473{ 484{
474 int i; 485 int i;
475 486
476 for (i = 0; i < eventcnt; ++i) 487 for (i = 0; i < eventcnt; ++i)
… …
523 { 534 {
524 int fd = fdchanges [i]; 535 int fd = fdchanges [i];
525 ANFD *anfd = anfds + fd; 536 ANFD *anfd = anfds + fd;
526 ev_io *w; 537 ev_io *w;
527 538
528 int events = 0; 539 unsigned char events = 0;
529 540
530 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 541 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
531 events |= w->events; 542 events |= (unsigned char)w->events;
532 543
533#if EV_SELECT_IS_WINSOCKET 544#if EV_SELECT_IS_WINSOCKET
534 if (events) 545 if (events)
535 { 546 {
536 unsigned long argp; 547 unsigned long argp;
537 anfd->handle = _get_osfhandle (fd); 548 anfd->handle = _get_osfhandle (fd);
538 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
539 } 550 }
540#endif 551#endif
541 552
553 {
554 unsigned char o_events = anfd->events;
555 unsigned char o_reify = anfd->reify;
556
542 anfd->reify = 0; 557 anfd->reify = 0;
543
544 backend_modify (EV_A_ fd, anfd->events, events);
545 anfd->events = events; 558 anfd->events = events;
559
560 if (o_events != events || o_reify & EV_IOFDSET)
561 backend_modify (EV_A_ fd, o_events, events);
562 }
546 } 563 }
547 564
548 fdchangecnt = 0; 565 fdchangecnt = 0;
549} 566}
550 567
551void inline_size 568void inline_size
552fd_change (EV_P_ int fd) 569fd_change (EV_P_ int fd, int flags)
553{ 570{
554 if (expect_false (anfds [fd].reify)) 571 unsigned char reify = anfds [fd].reify;
555 return;
556
557 anfds [fd].reify = 1; 572 anfds [fd].reify |= flags;
558 573
574 if (expect_true (!reify))
575 {
559 ++fdchangecnt; 576 ++fdchangecnt;
560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 577 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
561 fdchanges [fdchangecnt - 1] = fd; 578 fdchanges [fdchangecnt - 1] = fd;
579 }
562} 580}
563 581
564void inline_speed 582void inline_speed
565fd_kill (EV_P_ int fd) 583fd_kill (EV_P_ int fd)
566{ 584{
… …
617 635
618 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
619 if (anfds [fd].events) 637 if (anfds [fd].events)
620 { 638 {
621 anfds [fd].events = 0; 639 anfds [fd].events = 0;
622 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
623 } 641 }
624} 642}
625 643
626/*****************************************************************************/ 644/*****************************************************************************/
627 645
628void inline_speed 646void inline_speed
629upheap (WT *heap, int k) 647upheap (WT *heap, int k)
630{ 648{
631 WT w = heap [k]; 649 WT w = heap [k];
632 650
633 while (k && heap [k >> 1]->at > w->at) 651 while (k)
634 { 652 {
653 int p = (k - 1) >> 1;
654
655 if (heap [p]->at <= w->at)
656 break;
657
635 heap [k] = heap [k >> 1]; 658 heap [k] = heap [p];
636 ((W)heap [k])->active = k + 1; 659 ((W)heap [k])->active = k + 1;
637 k >>= 1; 660 k = p;
638 } 661 }
639 662
640 heap [k] = w; 663 heap [k] = w;
641 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
642
643} 665}
644 666
645void inline_speed 667void inline_speed
646downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
647{ 669{
648 WT w = heap [k]; 670 WT w = heap [k];
649 671
650 while (k < (N >> 1)) 672 for (;;)
651 { 673 {
652 int j = k << 1; 674 int c = (k << 1) + 1;
653 675
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 676 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 677 break;
659 678
679 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
680 ? 1 : 0;
681
682 if (w->at <= heap [c]->at)
683 break;
684
660 heap [k] = heap [j]; 685 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 686 ((W)heap [k])->active = k + 1;
687
662 k = j; 688 k = c;
663 } 689 }
664 690
665 heap [k] = w; 691 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 692 ((W)heap [k])->active = k + 1;
667} 693}
… …
749 for (signum = signalmax; signum--; ) 775 for (signum = signalmax; signum--; )
750 if (signals [signum].gotsig) 776 if (signals [signum].gotsig)
751 ev_feed_signal_event (EV_A_ signum + 1); 777 ev_feed_signal_event (EV_A_ signum + 1);
752} 778}
753 779
754void inline_size 780void inline_speed
755fd_intern (int fd) 781fd_intern (int fd)
756{ 782{
757#ifdef _WIN32 783#ifdef _WIN32
758 int arg = 1; 784 int arg = 1;
759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 785 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
774 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
775} 801}
776 802
777/*****************************************************************************/ 803/*****************************************************************************/
778 804
779static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
780 806
781#ifndef _WIN32 807#ifndef _WIN32
782 808
783static ev_signal childev; 809static ev_signal childev;
784 810
… …
1012#if EV_IDLE_ENABLE 1038#if EV_IDLE_ENABLE
1013 array_free (idle, [i]); 1039 array_free (idle, [i]);
1014#endif 1040#endif
1015 } 1041 }
1016 1042
1043 ev_free (anfds); anfdmax = 0;
1044
1017 /* have to use the microsoft-never-gets-it-right macro */ 1045 /* have to use the microsoft-never-gets-it-right macro */
1018 array_free (fdchange, EMPTY); 1046 array_free (fdchange, EMPTY);
1019 array_free (timer, EMPTY); 1047 array_free (timer, EMPTY);
1020#if EV_PERIODIC_ENABLE 1048#if EV_PERIODIC_ENABLE
1021 array_free (periodic, EMPTY); 1049 array_free (periodic, EMPTY);
1050#endif
1051#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY);
1022#endif 1053#endif
1023 array_free (prepare, EMPTY); 1054 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1055 array_free (check, EMPTY);
1025 1056
1026 backend = 0; 1057 backend = 0;
… …
1196void inline_size 1227void inline_size
1197timers_reify (EV_P) 1228timers_reify (EV_P)
1198{ 1229{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1230 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1231 {
1201 ev_timer *w = timers [0]; 1232 ev_timer *w = (ev_timer *)timers [0];
1202 1233
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1235
1205 /* first reschedule or stop timer */ 1236 /* first reschedule or stop timer */
1206 if (w->repeat) 1237 if (w->repeat)
… …
1209 1240
1210 ((WT)w)->at += w->repeat; 1241 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1242 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1243 ((WT)w)->at = mn_now;
1213 1244
1214 downheap ((WT *)timers, timercnt, 0); 1245 downheap (timers, timercnt, 0);
1215 } 1246 }
1216 else 1247 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1249
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1255void inline_size
1225periodics_reify (EV_P) 1256periodics_reify (EV_P)
1226{ 1257{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1259 {
1229 ev_periodic *w = periodics [0]; 1260 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1261
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1263
1233 /* first reschedule or stop timer */ 1264 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1265 if (w->reschedule_cb)
1235 { 1266 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1267 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1268 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1269 downheap (periodics, periodiccnt, 0);
1239 } 1270 }
1240 else if (w->interval) 1271 else if (w->interval)
1241 { 1272 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1273 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1274 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1275 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1276 downheap (periodics, periodiccnt, 0);
1245 } 1277 }
1246 else 1278 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1280
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1288 int i;
1257 1289
1258 /* adjust periodics after time jump */ 1290 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1291 for (i = 0; i < periodiccnt; ++i)
1260 { 1292 {
1261 ev_periodic *w = periodics [i]; 1293 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1294
1263 if (w->reschedule_cb) 1295 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1297 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1298 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1299 }
1268 1300
1269 /* now rebuild the heap */ 1301 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1302 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1303 downheap (periodics, periodiccnt, i);
1272} 1304}
1273#endif 1305#endif
1274 1306
1275#if EV_IDLE_ENABLE 1307#if EV_IDLE_ENABLE
1276void inline_size 1308void inline_size
… …
1293 } 1325 }
1294 } 1326 }
1295} 1327}
1296#endif 1328#endif
1297 1329
1298int inline_size 1330void inline_speed
1299time_update_monotonic (EV_P) 1331time_update (EV_P_ ev_tstamp max_block)
1300{ 1332{
1333 int i;
1334
1335#if EV_USE_MONOTONIC
1336 if (expect_true (have_monotonic))
1337 {
1338 ev_tstamp odiff = rtmn_diff;
1339
1301 mn_now = get_clock (); 1340 mn_now = get_clock ();
1302 1341
1342 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1343 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1344 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1345 {
1305 ev_rt_now = rtmn_diff + mn_now; 1346 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1347 return;
1307 } 1348 }
1308 else 1349
1309 {
1310 now_floor = mn_now; 1350 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1352
1316void inline_size 1353 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1354 * on the choice of "4": one iteration isn't enough,
1318{ 1355 * in case we get preempted during the calls to
1319 int i; 1356 * ev_time and get_clock. a second call is almost guaranteed
1320 1357 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1358 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1359 * in the unlikely event of having been preempted here.
1323 { 1360 */
1324 if (time_update_monotonic (EV_A)) 1361 for (i = 4; --i; )
1325 { 1362 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1363 rtmn_diff = ev_rt_now - mn_now;
1339 1364
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1365 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1366 return; /* all is well */
1342 1367
1343 ev_rt_now = ev_time (); 1368 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1369 mn_now = get_clock ();
1345 now_floor = mn_now; 1370 now_floor = mn_now;
1346 } 1371 }
1347 1372
1348# if EV_PERIODIC_ENABLE 1373# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1350# endif 1375# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1376 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1377 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1378 }
1355 else 1379 else
1356#endif 1380#endif
1357 { 1381 {
1358 ev_rt_now = ev_time (); 1382 ev_rt_now = ev_time ();
1359 1383
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1384 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1385 {
1362#if EV_PERIODIC_ENABLE 1386#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1387 periodics_reschedule (EV_A);
1364#endif 1388#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1389 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1390 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1391 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1392 }
1370 1393
… …
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1441 block = 0.; /* do not block at all */ 1464 block = 0.; /* do not block at all */
1442 else 1465 else
1443 { 1466 {
1444 /* update time to cancel out callback processing overhead */ 1467 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 1468 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1469
1455 block = MAX_BLOCKTIME; 1470 block = MAX_BLOCKTIME;
1456 1471
1457 if (timercnt) 1472 if (timercnt)
1458 { 1473 {
… …
1471 if (expect_false (block < 0.)) block = 0.; 1486 if (expect_false (block < 0.)) block = 0.;
1472 } 1487 }
1473 1488
1474 ++loop_count; 1489 ++loop_count;
1475 backend_poll (EV_A_ block); 1490 backend_poll (EV_A_ block);
1491
1492 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block);
1476 } 1494 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1495
1481 /* queue pending timers and reschedule them */ 1496 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1497 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1498#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1499 periodics_reify (EV_A); /* absolute timers called first */
… …
1546ev_clear_pending (EV_P_ void *w) 1561ev_clear_pending (EV_P_ void *w)
1547{ 1562{
1548 W w_ = (W)w; 1563 W w_ = (W)w;
1549 int pending = w_->pending; 1564 int pending = w_->pending;
1550 1565
1551 if (!pending) 1566 if (expect_true (pending))
1567 {
1568 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1569 w_->pending = 0;
1570 p->w = 0;
1571 return p->events;
1572 }
1573 else
1552 return 0; 1574 return 0;
1553
1554 w_->pending = 0;
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 p->w = 0;
1557
1558 return p->events;
1559} 1575}
1560 1576
1561void inline_size 1577void inline_size
1562pri_adjust (EV_P_ W w) 1578pri_adjust (EV_P_ W w)
1563{ 1579{
… …
1582 w->active = 0; 1598 w->active = 0;
1583} 1599}
1584 1600
1585/*****************************************************************************/ 1601/*****************************************************************************/
1586 1602
1587void 1603void noinline
1588ev_io_start (EV_P_ ev_io *w) 1604ev_io_start (EV_P_ ev_io *w)
1589{ 1605{
1590 int fd = w->fd; 1606 int fd = w->fd;
1591 1607
1592 if (expect_false (ev_is_active (w))) 1608 if (expect_false (ev_is_active (w)))
… …
1594 1610
1595 assert (("ev_io_start called with negative fd", fd >= 0)); 1611 assert (("ev_io_start called with negative fd", fd >= 0));
1596 1612
1597 ev_start (EV_A_ (W)w, 1); 1613 ev_start (EV_A_ (W)w, 1);
1598 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1614 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1615 wlist_add (&anfds[fd].head, (WL)w);
1600 1616
1601 fd_change (EV_A_ fd); 1617 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1618 w->events &= ~EV_IOFDSET;
1602} 1619}
1603 1620
1604void 1621void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1622ev_io_stop (EV_P_ ev_io *w)
1606{ 1623{
1607 clear_pending (EV_A_ (W)w); 1624 clear_pending (EV_A_ (W)w);
1608 if (expect_false (!ev_is_active (w))) 1625 if (expect_false (!ev_is_active (w)))
1609 return; 1626 return;
1610 1627
1611 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1628 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1612 1629
1613 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1630 wlist_del (&anfds[w->fd].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1631 ev_stop (EV_A_ (W)w);
1615 1632
1616 fd_change (EV_A_ w->fd); 1633 fd_change (EV_A_ w->fd, 1);
1617} 1634}
1618 1635
1619void 1636void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1637ev_timer_start (EV_P_ ev_timer *w)
1621{ 1638{
1622 if (expect_false (ev_is_active (w))) 1639 if (expect_false (ev_is_active (w)))
1623 return; 1640 return;
1624 1641
1625 ((WT)w)->at += mn_now; 1642 ((WT)w)->at += mn_now;
1626 1643
1627 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1644 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1628 1645
1629 ev_start (EV_A_ (W)w, ++timercnt); 1646 ev_start (EV_A_ (W)w, ++timercnt);
1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1631 timers [timercnt - 1] = w; 1648 timers [timercnt - 1] = (WT)w;
1632 upheap ((WT *)timers, timercnt - 1); 1649 upheap (timers, timercnt - 1);
1633 1650
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1652}
1636 1653
1637void 1654void noinline
1638ev_timer_stop (EV_P_ ev_timer *w) 1655ev_timer_stop (EV_P_ ev_timer *w)
1639{ 1656{
1640 clear_pending (EV_A_ (W)w); 1657 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1658 if (expect_false (!ev_is_active (w)))
1642 return; 1659 return;
1643 1660
1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1645 1662
1646 { 1663 {
1647 int active = ((W)w)->active; 1664 int active = ((W)w)->active;
1648 1665
1649 if (expect_true (--active < --timercnt)) 1666 if (expect_true (--active < --timercnt))
1650 { 1667 {
1651 timers [active] = timers [timercnt]; 1668 timers [active] = timers [timercnt];
1652 adjustheap ((WT *)timers, timercnt, active); 1669 adjustheap (timers, timercnt, active);
1653 } 1670 }
1654 } 1671 }
1655 1672
1656 ((WT)w)->at -= mn_now; 1673 ((WT)w)->at -= mn_now;
1657 1674
1658 ev_stop (EV_A_ (W)w); 1675 ev_stop (EV_A_ (W)w);
1659} 1676}
1660 1677
1661void 1678void noinline
1662ev_timer_again (EV_P_ ev_timer *w) 1679ev_timer_again (EV_P_ ev_timer *w)
1663{ 1680{
1664 if (ev_is_active (w)) 1681 if (ev_is_active (w))
1665 { 1682 {
1666 if (w->repeat) 1683 if (w->repeat)
1667 { 1684 {
1668 ((WT)w)->at = mn_now + w->repeat; 1685 ((WT)w)->at = mn_now + w->repeat;
1669 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1686 adjustheap (timers, timercnt, ((W)w)->active - 1);
1670 } 1687 }
1671 else 1688 else
1672 ev_timer_stop (EV_A_ w); 1689 ev_timer_stop (EV_A_ w);
1673 } 1690 }
1674 else if (w->repeat) 1691 else if (w->repeat)
… …
1677 ev_timer_start (EV_A_ w); 1694 ev_timer_start (EV_A_ w);
1678 } 1695 }
1679} 1696}
1680 1697
1681#if EV_PERIODIC_ENABLE 1698#if EV_PERIODIC_ENABLE
1682void 1699void noinline
1683ev_periodic_start (EV_P_ ev_periodic *w) 1700ev_periodic_start (EV_P_ ev_periodic *w)
1684{ 1701{
1685 if (expect_false (ev_is_active (w))) 1702 if (expect_false (ev_is_active (w)))
1686 return; 1703 return;
1687 1704
… …
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1706 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1707 else if (w->interval)
1691 { 1708 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1709 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1693 /* this formula differs from the one in periodic_reify because we do not always round up */ 1710 /* this formula differs from the one in periodic_reify because we do not always round up */
1694 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1711 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1712 }
1713 else
1714 ((WT)w)->at = w->offset;
1696 1715
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1716 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1718 periodics [periodiccnt - 1] = (WT)w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1719 upheap (periodics, periodiccnt - 1);
1701 1720
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1722}
1704 1723
1705void 1724void noinline
1706ev_periodic_stop (EV_P_ ev_periodic *w) 1725ev_periodic_stop (EV_P_ ev_periodic *w)
1707{ 1726{
1708 clear_pending (EV_A_ (W)w); 1727 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1728 if (expect_false (!ev_is_active (w)))
1710 return; 1729 return;
1711 1730
1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1713 1732
1714 { 1733 {
1715 int active = ((W)w)->active; 1734 int active = ((W)w)->active;
1716 1735
1717 if (expect_true (--active < --periodiccnt)) 1736 if (expect_true (--active < --periodiccnt))
1718 { 1737 {
1719 periodics [active] = periodics [periodiccnt]; 1738 periodics [active] = periodics [periodiccnt];
1720 adjustheap ((WT *)periodics, periodiccnt, active); 1739 adjustheap (periodics, periodiccnt, active);
1721 } 1740 }
1722 } 1741 }
1723 1742
1724 ev_stop (EV_A_ (W)w); 1743 ev_stop (EV_A_ (W)w);
1725} 1744}
1726 1745
1727void 1746void noinline
1728ev_periodic_again (EV_P_ ev_periodic *w) 1747ev_periodic_again (EV_P_ ev_periodic *w)
1729{ 1748{
1730 /* TODO: use adjustheap and recalculation */ 1749 /* TODO: use adjustheap and recalculation */
1731 ev_periodic_stop (EV_A_ w); 1750 ev_periodic_stop (EV_A_ w);
1732 ev_periodic_start (EV_A_ w); 1751 ev_periodic_start (EV_A_ w);
… …
1735 1754
1736#ifndef SA_RESTART 1755#ifndef SA_RESTART
1737# define SA_RESTART 0 1756# define SA_RESTART 0
1738#endif 1757#endif
1739 1758
1740void 1759void noinline
1741ev_signal_start (EV_P_ ev_signal *w) 1760ev_signal_start (EV_P_ ev_signal *w)
1742{ 1761{
1743#if EV_MULTIPLICITY 1762#if EV_MULTIPLICITY
1744 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1763 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1745#endif 1764#endif
1746 if (expect_false (ev_is_active (w))) 1765 if (expect_false (ev_is_active (w)))
1747 return; 1766 return;
1748 1767
1749 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1750 1769
1770 {
1771#ifndef _WIN32
1772 sigset_t full, prev;
1773 sigfillset (&full);
1774 sigprocmask (SIG_SETMASK, &full, &prev);
1775#endif
1776
1777 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1778
1779#ifndef _WIN32
1780 sigprocmask (SIG_SETMASK, &prev, 0);
1781#endif
1782 }
1783
1751 ev_start (EV_A_ (W)w, 1); 1784 ev_start (EV_A_ (W)w, 1);
1752 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1753 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1785 wlist_add (&signals [w->signum - 1].head, (WL)w);
1754 1786
1755 if (!((WL)w)->next) 1787 if (!((WL)w)->next)
1756 { 1788 {
1757#if _WIN32 1789#if _WIN32
1758 signal (w->signum, sighandler); 1790 signal (w->signum, sighandler);
… …
1764 sigaction (w->signum, &sa, 0); 1796 sigaction (w->signum, &sa, 0);
1765#endif 1797#endif
1766 } 1798 }
1767} 1799}
1768 1800
1769void 1801void noinline
1770ev_signal_stop (EV_P_ ev_signal *w) 1802ev_signal_stop (EV_P_ ev_signal *w)
1771{ 1803{
1772 clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1774 return; 1806 return;
1775 1807
1776 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1808 wlist_del (&signals [w->signum - 1].head, (WL)w);
1777 ev_stop (EV_A_ (W)w); 1809 ev_stop (EV_A_ (W)w);
1778 1810
1779 if (!signals [w->signum - 1].head) 1811 if (!signals [w->signum - 1].head)
1780 signal (w->signum, SIG_DFL); 1812 signal (w->signum, SIG_DFL);
1781} 1813}
… …
1788#endif 1820#endif
1789 if (expect_false (ev_is_active (w))) 1821 if (expect_false (ev_is_active (w)))
1790 return; 1822 return;
1791 1823
1792 ev_start (EV_A_ (W)w, 1); 1824 ev_start (EV_A_ (W)w, 1);
1793 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1825 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1794} 1826}
1795 1827
1796void 1828void
1797ev_child_stop (EV_P_ ev_child *w) 1829ev_child_stop (EV_P_ ev_child *w)
1798{ 1830{
1799 clear_pending (EV_A_ (W)w); 1831 clear_pending (EV_A_ (W)w);
1800 if (expect_false (!ev_is_active (w))) 1832 if (expect_false (!ev_is_active (w)))
1801 return; 1833 return;
1802 1834
1803 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1835 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1804 ev_stop (EV_A_ (W)w); 1836 ev_stop (EV_A_ (W)w);
1805} 1837}
1806 1838
1807#if EV_STAT_ENABLE 1839#if EV_STAT_ENABLE
1808 1840
… …
2150 2182
2151#if EV_EMBED_ENABLE 2183#if EV_EMBED_ENABLE
2152void noinline 2184void noinline
2153ev_embed_sweep (EV_P_ ev_embed *w) 2185ev_embed_sweep (EV_P_ ev_embed *w)
2154{ 2186{
2155 ev_loop (w->loop, EVLOOP_NONBLOCK); 2187 ev_loop (w->other, EVLOOP_NONBLOCK);
2156} 2188}
2157 2189
2158static void 2190static void
2159embed_cb (EV_P_ ev_io *io, int revents) 2191embed_io_cb (EV_P_ ev_io *io, int revents)
2160{ 2192{
2161 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2162 2194
2163 if (ev_cb (w)) 2195 if (ev_cb (w))
2164 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2196 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2165 else 2197 else
2166 ev_embed_sweep (loop, w); 2198 ev_embed_sweep (loop, w);
2167} 2199}
2168 2200
2201static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205
2206 fd_reify (w->other);
2207}
2208
2169void 2209void
2170ev_embed_start (EV_P_ ev_embed *w) 2210ev_embed_start (EV_P_ ev_embed *w)
2171{ 2211{
2172 if (expect_false (ev_is_active (w))) 2212 if (expect_false (ev_is_active (w)))
2173 return; 2213 return;
2174 2214
2175 { 2215 {
2176 struct ev_loop *loop = w->loop; 2216 struct ev_loop *loop = w->other;
2177 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2217 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2178 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2218 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2179 } 2219 }
2180 2220
2181 ev_set_priority (&w->io, ev_priority (w)); 2221 ev_set_priority (&w->io, ev_priority (w));
2182 ev_io_start (EV_A_ &w->io); 2222 ev_io_start (EV_A_ &w->io);
2183 2223
2224 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare);
2227
2184 ev_start (EV_A_ (W)w, 1); 2228 ev_start (EV_A_ (W)w, 1);
2185} 2229}
2186 2230
2187void 2231void
2188ev_embed_stop (EV_P_ ev_embed *w) 2232ev_embed_stop (EV_P_ ev_embed *w)
… …
2190 clear_pending (EV_A_ (W)w); 2234 clear_pending (EV_A_ (W)w);
2191 if (expect_false (!ev_is_active (w))) 2235 if (expect_false (!ev_is_active (w)))
2192 return; 2236 return;
2193 2237
2194 ev_io_stop (EV_A_ &w->io); 2238 ev_io_stop (EV_A_ &w->io);
2239 ev_prepare_stop (EV_A_ &w->prepare);
2195 2240
2196 ev_stop (EV_A_ (W)w); 2241 ev_stop (EV_A_ (W)w);
2197} 2242}
2198#endif 2243#endif
2199 2244
… …
2288 ev_timer_set (&once->to, timeout, 0.); 2333 ev_timer_set (&once->to, timeout, 0.);
2289 ev_timer_start (EV_A_ &once->to); 2334 ev_timer_start (EV_A_ &once->to);
2290 } 2335 }
2291} 2336}
2292 2337
2338#if EV_MULTIPLICITY
2339 #include "ev_wrap.h"
2340#endif
2341
2293#ifdef __cplusplus 2342#ifdef __cplusplus
2294} 2343}
2295#endif 2344#endif
2296 2345

Diff Legend

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