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.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 inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
229# define noinline __attribute__ ((noinline)) 238# 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 239#else
236# define expect(expr,value) (expr) 240# define expect(expr,value) (expr)
237# define inline_speed static
238# define inline_size static
239# define noinline 241# define noinline
242# if __STDC_VERSION__ < 199901L
243# define inline
244# endif
240#endif 245#endif
241 246
242#define expect_false(expr) expect ((expr) != 0, 0) 247#define expect_false(expr) expect ((expr) != 0, 0)
243#define expect_true(expr) expect ((expr) != 0, 1) 248#define expect_true(expr) expect ((expr) != 0, 1)
249#define inline_size static inline
250
251#if EV_MINIMAL
252# define inline_speed static noinline
253#else
254# define inline_speed static inline
255#endif
244 256
245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 257#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
246#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 258#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
247 259
248#define EMPTY /* required for microsofts broken pseudo-c compiler */ 260#define EMPTY /* required for microsofts broken pseudo-c compiler */
… …
417 } 429 }
418 430
419 return ncur; 431 return ncur;
420} 432}
421 433
422inline_speed void * 434static noinline void *
423array_realloc (int elem, void *base, int *cur, int cnt) 435array_realloc (int elem, void *base, int *cur, int cnt)
424{ 436{
425 *cur = array_nextsize (elem, *cur, cnt); 437 *cur = array_nextsize (elem, *cur, cnt);
426 return ev_realloc (base, elem * *cur); 438 return ev_realloc (base, elem * *cur);
427} 439}
… …
452 464
453void noinline 465void noinline
454ev_feed_event (EV_P_ void *w, int revents) 466ev_feed_event (EV_P_ void *w, int revents)
455{ 467{
456 W w_ = (W)w; 468 W w_ = (W)w;
469 int pri = ABSPRI (w_);
457 470
458 if (expect_false (w_->pending)) 471 if (expect_false (w_->pending))
472 pendings [pri][w_->pending - 1].events |= revents;
473 else
459 { 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_;
460 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 478 pendings [pri][w_->pending - 1].events = revents;
461 return;
462 } 479 }
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} 480}
469 481
470void inline_size 482void inline_speed
471queue_events (EV_P_ W *events, int eventcnt, int type) 483queue_events (EV_P_ W *events, int eventcnt, int type)
472{ 484{
473 int i; 485 int i;
474 486
475 for (i = 0; i < eventcnt; ++i) 487 for (i = 0; i < eventcnt; ++i)
… …
522 { 534 {
523 int fd = fdchanges [i]; 535 int fd = fdchanges [i];
524 ANFD *anfd = anfds + fd; 536 ANFD *anfd = anfds + fd;
525 ev_io *w; 537 ev_io *w;
526 538
527 int events = 0; 539 unsigned char events = 0;
528 540
529 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)
530 events |= w->events; 542 events |= (unsigned char)w->events;
531 543
532#if EV_SELECT_IS_WINSOCKET 544#if EV_SELECT_IS_WINSOCKET
533 if (events) 545 if (events)
534 { 546 {
535 unsigned long argp; 547 unsigned long argp;
536 anfd->handle = _get_osfhandle (fd); 548 anfd->handle = _get_osfhandle (fd);
537 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));
538 } 550 }
539#endif 551#endif
540 552
553 {
554 unsigned char o_events = anfd->events;
555 unsigned char o_reify = anfd->reify;
556
541 anfd->reify = 0; 557 anfd->reify = 0;
542
543 backend_modify (EV_A_ fd, anfd->events, events);
544 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 }
545 } 563 }
546 564
547 fdchangecnt = 0; 565 fdchangecnt = 0;
548} 566}
549 567
550void inline_size 568void inline_size
551fd_change (EV_P_ int fd) 569fd_change (EV_P_ int fd, int flags)
552{ 570{
553 if (expect_false (anfds [fd].reify)) 571 unsigned char reify = anfds [fd].reify;
554 return;
555
556 anfds [fd].reify = 1; 572 anfds [fd].reify |= flags;
557 573
574 if (expect_true (!reify))
575 {
558 ++fdchangecnt; 576 ++fdchangecnt;
559 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 577 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
560 fdchanges [fdchangecnt - 1] = fd; 578 fdchanges [fdchangecnt - 1] = fd;
579 }
561} 580}
562 581
563void inline_speed 582void inline_speed
564fd_kill (EV_P_ int fd) 583fd_kill (EV_P_ int fd)
565{ 584{
… …
616 635
617 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
618 if (anfds [fd].events) 637 if (anfds [fd].events)
619 { 638 {
620 anfds [fd].events = 0; 639 anfds [fd].events = 0;
621 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
622 } 641 }
623} 642}
624 643
625/*****************************************************************************/ 644/*****************************************************************************/
626 645
627void inline_speed 646void inline_speed
628upheap (WT *heap, int k) 647upheap (WT *heap, int k)
629{ 648{
630 WT w = heap [k]; 649 WT w = heap [k];
631 650
632 while (k && heap [k >> 1]->at > w->at) 651 while (k)
633 { 652 {
653 int p = (k - 1) >> 1;
654
655 if (heap [p]->at <= w->at)
656 break;
657
634 heap [k] = heap [k >> 1]; 658 heap [k] = heap [p];
635 ((W)heap [k])->active = k + 1; 659 ((W)heap [k])->active = k + 1;
636 k >>= 1; 660 k = p;
637 } 661 }
638 662
639 heap [k] = w; 663 heap [k] = w;
640 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
641
642} 665}
643 666
644void inline_speed 667void inline_speed
645downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
646{ 669{
647 WT w = heap [k]; 670 WT w = heap [k];
648 671
649 while (k < (N >> 1)) 672 for (;;)
650 { 673 {
651 int j = k << 1; 674 int c = (k << 1) + 1;
652 675
653 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 676 if (c >= N)
654 ++j;
655
656 if (w->at <= heap [j]->at)
657 break; 677 break;
658 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
659 heap [k] = heap [j]; 685 heap [k] = heap [c];
660 ((W)heap [k])->active = k + 1; 686 ((W)heap [k])->active = k + 1;
687
661 k = j; 688 k = c;
662 } 689 }
663 690
664 heap [k] = w; 691 heap [k] = w;
665 ((W)heap [k])->active = k + 1; 692 ((W)heap [k])->active = k + 1;
666} 693}
… …
748 for (signum = signalmax; signum--; ) 775 for (signum = signalmax; signum--; )
749 if (signals [signum].gotsig) 776 if (signals [signum].gotsig)
750 ev_feed_signal_event (EV_A_ signum + 1); 777 ev_feed_signal_event (EV_A_ signum + 1);
751} 778}
752 779
753void inline_size 780void inline_speed
754fd_intern (int fd) 781fd_intern (int fd)
755{ 782{
756#ifdef _WIN32 783#ifdef _WIN32
757 int arg = 1; 784 int arg = 1;
758 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 785 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
773 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
774} 801}
775 802
776/*****************************************************************************/ 803/*****************************************************************************/
777 804
778static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
779 806
780#ifndef _WIN32 807#ifndef _WIN32
781 808
782static ev_signal childev; 809static ev_signal childev;
783 810
… …
1011#if EV_IDLE_ENABLE 1038#if EV_IDLE_ENABLE
1012 array_free (idle, [i]); 1039 array_free (idle, [i]);
1013#endif 1040#endif
1014 } 1041 }
1015 1042
1043 ev_free (anfds); anfdmax = 0;
1044
1016 /* have to use the microsoft-never-gets-it-right macro */ 1045 /* have to use the microsoft-never-gets-it-right macro */
1017 array_free (fdchange, EMPTY); 1046 array_free (fdchange, EMPTY);
1018 array_free (timer, EMPTY); 1047 array_free (timer, EMPTY);
1019#if EV_PERIODIC_ENABLE 1048#if EV_PERIODIC_ENABLE
1020 array_free (periodic, EMPTY); 1049 array_free (periodic, EMPTY);
1021#endif 1050#endif
1022 array_free (prepare, EMPTY); 1051 array_free (prepare, EMPTY);
1023 array_free (check, EMPTY); 1052 array_free (check, EMPTY);
1053 array_free (fork, EMPTY);
1024 1054
1025 backend = 0; 1055 backend = 0;
1026} 1056}
1027 1057
1028void inline_size infy_fork (EV_P); 1058void inline_size infy_fork (EV_P);
… …
1195void inline_size 1225void inline_size
1196timers_reify (EV_P) 1226timers_reify (EV_P)
1197{ 1227{
1198 while (timercnt && ((WT)timers [0])->at <= mn_now) 1228 while (timercnt && ((WT)timers [0])->at <= mn_now)
1199 { 1229 {
1200 ev_timer *w = timers [0]; 1230 ev_timer *w = (ev_timer *)timers [0];
1201 1231
1202 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1232 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1203 1233
1204 /* first reschedule or stop timer */ 1234 /* first reschedule or stop timer */
1205 if (w->repeat) 1235 if (w->repeat)
… …
1208 1238
1209 ((WT)w)->at += w->repeat; 1239 ((WT)w)->at += w->repeat;
1210 if (((WT)w)->at < mn_now) 1240 if (((WT)w)->at < mn_now)
1211 ((WT)w)->at = mn_now; 1241 ((WT)w)->at = mn_now;
1212 1242
1213 downheap ((WT *)timers, timercnt, 0); 1243 downheap (timers, timercnt, 0);
1214 } 1244 }
1215 else 1245 else
1216 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1246 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1217 1247
1218 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1248 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1223void inline_size 1253void inline_size
1224periodics_reify (EV_P) 1254periodics_reify (EV_P)
1225{ 1255{
1226 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1256 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1227 { 1257 {
1228 ev_periodic *w = periodics [0]; 1258 ev_periodic *w = (ev_periodic *)periodics [0];
1229 1259
1230 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1260 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1231 1261
1232 /* first reschedule or stop timer */ 1262 /* first reschedule or stop timer */
1233 if (w->reschedule_cb) 1263 if (w->reschedule_cb)
1234 { 1264 {
1235 ((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);
1236 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));
1237 downheap ((WT *)periodics, periodiccnt, 0); 1267 downheap (periodics, periodiccnt, 0);
1238 } 1268 }
1239 else if (w->interval) 1269 else if (w->interval)
1240 { 1270 {
1241 ((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;
1242 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));
1243 downheap ((WT *)periodics, periodiccnt, 0); 1274 downheap (periodics, periodiccnt, 0);
1244 } 1275 }
1245 else 1276 else
1246 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1277 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1247 1278
1248 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1279 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1255 int i; 1286 int i;
1256 1287
1257 /* adjust periodics after time jump */ 1288 /* adjust periodics after time jump */
1258 for (i = 0; i < periodiccnt; ++i) 1289 for (i = 0; i < periodiccnt; ++i)
1259 { 1290 {
1260 ev_periodic *w = periodics [i]; 1291 ev_periodic *w = (ev_periodic *)periodics [i];
1261 1292
1262 if (w->reschedule_cb) 1293 if (w->reschedule_cb)
1263 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1294 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1264 else if (w->interval) 1295 else if (w->interval)
1265 ((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;
1266 } 1297 }
1267 1298
1268 /* now rebuild the heap */ 1299 /* now rebuild the heap */
1269 for (i = periodiccnt >> 1; i--; ) 1300 for (i = periodiccnt >> 1; i--; )
1270 downheap ((WT *)periodics, periodiccnt, i); 1301 downheap (periodics, periodiccnt, i);
1271} 1302}
1272#endif 1303#endif
1273 1304
1274#if EV_IDLE_ENABLE 1305#if EV_IDLE_ENABLE
1275void inline_size 1306void inline_size
… …
1292 } 1323 }
1293 } 1324 }
1294} 1325}
1295#endif 1326#endif
1296 1327
1297int inline_size 1328void inline_speed
1298time_update_monotonic (EV_P) 1329time_update (EV_P_ ev_tstamp max_block)
1299{ 1330{
1331 int i;
1332
1333#if EV_USE_MONOTONIC
1334 if (expect_true (have_monotonic))
1335 {
1336 ev_tstamp odiff = rtmn_diff;
1337
1300 mn_now = get_clock (); 1338 mn_now = get_clock ();
1301 1339
1340 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1341 /* interpolate in the meantime */
1302 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1342 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1303 { 1343 {
1304 ev_rt_now = rtmn_diff + mn_now; 1344 ev_rt_now = rtmn_diff + mn_now;
1305 return 0; 1345 return;
1306 } 1346 }
1307 else 1347
1308 {
1309 now_floor = mn_now; 1348 now_floor = mn_now;
1310 ev_rt_now = ev_time (); 1349 ev_rt_now = ev_time ();
1311 return 1;
1312 }
1313}
1314 1350
1315void inline_size 1351 /* loop a few times, before making important decisions.
1316time_update (EV_P) 1352 * on the choice of "4": one iteration isn't enough,
1317{ 1353 * in case we get preempted during the calls to
1318 int i; 1354 * ev_time and get_clock. a second call is almost guaranteed
1319 1355 * to succeed in that case, though. and looping a few more times
1320#if EV_USE_MONOTONIC 1356 * doesn't hurt either as we only do this on time-jumps or
1321 if (expect_true (have_monotonic)) 1357 * in the unlikely event of having been preempted here.
1322 { 1358 */
1323 if (time_update_monotonic (EV_A)) 1359 for (i = 4; --i; )
1324 { 1360 {
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; 1361 rtmn_diff = ev_rt_now - mn_now;
1338 1362
1339 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1363 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1340 return; /* all is well */ 1364 return; /* all is well */
1341 1365
1342 ev_rt_now = ev_time (); 1366 ev_rt_now = ev_time ();
1343 mn_now = get_clock (); 1367 mn_now = get_clock ();
1344 now_floor = mn_now; 1368 now_floor = mn_now;
1345 } 1369 }
1346 1370
1347# if EV_PERIODIC_ENABLE 1371# if EV_PERIODIC_ENABLE
1348 periodics_reschedule (EV_A); 1372 periodics_reschedule (EV_A);
1349# endif 1373# endif
1350 /* no timer adjustment, as the monotonic clock doesn't jump */ 1374 /* no timer adjustment, as the monotonic clock doesn't jump */
1351 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1375 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1352 }
1353 } 1376 }
1354 else 1377 else
1355#endif 1378#endif
1356 { 1379 {
1357 ev_rt_now = ev_time (); 1380 ev_rt_now = ev_time ();
1358 1381
1359 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))
1360 { 1383 {
1361#if EV_PERIODIC_ENABLE 1384#if EV_PERIODIC_ENABLE
1362 periodics_reschedule (EV_A); 1385 periodics_reschedule (EV_A);
1363#endif 1386#endif
1364
1365 /* 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 */
1366 for (i = 0; i < timercnt; ++i) 1388 for (i = 0; i < timercnt; ++i)
1367 ((WT)timers [i])->at += ev_rt_now - mn_now; 1389 ((WT)timers [i])->at += ev_rt_now - mn_now;
1368 } 1390 }
1369 1391
… …
1413 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1435 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1414 call_pending (EV_A); 1436 call_pending (EV_A);
1415 } 1437 }
1416#endif 1438#endif
1417 1439
1418 /* queue check watchers (and execute them) */ 1440 /* queue prepare watchers (and execute them) */
1419 if (expect_false (preparecnt)) 1441 if (expect_false (preparecnt))
1420 { 1442 {
1421 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1443 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1422 call_pending (EV_A); 1444 call_pending (EV_A);
1423 } 1445 }
… …
1439 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1461 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1440 block = 0.; /* do not block at all */ 1462 block = 0.; /* do not block at all */
1441 else 1463 else
1442 { 1464 {
1443 /* update time to cancel out callback processing overhead */ 1465 /* 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); 1466 time_update (EV_A_ 1e100);
1447 else
1448#endif
1449 {
1450 ev_rt_now = ev_time ();
1451 mn_now = ev_rt_now;
1452 }
1453 1467
1454 block = MAX_BLOCKTIME; 1468 block = MAX_BLOCKTIME;
1455 1469
1456 if (timercnt) 1470 if (timercnt)
1457 { 1471 {
… …
1470 if (expect_false (block < 0.)) block = 0.; 1484 if (expect_false (block < 0.)) block = 0.;
1471 } 1485 }
1472 1486
1473 ++loop_count; 1487 ++loop_count;
1474 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);
1475 } 1492 }
1476
1477 /* update ev_rt_now, do magic */
1478 time_update (EV_A);
1479 1493
1480 /* queue pending timers and reschedule them */ 1494 /* queue pending timers and reschedule them */
1481 timers_reify (EV_A); /* relative timers called last */ 1495 timers_reify (EV_A); /* relative timers called last */
1482#if EV_PERIODIC_ENABLE 1496#if EV_PERIODIC_ENABLE
1483 periodics_reify (EV_A); /* absolute timers called first */ 1497 periodics_reify (EV_A); /* absolute timers called first */
… …
1545ev_clear_pending (EV_P_ void *w) 1559ev_clear_pending (EV_P_ void *w)
1546{ 1560{
1547 W w_ = (W)w; 1561 W w_ = (W)w;
1548 int pending = w_->pending; 1562 int pending = w_->pending;
1549 1563
1550 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
1551 return 0; 1572 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} 1573}
1559 1574
1560void inline_size 1575void inline_size
1561pri_adjust (EV_P_ W w) 1576pri_adjust (EV_P_ W w)
1562{ 1577{
… …
1581 w->active = 0; 1596 w->active = 0;
1582} 1597}
1583 1598
1584/*****************************************************************************/ 1599/*****************************************************************************/
1585 1600
1586void 1601void noinline
1587ev_io_start (EV_P_ ev_io *w) 1602ev_io_start (EV_P_ ev_io *w)
1588{ 1603{
1589 int fd = w->fd; 1604 int fd = w->fd;
1590 1605
1591 if (expect_false (ev_is_active (w))) 1606 if (expect_false (ev_is_active (w)))
… …
1593 1608
1594 assert (("ev_io_start called with negative fd", fd >= 0)); 1609 assert (("ev_io_start called with negative fd", fd >= 0));
1595 1610
1596 ev_start (EV_A_ (W)w, 1); 1611 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1612 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1598 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1613 wlist_add (&anfds[fd].head, (WL)w);
1599 1614
1600 fd_change (EV_A_ fd); 1615 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1616 w->events &= ~EV_IOFDSET;
1601} 1617}
1602 1618
1603void 1619void noinline
1604ev_io_stop (EV_P_ ev_io *w) 1620ev_io_stop (EV_P_ ev_io *w)
1605{ 1621{
1606 clear_pending (EV_A_ (W)w); 1622 clear_pending (EV_A_ (W)w);
1607 if (expect_false (!ev_is_active (w))) 1623 if (expect_false (!ev_is_active (w)))
1608 return; 1624 return;
1609 1625
1610 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));
1611 1627
1612 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1628 wlist_del (&anfds[w->fd].head, (WL)w);
1613 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1614 1630
1615 fd_change (EV_A_ w->fd); 1631 fd_change (EV_A_ w->fd, 1);
1616} 1632}
1617 1633
1618void 1634void noinline
1619ev_timer_start (EV_P_ ev_timer *w) 1635ev_timer_start (EV_P_ ev_timer *w)
1620{ 1636{
1621 if (expect_false (ev_is_active (w))) 1637 if (expect_false (ev_is_active (w)))
1622 return; 1638 return;
1623 1639
1624 ((WT)w)->at += mn_now; 1640 ((WT)w)->at += mn_now;
1625 1641
1626 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.));
1627 1643
1628 ev_start (EV_A_ (W)w, ++timercnt); 1644 ev_start (EV_A_ (W)w, ++timercnt);
1629 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1645 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1630 timers [timercnt - 1] = w; 1646 timers [timercnt - 1] = (WT)w;
1631 upheap ((WT *)timers, timercnt - 1); 1647 upheap (timers, timercnt - 1);
1632 1648
1633 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1649 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1634} 1650}
1635 1651
1636void 1652void noinline
1637ev_timer_stop (EV_P_ ev_timer *w) 1653ev_timer_stop (EV_P_ ev_timer *w)
1638{ 1654{
1639 clear_pending (EV_A_ (W)w); 1655 clear_pending (EV_A_ (W)w);
1640 if (expect_false (!ev_is_active (w))) 1656 if (expect_false (!ev_is_active (w)))
1641 return; 1657 return;
1642 1658
1643 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1659 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1644 1660
1645 { 1661 {
1646 int active = ((W)w)->active; 1662 int active = ((W)w)->active;
1647 1663
1648 if (expect_true (--active < --timercnt)) 1664 if (expect_true (--active < --timercnt))
1649 { 1665 {
1650 timers [active] = timers [timercnt]; 1666 timers [active] = timers [timercnt];
1651 adjustheap ((WT *)timers, timercnt, active); 1667 adjustheap (timers, timercnt, active);
1652 } 1668 }
1653 } 1669 }
1654 1670
1655 ((WT)w)->at -= mn_now; 1671 ((WT)w)->at -= mn_now;
1656 1672
1657 ev_stop (EV_A_ (W)w); 1673 ev_stop (EV_A_ (W)w);
1658} 1674}
1659 1675
1660void 1676void noinline
1661ev_timer_again (EV_P_ ev_timer *w) 1677ev_timer_again (EV_P_ ev_timer *w)
1662{ 1678{
1663 if (ev_is_active (w)) 1679 if (ev_is_active (w))
1664 { 1680 {
1665 if (w->repeat) 1681 if (w->repeat)
1666 { 1682 {
1667 ((WT)w)->at = mn_now + w->repeat; 1683 ((WT)w)->at = mn_now + w->repeat;
1668 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1684 adjustheap (timers, timercnt, ((W)w)->active - 1);
1669 } 1685 }
1670 else 1686 else
1671 ev_timer_stop (EV_A_ w); 1687 ev_timer_stop (EV_A_ w);
1672 } 1688 }
1673 else if (w->repeat) 1689 else if (w->repeat)
… …
1676 ev_timer_start (EV_A_ w); 1692 ev_timer_start (EV_A_ w);
1677 } 1693 }
1678} 1694}
1679 1695
1680#if EV_PERIODIC_ENABLE 1696#if EV_PERIODIC_ENABLE
1681void 1697void noinline
1682ev_periodic_start (EV_P_ ev_periodic *w) 1698ev_periodic_start (EV_P_ ev_periodic *w)
1683{ 1699{
1684 if (expect_false (ev_is_active (w))) 1700 if (expect_false (ev_is_active (w)))
1685 return; 1701 return;
1686 1702
… …
1688 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1704 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1689 else if (w->interval) 1705 else if (w->interval)
1690 { 1706 {
1691 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.));
1692 /* 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 */
1693 ((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;
1694 } 1710 }
1711 else
1712 ((WT)w)->at = w->offset;
1695 1713
1696 ev_start (EV_A_ (W)w, ++periodiccnt); 1714 ev_start (EV_A_ (W)w, ++periodiccnt);
1697 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1715 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1698 periodics [periodiccnt - 1] = w; 1716 periodics [periodiccnt - 1] = (WT)w;
1699 upheap ((WT *)periodics, periodiccnt - 1); 1717 upheap (periodics, periodiccnt - 1);
1700 1718
1701 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1719 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1702} 1720}
1703 1721
1704void 1722void noinline
1705ev_periodic_stop (EV_P_ ev_periodic *w) 1723ev_periodic_stop (EV_P_ ev_periodic *w)
1706{ 1724{
1707 clear_pending (EV_A_ (W)w); 1725 clear_pending (EV_A_ (W)w);
1708 if (expect_false (!ev_is_active (w))) 1726 if (expect_false (!ev_is_active (w)))
1709 return; 1727 return;
1710 1728
1711 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1729 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1712 1730
1713 { 1731 {
1714 int active = ((W)w)->active; 1732 int active = ((W)w)->active;
1715 1733
1716 if (expect_true (--active < --periodiccnt)) 1734 if (expect_true (--active < --periodiccnt))
1717 { 1735 {
1718 periodics [active] = periodics [periodiccnt]; 1736 periodics [active] = periodics [periodiccnt];
1719 adjustheap ((WT *)periodics, periodiccnt, active); 1737 adjustheap (periodics, periodiccnt, active);
1720 } 1738 }
1721 } 1739 }
1722 1740
1723 ev_stop (EV_A_ (W)w); 1741 ev_stop (EV_A_ (W)w);
1724} 1742}
1725 1743
1726void 1744void noinline
1727ev_periodic_again (EV_P_ ev_periodic *w) 1745ev_periodic_again (EV_P_ ev_periodic *w)
1728{ 1746{
1729 /* TODO: use adjustheap and recalculation */ 1747 /* TODO: use adjustheap and recalculation */
1730 ev_periodic_stop (EV_A_ w); 1748 ev_periodic_stop (EV_A_ w);
1731 ev_periodic_start (EV_A_ w); 1749 ev_periodic_start (EV_A_ w);
… …
1734 1752
1735#ifndef SA_RESTART 1753#ifndef SA_RESTART
1736# define SA_RESTART 0 1754# define SA_RESTART 0
1737#endif 1755#endif
1738 1756
1739void 1757void noinline
1740ev_signal_start (EV_P_ ev_signal *w) 1758ev_signal_start (EV_P_ ev_signal *w)
1741{ 1759{
1742#if EV_MULTIPLICITY 1760#if EV_MULTIPLICITY
1743 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));
1744#endif 1762#endif
1745 if (expect_false (ev_is_active (w))) 1763 if (expect_false (ev_is_active (w)))
1746 return; 1764 return;
1747 1765
1748 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));
1749 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
1750 ev_start (EV_A_ (W)w, 1); 1782 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); 1783 wlist_add (&signals [w->signum - 1].head, (WL)w);
1753 1784
1754 if (!((WL)w)->next) 1785 if (!((WL)w)->next)
1755 { 1786 {
1756#if _WIN32 1787#if _WIN32
1757 signal (w->signum, sighandler); 1788 signal (w->signum, sighandler);
… …
1763 sigaction (w->signum, &sa, 0); 1794 sigaction (w->signum, &sa, 0);
1764#endif 1795#endif
1765 } 1796 }
1766} 1797}
1767 1798
1768void 1799void noinline
1769ev_signal_stop (EV_P_ ev_signal *w) 1800ev_signal_stop (EV_P_ ev_signal *w)
1770{ 1801{
1771 clear_pending (EV_A_ (W)w); 1802 clear_pending (EV_A_ (W)w);
1772 if (expect_false (!ev_is_active (w))) 1803 if (expect_false (!ev_is_active (w)))
1773 return; 1804 return;
1774 1805
1775 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1806 wlist_del (&signals [w->signum - 1].head, (WL)w);
1776 ev_stop (EV_A_ (W)w); 1807 ev_stop (EV_A_ (W)w);
1777 1808
1778 if (!signals [w->signum - 1].head) 1809 if (!signals [w->signum - 1].head)
1779 signal (w->signum, SIG_DFL); 1810 signal (w->signum, SIG_DFL);
1780} 1811}
… …
1787#endif 1818#endif
1788 if (expect_false (ev_is_active (w))) 1819 if (expect_false (ev_is_active (w)))
1789 return; 1820 return;
1790 1821
1791 ev_start (EV_A_ (W)w, 1); 1822 ev_start (EV_A_ (W)w, 1);
1792 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1823 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1793} 1824}
1794 1825
1795void 1826void
1796ev_child_stop (EV_P_ ev_child *w) 1827ev_child_stop (EV_P_ ev_child *w)
1797{ 1828{
1798 clear_pending (EV_A_ (W)w); 1829 clear_pending (EV_A_ (W)w);
1799 if (expect_false (!ev_is_active (w))) 1830 if (expect_false (!ev_is_active (w)))
1800 return; 1831 return;
1801 1832
1802 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1833 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1803 ev_stop (EV_A_ (W)w); 1834 ev_stop (EV_A_ (W)w);
1804} 1835}
1805 1836
1806#if EV_STAT_ENABLE 1837#if EV_STAT_ENABLE
1807 1838

Diff Legend

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