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

Comparing libev/ev.c (file contents):
Revision 1.169 by root, Sat Dec 8 14:27:39 2007 UTC vs.
Revision 1.186 by root, Sat Dec 15 23:14:38 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);
1022#endif 1050#endif
1023 array_free (prepare, EMPTY); 1051 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1052 array_free (check, EMPTY);
1053 array_free (fork, EMPTY);
1025 1054
1026 backend = 0; 1055 backend = 0;
1027} 1056}
1028 1057
1029void inline_size infy_fork (EV_P); 1058void inline_size infy_fork (EV_P);
… …
1196void inline_size 1225void inline_size
1197timers_reify (EV_P) 1226timers_reify (EV_P)
1198{ 1227{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1228 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1229 {
1201 ev_timer *w = timers [0]; 1230 ev_timer *w = (ev_timer *)timers [0];
1202 1231
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1232 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1233
1205 /* first reschedule or stop timer */ 1234 /* first reschedule or stop timer */
1206 if (w->repeat) 1235 if (w->repeat)
… …
1209 1238
1210 ((WT)w)->at += w->repeat; 1239 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1240 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1241 ((WT)w)->at = mn_now;
1213 1242
1214 downheap ((WT *)timers, timercnt, 0); 1243 downheap (timers, timercnt, 0);
1215 } 1244 }
1216 else 1245 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1246 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1247
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1248 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1224void inline_size 1253void inline_size
1225periodics_reify (EV_P) 1254periodics_reify (EV_P)
1226{ 1255{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1256 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1257 {
1229 ev_periodic *w = periodics [0]; 1258 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1259
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1260 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1261
1233 /* first reschedule or stop timer */ 1262 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1263 if (w->reschedule_cb)
1235 { 1264 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1265 ((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)); 1266 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1267 downheap (periodics, periodiccnt, 0);
1239 } 1268 }
1240 else if (w->interval) 1269 else if (w->interval)
1241 { 1270 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1271 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1272 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)); 1273 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); 1274 downheap (periodics, periodiccnt, 0);
1245 } 1275 }
1246 else 1276 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1277 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1278
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1279 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1256 int i; 1286 int i;
1257 1287
1258 /* adjust periodics after time jump */ 1288 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1289 for (i = 0; i < periodiccnt; ++i)
1260 { 1290 {
1261 ev_periodic *w = periodics [i]; 1291 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1292
1263 if (w->reschedule_cb) 1293 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1294 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1295 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1296 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1297 }
1268 1298
1269 /* now rebuild the heap */ 1299 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1300 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1301 downheap (periodics, periodiccnt, i);
1272} 1302}
1273#endif 1303#endif
1274 1304
1275#if EV_IDLE_ENABLE 1305#if EV_IDLE_ENABLE
1276void inline_size 1306void inline_size
… …
1293 } 1323 }
1294 } 1324 }
1295} 1325}
1296#endif 1326#endif
1297 1327
1298int inline_size 1328void inline_speed
1299time_update_monotonic (EV_P) 1329time_update (EV_P_ ev_tstamp max_block)
1300{ 1330{
1331 int i;
1332
1333#if EV_USE_MONOTONIC
1334 if (expect_true (have_monotonic))
1335 {
1336 ev_tstamp odiff = rtmn_diff;
1337
1301 mn_now = get_clock (); 1338 mn_now = get_clock ();
1302 1339
1340 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1341 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1342 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1343 {
1305 ev_rt_now = rtmn_diff + mn_now; 1344 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1345 return;
1307 } 1346 }
1308 else 1347
1309 {
1310 now_floor = mn_now; 1348 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1349 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1350
1316void inline_size 1351 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1352 * on the choice of "4": one iteration isn't enough,
1318{ 1353 * in case we get preempted during the calls to
1319 int i; 1354 * ev_time and get_clock. a second call is almost guaranteed
1320 1355 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1356 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1357 * in the unlikely event of having been preempted here.
1323 { 1358 */
1324 if (time_update_monotonic (EV_A)) 1359 for (i = 4; --i; )
1325 { 1360 {
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; 1361 rtmn_diff = ev_rt_now - mn_now;
1339 1362
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1363 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1364 return; /* all is well */
1342 1365
1343 ev_rt_now = ev_time (); 1366 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1367 mn_now = get_clock ();
1345 now_floor = mn_now; 1368 now_floor = mn_now;
1346 } 1369 }
1347 1370
1348# if EV_PERIODIC_ENABLE 1371# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1372 periodics_reschedule (EV_A);
1350# endif 1373# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1374 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1375 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1376 }
1355 else 1377 else
1356#endif 1378#endif
1357 { 1379 {
1358 ev_rt_now = ev_time (); 1380 ev_rt_now = ev_time ();
1359 1381
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1382 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1383 {
1362#if EV_PERIODIC_ENABLE 1384#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1385 periodics_reschedule (EV_A);
1364#endif 1386#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1387 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1388 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1389 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1390 }
1370 1391
… …
1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1435 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1415 call_pending (EV_A); 1436 call_pending (EV_A);
1416 } 1437 }
1417#endif 1438#endif
1418 1439
1419 /* queue check watchers (and execute them) */ 1440 /* queue prepare watchers (and execute them) */
1420 if (expect_false (preparecnt)) 1441 if (expect_false (preparecnt))
1421 { 1442 {
1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1443 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1423 call_pending (EV_A); 1444 call_pending (EV_A);
1424 } 1445 }
… …
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1461 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1441 block = 0.; /* do not block at all */ 1462 block = 0.; /* do not block at all */
1442 else 1463 else
1443 { 1464 {
1444 /* update time to cancel out callback processing overhead */ 1465 /* 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); 1466 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1467
1455 block = MAX_BLOCKTIME; 1468 block = MAX_BLOCKTIME;
1456 1469
1457 if (timercnt) 1470 if (timercnt)
1458 { 1471 {
… …
1471 if (expect_false (block < 0.)) block = 0.; 1484 if (expect_false (block < 0.)) block = 0.;
1472 } 1485 }
1473 1486
1474 ++loop_count; 1487 ++loop_count;
1475 backend_poll (EV_A_ block); 1488 backend_poll (EV_A_ block);
1489
1490 /* update ev_rt_now, do magic */
1491 time_update (EV_A_ block);
1476 } 1492 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1493
1481 /* queue pending timers and reschedule them */ 1494 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1495 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1496#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1497 periodics_reify (EV_A); /* absolute timers called first */
… …
1546ev_clear_pending (EV_P_ void *w) 1559ev_clear_pending (EV_P_ void *w)
1547{ 1560{
1548 W w_ = (W)w; 1561 W w_ = (W)w;
1549 int pending = w_->pending; 1562 int pending = w_->pending;
1550 1563
1551 if (!pending) 1564 if (expect_true (pending))
1565 {
1566 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1567 w_->pending = 0;
1568 p->w = 0;
1569 return p->events;
1570 }
1571 else
1552 return 0; 1572 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} 1573}
1560 1574
1561void inline_size 1575void inline_size
1562pri_adjust (EV_P_ W w) 1576pri_adjust (EV_P_ W w)
1563{ 1577{
… …
1582 w->active = 0; 1596 w->active = 0;
1583} 1597}
1584 1598
1585/*****************************************************************************/ 1599/*****************************************************************************/
1586 1600
1587void 1601void noinline
1588ev_io_start (EV_P_ ev_io *w) 1602ev_io_start (EV_P_ ev_io *w)
1589{ 1603{
1590 int fd = w->fd; 1604 int fd = w->fd;
1591 1605
1592 if (expect_false (ev_is_active (w))) 1606 if (expect_false (ev_is_active (w)))
… …
1594 1608
1595 assert (("ev_io_start called with negative fd", fd >= 0)); 1609 assert (("ev_io_start called with negative fd", fd >= 0));
1596 1610
1597 ev_start (EV_A_ (W)w, 1); 1611 ev_start (EV_A_ (W)w, 1);
1598 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1612 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1599 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1613 wlist_add (&anfds[fd].head, (WL)w);
1600 1614
1601 fd_change (EV_A_ fd); 1615 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1616 w->events &= ~EV_IOFDSET;
1602} 1617}
1603 1618
1604void 1619void noinline
1605ev_io_stop (EV_P_ ev_io *w) 1620ev_io_stop (EV_P_ ev_io *w)
1606{ 1621{
1607 clear_pending (EV_A_ (W)w); 1622 clear_pending (EV_A_ (W)w);
1608 if (expect_false (!ev_is_active (w))) 1623 if (expect_false (!ev_is_active (w)))
1609 return; 1624 return;
1610 1625
1611 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1626 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1612 1627
1613 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1628 wlist_del (&anfds[w->fd].head, (WL)w);
1614 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1615 1630
1616 fd_change (EV_A_ w->fd); 1631 fd_change (EV_A_ w->fd, 1);
1617} 1632}
1618 1633
1619void 1634void noinline
1620ev_timer_start (EV_P_ ev_timer *w) 1635ev_timer_start (EV_P_ ev_timer *w)
1621{ 1636{
1622 if (expect_false (ev_is_active (w))) 1637 if (expect_false (ev_is_active (w)))
1623 return; 1638 return;
1624 1639
1625 ((WT)w)->at += mn_now; 1640 ((WT)w)->at += mn_now;
1626 1641
1627 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1642 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1628 1643
1629 ev_start (EV_A_ (W)w, ++timercnt); 1644 ev_start (EV_A_ (W)w, ++timercnt);
1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1645 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1631 timers [timercnt - 1] = w; 1646 timers [timercnt - 1] = (WT)w;
1632 upheap ((WT *)timers, timercnt - 1); 1647 upheap (timers, timercnt - 1);
1633 1648
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1649 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635} 1650}
1636 1651
1637void 1652void noinline
1638ev_timer_stop (EV_P_ ev_timer *w) 1653ev_timer_stop (EV_P_ ev_timer *w)
1639{ 1654{
1640 clear_pending (EV_A_ (W)w); 1655 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1656 if (expect_false (!ev_is_active (w)))
1642 return; 1657 return;
1643 1658
1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1659 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1645 1660
1646 { 1661 {
1647 int active = ((W)w)->active; 1662 int active = ((W)w)->active;
1648 1663
1649 if (expect_true (--active < --timercnt)) 1664 if (expect_true (--active < --timercnt))
1650 { 1665 {
1651 timers [active] = timers [timercnt]; 1666 timers [active] = timers [timercnt];
1652 adjustheap ((WT *)timers, timercnt, active); 1667 adjustheap (timers, timercnt, active);
1653 } 1668 }
1654 } 1669 }
1655 1670
1656 ((WT)w)->at -= mn_now; 1671 ((WT)w)->at -= mn_now;
1657 1672
1658 ev_stop (EV_A_ (W)w); 1673 ev_stop (EV_A_ (W)w);
1659} 1674}
1660 1675
1661void 1676void noinline
1662ev_timer_again (EV_P_ ev_timer *w) 1677ev_timer_again (EV_P_ ev_timer *w)
1663{ 1678{
1664 if (ev_is_active (w)) 1679 if (ev_is_active (w))
1665 { 1680 {
1666 if (w->repeat) 1681 if (w->repeat)
1667 { 1682 {
1668 ((WT)w)->at = mn_now + w->repeat; 1683 ((WT)w)->at = mn_now + w->repeat;
1669 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1684 adjustheap (timers, timercnt, ((W)w)->active - 1);
1670 } 1685 }
1671 else 1686 else
1672 ev_timer_stop (EV_A_ w); 1687 ev_timer_stop (EV_A_ w);
1673 } 1688 }
1674 else if (w->repeat) 1689 else if (w->repeat)
… …
1677 ev_timer_start (EV_A_ w); 1692 ev_timer_start (EV_A_ w);
1678 } 1693 }
1679} 1694}
1680 1695
1681#if EV_PERIODIC_ENABLE 1696#if EV_PERIODIC_ENABLE
1682void 1697void noinline
1683ev_periodic_start (EV_P_ ev_periodic *w) 1698ev_periodic_start (EV_P_ ev_periodic *w)
1684{ 1699{
1685 if (expect_false (ev_is_active (w))) 1700 if (expect_false (ev_is_active (w)))
1686 return; 1701 return;
1687 1702
… …
1689 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1704 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1690 else if (w->interval) 1705 else if (w->interval)
1691 { 1706 {
1692 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1707 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 */ 1708 /* 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; 1709 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1695 } 1710 }
1711 else
1712 ((WT)w)->at = w->offset;
1696 1713
1697 ev_start (EV_A_ (W)w, ++periodiccnt); 1714 ev_start (EV_A_ (W)w, ++periodiccnt);
1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1715 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1699 periodics [periodiccnt - 1] = w; 1716 periodics [periodiccnt - 1] = (WT)w;
1700 upheap ((WT *)periodics, periodiccnt - 1); 1717 upheap (periodics, periodiccnt - 1);
1701 1718
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1719 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703} 1720}
1704 1721
1705void 1722void noinline
1706ev_periodic_stop (EV_P_ ev_periodic *w) 1723ev_periodic_stop (EV_P_ ev_periodic *w)
1707{ 1724{
1708 clear_pending (EV_A_ (W)w); 1725 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w))) 1726 if (expect_false (!ev_is_active (w)))
1710 return; 1727 return;
1711 1728
1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1729 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1713 1730
1714 { 1731 {
1715 int active = ((W)w)->active; 1732 int active = ((W)w)->active;
1716 1733
1717 if (expect_true (--active < --periodiccnt)) 1734 if (expect_true (--active < --periodiccnt))
1718 { 1735 {
1719 periodics [active] = periodics [periodiccnt]; 1736 periodics [active] = periodics [periodiccnt];
1720 adjustheap ((WT *)periodics, periodiccnt, active); 1737 adjustheap (periodics, periodiccnt, active);
1721 } 1738 }
1722 } 1739 }
1723 1740
1724 ev_stop (EV_A_ (W)w); 1741 ev_stop (EV_A_ (W)w);
1725} 1742}
1726 1743
1727void 1744void noinline
1728ev_periodic_again (EV_P_ ev_periodic *w) 1745ev_periodic_again (EV_P_ ev_periodic *w)
1729{ 1746{
1730 /* TODO: use adjustheap and recalculation */ 1747 /* TODO: use adjustheap and recalculation */
1731 ev_periodic_stop (EV_A_ w); 1748 ev_periodic_stop (EV_A_ w);
1732 ev_periodic_start (EV_A_ w); 1749 ev_periodic_start (EV_A_ w);
… …
1735 1752
1736#ifndef SA_RESTART 1753#ifndef SA_RESTART
1737# define SA_RESTART 0 1754# define SA_RESTART 0
1738#endif 1755#endif
1739 1756
1740void 1757void noinline
1741ev_signal_start (EV_P_ ev_signal *w) 1758ev_signal_start (EV_P_ ev_signal *w)
1742{ 1759{
1743#if EV_MULTIPLICITY 1760#if EV_MULTIPLICITY
1744 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1761 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1745#endif 1762#endif
1746 if (expect_false (ev_is_active (w))) 1763 if (expect_false (ev_is_active (w)))
1747 return; 1764 return;
1748 1765
1749 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1766 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1750 1767
1768 {
1769#ifndef _WIN32
1770 sigset_t full, prev;
1771 sigfillset (&full);
1772 sigprocmask (SIG_SETMASK, &full, &prev);
1773#endif
1774
1775 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1776
1777#ifndef _WIN32
1778 sigprocmask (SIG_SETMASK, &prev, 0);
1779#endif
1780 }
1781
1751 ev_start (EV_A_ (W)w, 1); 1782 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); 1783 wlist_add (&signals [w->signum - 1].head, (WL)w);
1754 1784
1755 if (!((WL)w)->next) 1785 if (!((WL)w)->next)
1756 { 1786 {
1757#if _WIN32 1787#if _WIN32
1758 signal (w->signum, sighandler); 1788 signal (w->signum, sighandler);
… …
1764 sigaction (w->signum, &sa, 0); 1794 sigaction (w->signum, &sa, 0);
1765#endif 1795#endif
1766 } 1796 }
1767} 1797}
1768 1798
1769void 1799void noinline
1770ev_signal_stop (EV_P_ ev_signal *w) 1800ev_signal_stop (EV_P_ ev_signal *w)
1771{ 1801{
1772 clear_pending (EV_A_ (W)w); 1802 clear_pending (EV_A_ (W)w);
1773 if (expect_false (!ev_is_active (w))) 1803 if (expect_false (!ev_is_active (w)))
1774 return; 1804 return;
1775 1805
1776 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1806 wlist_del (&signals [w->signum - 1].head, (WL)w);
1777 ev_stop (EV_A_ (W)w); 1807 ev_stop (EV_A_ (W)w);
1778 1808
1779 if (!signals [w->signum - 1].head) 1809 if (!signals [w->signum - 1].head)
1780 signal (w->signum, SIG_DFL); 1810 signal (w->signum, SIG_DFL);
1781} 1811}
… …
1788#endif 1818#endif
1789 if (expect_false (ev_is_active (w))) 1819 if (expect_false (ev_is_active (w)))
1790 return; 1820 return;
1791 1821
1792 ev_start (EV_A_ (W)w, 1); 1822 ev_start (EV_A_ (W)w, 1);
1793 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1823 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1794} 1824}
1795 1825
1796void 1826void
1797ev_child_stop (EV_P_ ev_child *w) 1827ev_child_stop (EV_P_ ev_child *w)
1798{ 1828{
1799 clear_pending (EV_A_ (W)w); 1829 clear_pending (EV_A_ (W)w);
1800 if (expect_false (!ev_is_active (w))) 1830 if (expect_false (!ev_is_active (w)))
1801 return; 1831 return;
1802 1832
1803 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1833 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1804 ev_stop (EV_A_ (W)w); 1834 ev_stop (EV_A_ (W)w);
1805} 1835}
1806 1836
1807#if EV_STAT_ENABLE 1837#if EV_STAT_ENABLE
1808 1838

Diff Legend

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