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

Comparing libev/ev.c (file contents):
Revision 1.166 by root, Sat Dec 8 03:53:36 2007 UTC vs.
Revision 1.191 by root, Fri Dec 21 02:40:01 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)
… …
507} 519}
508 520
509void 521void
510ev_feed_fd_event (EV_P_ int fd, int revents) 522ev_feed_fd_event (EV_P_ int fd, int revents)
511{ 523{
524 if (fd >= 0 && fd < anfdmax)
512 fd_event (EV_A_ fd, revents); 525 fd_event (EV_A_ fd, revents);
513} 526}
514 527
515void inline_size 528void inline_size
516fd_reify (EV_P) 529fd_reify (EV_P)
517{ 530{
… …
521 { 534 {
522 int fd = fdchanges [i]; 535 int fd = fdchanges [i];
523 ANFD *anfd = anfds + fd; 536 ANFD *anfd = anfds + fd;
524 ev_io *w; 537 ev_io *w;
525 538
526 int events = 0; 539 unsigned char events = 0;
527 540
528 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)
529 events |= w->events; 542 events |= (unsigned char)w->events;
530 543
531#if EV_SELECT_IS_WINSOCKET 544#if EV_SELECT_IS_WINSOCKET
532 if (events) 545 if (events)
533 { 546 {
534 unsigned long argp; 547 unsigned long argp;
535 anfd->handle = _get_osfhandle (fd); 548 anfd->handle = _get_osfhandle (fd);
536 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));
537 } 550 }
538#endif 551#endif
539 552
553 {
554 unsigned char o_events = anfd->events;
555 unsigned char o_reify = anfd->reify;
556
540 anfd->reify = 0; 557 anfd->reify = 0;
541
542 backend_modify (EV_A_ fd, anfd->events, events);
543 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 }
544 } 563 }
545 564
546 fdchangecnt = 0; 565 fdchangecnt = 0;
547} 566}
548 567
549void inline_size 568void inline_size
550fd_change (EV_P_ int fd) 569fd_change (EV_P_ int fd, int flags)
551{ 570{
552 if (expect_false (anfds [fd].reify)) 571 unsigned char reify = anfds [fd].reify;
553 return;
554
555 anfds [fd].reify = 1; 572 anfds [fd].reify |= flags;
556 573
574 if (expect_true (!reify))
575 {
557 ++fdchangecnt; 576 ++fdchangecnt;
558 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 577 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
559 fdchanges [fdchangecnt - 1] = fd; 578 fdchanges [fdchangecnt - 1] = fd;
579 }
560} 580}
561 581
562void inline_speed 582void inline_speed
563fd_kill (EV_P_ int fd) 583fd_kill (EV_P_ int fd)
564{ 584{
… …
615 635
616 for (fd = 0; fd < anfdmax; ++fd) 636 for (fd = 0; fd < anfdmax; ++fd)
617 if (anfds [fd].events) 637 if (anfds [fd].events)
618 { 638 {
619 anfds [fd].events = 0; 639 anfds [fd].events = 0;
620 fd_change (EV_A_ fd); 640 fd_change (EV_A_ fd, EV_IOFDSET | 1);
621 } 641 }
622} 642}
623 643
624/*****************************************************************************/ 644/*****************************************************************************/
625 645
626void inline_speed 646void inline_speed
627upheap (WT *heap, int k) 647upheap (WT *heap, int k)
628{ 648{
629 WT w = heap [k]; 649 WT w = heap [k];
630 650
631 while (k && heap [k >> 1]->at > w->at) 651 while (k)
632 { 652 {
653 int p = (k - 1) >> 1;
654
655 if (heap [p]->at <= w->at)
656 break;
657
633 heap [k] = heap [k >> 1]; 658 heap [k] = heap [p];
634 ((W)heap [k])->active = k + 1; 659 ((W)heap [k])->active = k + 1;
635 k >>= 1; 660 k = p;
636 } 661 }
637 662
638 heap [k] = w; 663 heap [k] = w;
639 ((W)heap [k])->active = k + 1; 664 ((W)heap [k])->active = k + 1;
640
641} 665}
642 666
643void inline_speed 667void inline_speed
644downheap (WT *heap, int N, int k) 668downheap (WT *heap, int N, int k)
645{ 669{
646 WT w = heap [k]; 670 WT w = heap [k];
647 671
648 while (k < (N >> 1)) 672 for (;;)
649 { 673 {
650 int j = k << 1; 674 int c = (k << 1) + 1;
651 675
652 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 676 if (c >= N)
653 ++j;
654
655 if (w->at <= heap [j]->at)
656 break; 677 break;
657 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
658 heap [k] = heap [j]; 685 heap [k] = heap [c];
659 ((W)heap [k])->active = k + 1; 686 ((W)heap [k])->active = k + 1;
687
660 k = j; 688 k = c;
661 } 689 }
662 690
663 heap [k] = w; 691 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 692 ((W)heap [k])->active = k + 1;
665} 693}
… …
747 for (signum = signalmax; signum--; ) 775 for (signum = signalmax; signum--; )
748 if (signals [signum].gotsig) 776 if (signals [signum].gotsig)
749 ev_feed_signal_event (EV_A_ signum + 1); 777 ev_feed_signal_event (EV_A_ signum + 1);
750} 778}
751 779
752void inline_size 780void inline_speed
753fd_intern (int fd) 781fd_intern (int fd)
754{ 782{
755#ifdef _WIN32 783#ifdef _WIN32
756 int arg = 1; 784 int arg = 1;
757 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 785 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
772 ev_unref (EV_A); /* child watcher should not keep loop alive */ 800 ev_unref (EV_A); /* child watcher should not keep loop alive */
773} 801}
774 802
775/*****************************************************************************/ 803/*****************************************************************************/
776 804
777static ev_child *childs [EV_PID_HASHSIZE]; 805static WL childs [EV_PID_HASHSIZE];
778 806
779#ifndef _WIN32 807#ifndef _WIN32
780 808
781static ev_signal childev; 809static ev_signal childev;
782 810
… …
1010#if EV_IDLE_ENABLE 1038#if EV_IDLE_ENABLE
1011 array_free (idle, [i]); 1039 array_free (idle, [i]);
1012#endif 1040#endif
1013 } 1041 }
1014 1042
1043 ev_free (anfds); anfdmax = 0;
1044
1015 /* have to use the microsoft-never-gets-it-right macro */ 1045 /* have to use the microsoft-never-gets-it-right macro */
1016 array_free (fdchange, EMPTY); 1046 array_free (fdchange, EMPTY);
1017 array_free (timer, EMPTY); 1047 array_free (timer, EMPTY);
1018#if EV_PERIODIC_ENABLE 1048#if EV_PERIODIC_ENABLE
1019 array_free (periodic, EMPTY); 1049 array_free (periodic, EMPTY);
1050#endif
1051#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY);
1020#endif 1053#endif
1021 array_free (prepare, EMPTY); 1054 array_free (prepare, EMPTY);
1022 array_free (check, EMPTY); 1055 array_free (check, EMPTY);
1023 1056
1024 backend = 0; 1057 backend = 0;
… …
1163 postfork = 1; 1196 postfork = 1;
1164} 1197}
1165 1198
1166/*****************************************************************************/ 1199/*****************************************************************************/
1167 1200
1201void
1202ev_invoke (EV_P_ void *w, int revents)
1203{
1204 EV_CB_INVOKE ((W)w, revents);
1205}
1206
1168void inline_speed 1207void inline_speed
1169call_pending (EV_P) 1208call_pending (EV_P)
1170{ 1209{
1171 int pri; 1210 int pri;
1172 1211
… …
1188void inline_size 1227void inline_size
1189timers_reify (EV_P) 1228timers_reify (EV_P)
1190{ 1229{
1191 while (timercnt && ((WT)timers [0])->at <= mn_now) 1230 while (timercnt && ((WT)timers [0])->at <= mn_now)
1192 { 1231 {
1193 ev_timer *w = timers [0]; 1232 ev_timer *w = (ev_timer *)timers [0];
1194 1233
1195 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1196 1235
1197 /* first reschedule or stop timer */ 1236 /* first reschedule or stop timer */
1198 if (w->repeat) 1237 if (w->repeat)
… …
1201 1240
1202 ((WT)w)->at += w->repeat; 1241 ((WT)w)->at += w->repeat;
1203 if (((WT)w)->at < mn_now) 1242 if (((WT)w)->at < mn_now)
1204 ((WT)w)->at = mn_now; 1243 ((WT)w)->at = mn_now;
1205 1244
1206 downheap ((WT *)timers, timercnt, 0); 1245 downheap (timers, timercnt, 0);
1207 } 1246 }
1208 else 1247 else
1209 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1210 1249
1211 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1216void inline_size 1255void inline_size
1217periodics_reify (EV_P) 1256periodics_reify (EV_P)
1218{ 1257{
1219 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1220 { 1259 {
1221 ev_periodic *w = periodics [0]; 1260 ev_periodic *w = (ev_periodic *)periodics [0];
1222 1261
1223 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1224 1263
1225 /* first reschedule or stop timer */ 1264 /* first reschedule or stop timer */
1226 if (w->reschedule_cb) 1265 if (w->reschedule_cb)
1227 { 1266 {
1228 ((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);
1229 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));
1230 downheap ((WT *)periodics, periodiccnt, 0); 1269 downheap (periodics, periodiccnt, 0);
1231 } 1270 }
1232 else if (w->interval) 1271 else if (w->interval)
1233 { 1272 {
1234 ((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;
1235 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));
1236 downheap ((WT *)periodics, periodiccnt, 0); 1276 downheap (periodics, periodiccnt, 0);
1237 } 1277 }
1238 else 1278 else
1239 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1240 1280
1241 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1248 int i; 1288 int i;
1249 1289
1250 /* adjust periodics after time jump */ 1290 /* adjust periodics after time jump */
1251 for (i = 0; i < periodiccnt; ++i) 1291 for (i = 0; i < periodiccnt; ++i)
1252 { 1292 {
1253 ev_periodic *w = periodics [i]; 1293 ev_periodic *w = (ev_periodic *)periodics [i];
1254 1294
1255 if (w->reschedule_cb) 1295 if (w->reschedule_cb)
1256 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257 else if (w->interval) 1297 else if (w->interval)
1258 ((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;
1259 } 1299 }
1260 1300
1261 /* now rebuild the heap */ 1301 /* now rebuild the heap */
1262 for (i = periodiccnt >> 1; i--; ) 1302 for (i = periodiccnt >> 1; i--; )
1263 downheap ((WT *)periodics, periodiccnt, i); 1303 downheap (periodics, periodiccnt, i);
1264} 1304}
1265#endif 1305#endif
1266 1306
1267#if EV_IDLE_ENABLE 1307#if EV_IDLE_ENABLE
1268void inline_size 1308void inline_size
… …
1285 } 1325 }
1286 } 1326 }
1287} 1327}
1288#endif 1328#endif
1289 1329
1290int inline_size 1330void inline_speed
1291time_update_monotonic (EV_P) 1331time_update (EV_P_ ev_tstamp max_block)
1292{ 1332{
1333 int i;
1334
1335#if EV_USE_MONOTONIC
1336 if (expect_true (have_monotonic))
1337 {
1338 ev_tstamp odiff = rtmn_diff;
1339
1293 mn_now = get_clock (); 1340 mn_now = get_clock ();
1294 1341
1342 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1343 /* interpolate in the meantime */
1295 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1344 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1296 { 1345 {
1297 ev_rt_now = rtmn_diff + mn_now; 1346 ev_rt_now = rtmn_diff + mn_now;
1298 return 0; 1347 return;
1299 } 1348 }
1300 else 1349
1301 {
1302 now_floor = mn_now; 1350 now_floor = mn_now;
1303 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1304 return 1;
1305 }
1306}
1307 1352
1308void inline_size 1353 /* loop a few times, before making important decisions.
1309time_update (EV_P) 1354 * on the choice of "4": one iteration isn't enough,
1310{ 1355 * in case we get preempted during the calls to
1311 int i; 1356 * ev_time and get_clock. a second call is almost guaranteed
1312 1357 * to succeed in that case, though. and looping a few more times
1313#if EV_USE_MONOTONIC 1358 * doesn't hurt either as we only do this on time-jumps or
1314 if (expect_true (have_monotonic)) 1359 * in the unlikely event of having been preempted here.
1315 { 1360 */
1316 if (time_update_monotonic (EV_A)) 1361 for (i = 4; --i; )
1317 { 1362 {
1318 ev_tstamp odiff = rtmn_diff;
1319
1320 /* loop a few times, before making important decisions.
1321 * on the choice of "4": one iteration isn't enough,
1322 * in case we get preempted during the calls to
1323 * ev_time and get_clock. a second call is almost guaranteed
1324 * to succeed in that case, though. and looping a few more times
1325 * doesn't hurt either as we only do this on time-jumps or
1326 * in the unlikely event of having been preempted here.
1327 */
1328 for (i = 4; --i; )
1329 {
1330 rtmn_diff = ev_rt_now - mn_now; 1363 rtmn_diff = ev_rt_now - mn_now;
1331 1364
1332 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1365 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1333 return; /* all is well */ 1366 return; /* all is well */
1334 1367
1335 ev_rt_now = ev_time (); 1368 ev_rt_now = ev_time ();
1336 mn_now = get_clock (); 1369 mn_now = get_clock ();
1337 now_floor = mn_now; 1370 now_floor = mn_now;
1338 } 1371 }
1339 1372
1340# if EV_PERIODIC_ENABLE 1373# if EV_PERIODIC_ENABLE
1341 periodics_reschedule (EV_A); 1374 periodics_reschedule (EV_A);
1342# endif 1375# endif
1343 /* no timer adjustment, as the monotonic clock doesn't jump */ 1376 /* no timer adjustment, as the monotonic clock doesn't jump */
1344 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1377 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1345 }
1346 } 1378 }
1347 else 1379 else
1348#endif 1380#endif
1349 { 1381 {
1350 ev_rt_now = ev_time (); 1382 ev_rt_now = ev_time ();
1351 1383
1352 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))
1353 { 1385 {
1354#if EV_PERIODIC_ENABLE 1386#if EV_PERIODIC_ENABLE
1355 periodics_reschedule (EV_A); 1387 periodics_reschedule (EV_A);
1356#endif 1388#endif
1357
1358 /* 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 */
1359 for (i = 0; i < timercnt; ++i) 1390 for (i = 0; i < timercnt; ++i)
1360 ((WT)timers [i])->at += ev_rt_now - mn_now; 1391 ((WT)timers [i])->at += ev_rt_now - mn_now;
1361 } 1392 }
1362 1393
… …
1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1437 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407 call_pending (EV_A); 1438 call_pending (EV_A);
1408 } 1439 }
1409#endif 1440#endif
1410 1441
1411 /* queue check watchers (and execute them) */ 1442 /* queue prepare watchers (and execute them) */
1412 if (expect_false (preparecnt)) 1443 if (expect_false (preparecnt))
1413 { 1444 {
1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1445 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415 call_pending (EV_A); 1446 call_pending (EV_A);
1416 } 1447 }
… …
1432 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1433 block = 0.; /* do not block at all */ 1464 block = 0.; /* do not block at all */
1434 else 1465 else
1435 { 1466 {
1436 /* update time to cancel out callback processing overhead */ 1467 /* update time to cancel out callback processing overhead */
1437#if EV_USE_MONOTONIC
1438 if (expect_true (have_monotonic))
1439 time_update_monotonic (EV_A); 1468 time_update (EV_A_ 1e100);
1440 else
1441#endif
1442 {
1443 ev_rt_now = ev_time ();
1444 mn_now = ev_rt_now;
1445 }
1446 1469
1447 block = MAX_BLOCKTIME; 1470 block = MAX_BLOCKTIME;
1448 1471
1449 if (timercnt) 1472 if (timercnt)
1450 { 1473 {
… …
1463 if (expect_false (block < 0.)) block = 0.; 1486 if (expect_false (block < 0.)) block = 0.;
1464 } 1487 }
1465 1488
1466 ++loop_count; 1489 ++loop_count;
1467 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);
1468 } 1494 }
1469
1470 /* update ev_rt_now, do magic */
1471 time_update (EV_A);
1472 1495
1473 /* queue pending timers and reschedule them */ 1496 /* queue pending timers and reschedule them */
1474 timers_reify (EV_A); /* relative timers called last */ 1497 timers_reify (EV_A); /* relative timers called last */
1475#if EV_PERIODIC_ENABLE 1498#if EV_PERIODIC_ENABLE
1476 periodics_reify (EV_A); /* absolute timers called first */ 1499 periodics_reify (EV_A); /* absolute timers called first */
… …
1532 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1555 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533 w->pending = 0; 1556 w->pending = 0;
1534 } 1557 }
1535} 1558}
1536 1559
1537void 1560int
1538ev_clear_pending (EV_P_ void *w, int invoke) 1561ev_clear_pending (EV_P_ void *w)
1539{ 1562{
1540 W w_ = (W)w; 1563 W w_ = (W)w;
1541 int pending = w_->pending; 1564 int pending = w_->pending;
1542 1565
1543 if (pending) 1566 if (expect_true (pending))
1544 { 1567 {
1545 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 1568 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1546
1547 w_->pending = 0; 1569 w_->pending = 0;
1548 p->w = 0; 1570 p->w = 0;
1549 1571 return p->events;
1550 if (invoke)
1551 EV_CB_INVOKE (w_, p->events);
1552 } 1572 }
1573 else
1574 return 0;
1553} 1575}
1554 1576
1555void inline_size 1577void inline_size
1556pri_adjust (EV_P_ W w) 1578pri_adjust (EV_P_ W w)
1557{ 1579{
… …
1576 w->active = 0; 1598 w->active = 0;
1577} 1599}
1578 1600
1579/*****************************************************************************/ 1601/*****************************************************************************/
1580 1602
1581void 1603void noinline
1582ev_io_start (EV_P_ ev_io *w) 1604ev_io_start (EV_P_ ev_io *w)
1583{ 1605{
1584 int fd = w->fd; 1606 int fd = w->fd;
1585 1607
1586 if (expect_false (ev_is_active (w))) 1608 if (expect_false (ev_is_active (w)))
… …
1588 1610
1589 assert (("ev_io_start called with negative fd", fd >= 0)); 1611 assert (("ev_io_start called with negative fd", fd >= 0));
1590 1612
1591 ev_start (EV_A_ (W)w, 1); 1613 ev_start (EV_A_ (W)w, 1);
1592 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1614 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1593 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1615 wlist_add (&anfds[fd].head, (WL)w);
1594 1616
1595 fd_change (EV_A_ fd); 1617 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1618 w->events &= ~EV_IOFDSET;
1596} 1619}
1597 1620
1598void 1621void noinline
1599ev_io_stop (EV_P_ ev_io *w) 1622ev_io_stop (EV_P_ ev_io *w)
1600{ 1623{
1601 clear_pending (EV_A_ (W)w); 1624 clear_pending (EV_A_ (W)w);
1602 if (expect_false (!ev_is_active (w))) 1625 if (expect_false (!ev_is_active (w)))
1603 return; 1626 return;
1604 1627
1605 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));
1606 1629
1607 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1630 wlist_del (&anfds[w->fd].head, (WL)w);
1608 ev_stop (EV_A_ (W)w); 1631 ev_stop (EV_A_ (W)w);
1609 1632
1610 fd_change (EV_A_ w->fd); 1633 fd_change (EV_A_ w->fd, 1);
1611} 1634}
1612 1635
1613void 1636void noinline
1614ev_timer_start (EV_P_ ev_timer *w) 1637ev_timer_start (EV_P_ ev_timer *w)
1615{ 1638{
1616 if (expect_false (ev_is_active (w))) 1639 if (expect_false (ev_is_active (w)))
1617 return; 1640 return;
1618 1641
1619 ((WT)w)->at += mn_now; 1642 ((WT)w)->at += mn_now;
1620 1643
1621 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.));
1622 1645
1623 ev_start (EV_A_ (W)w, ++timercnt); 1646 ev_start (EV_A_ (W)w, ++timercnt);
1624 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1625 timers [timercnt - 1] = w; 1648 timers [timercnt - 1] = (WT)w;
1626 upheap ((WT *)timers, timercnt - 1); 1649 upheap (timers, timercnt - 1);
1627 1650
1628 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1629} 1652}
1630 1653
1631void 1654void noinline
1632ev_timer_stop (EV_P_ ev_timer *w) 1655ev_timer_stop (EV_P_ ev_timer *w)
1633{ 1656{
1634 clear_pending (EV_A_ (W)w); 1657 clear_pending (EV_A_ (W)w);
1635 if (expect_false (!ev_is_active (w))) 1658 if (expect_false (!ev_is_active (w)))
1636 return; 1659 return;
1637 1660
1638 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1639 1662
1640 { 1663 {
1641 int active = ((W)w)->active; 1664 int active = ((W)w)->active;
1642 1665
1643 if (expect_true (--active < --timercnt)) 1666 if (expect_true (--active < --timercnt))
1644 { 1667 {
1645 timers [active] = timers [timercnt]; 1668 timers [active] = timers [timercnt];
1646 adjustheap ((WT *)timers, timercnt, active); 1669 adjustheap (timers, timercnt, active);
1647 } 1670 }
1648 } 1671 }
1649 1672
1650 ((WT)w)->at -= mn_now; 1673 ((WT)w)->at -= mn_now;
1651 1674
1652 ev_stop (EV_A_ (W)w); 1675 ev_stop (EV_A_ (W)w);
1653} 1676}
1654 1677
1655void 1678void noinline
1656ev_timer_again (EV_P_ ev_timer *w) 1679ev_timer_again (EV_P_ ev_timer *w)
1657{ 1680{
1658 if (ev_is_active (w)) 1681 if (ev_is_active (w))
1659 { 1682 {
1660 if (w->repeat) 1683 if (w->repeat)
1661 { 1684 {
1662 ((WT)w)->at = mn_now + w->repeat; 1685 ((WT)w)->at = mn_now + w->repeat;
1663 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1686 adjustheap (timers, timercnt, ((W)w)->active - 1);
1664 } 1687 }
1665 else 1688 else
1666 ev_timer_stop (EV_A_ w); 1689 ev_timer_stop (EV_A_ w);
1667 } 1690 }
1668 else if (w->repeat) 1691 else if (w->repeat)
… …
1671 ev_timer_start (EV_A_ w); 1694 ev_timer_start (EV_A_ w);
1672 } 1695 }
1673} 1696}
1674 1697
1675#if EV_PERIODIC_ENABLE 1698#if EV_PERIODIC_ENABLE
1676void 1699void noinline
1677ev_periodic_start (EV_P_ ev_periodic *w) 1700ev_periodic_start (EV_P_ ev_periodic *w)
1678{ 1701{
1679 if (expect_false (ev_is_active (w))) 1702 if (expect_false (ev_is_active (w)))
1680 return; 1703 return;
1681 1704
… …
1683 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1706 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1684 else if (w->interval) 1707 else if (w->interval)
1685 { 1708 {
1686 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.));
1687 /* 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 */
1688 ((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;
1689 } 1712 }
1713 else
1714 ((WT)w)->at = w->offset;
1690 1715
1691 ev_start (EV_A_ (W)w, ++periodiccnt); 1716 ev_start (EV_A_ (W)w, ++periodiccnt);
1692 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1693 periodics [periodiccnt - 1] = w; 1718 periodics [periodiccnt - 1] = (WT)w;
1694 upheap ((WT *)periodics, periodiccnt - 1); 1719 upheap (periodics, periodiccnt - 1);
1695 1720
1696 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1697} 1722}
1698 1723
1699void 1724void noinline
1700ev_periodic_stop (EV_P_ ev_periodic *w) 1725ev_periodic_stop (EV_P_ ev_periodic *w)
1701{ 1726{
1702 clear_pending (EV_A_ (W)w); 1727 clear_pending (EV_A_ (W)w);
1703 if (expect_false (!ev_is_active (w))) 1728 if (expect_false (!ev_is_active (w)))
1704 return; 1729 return;
1705 1730
1706 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1707 1732
1708 { 1733 {
1709 int active = ((W)w)->active; 1734 int active = ((W)w)->active;
1710 1735
1711 if (expect_true (--active < --periodiccnt)) 1736 if (expect_true (--active < --periodiccnt))
1712 { 1737 {
1713 periodics [active] = periodics [periodiccnt]; 1738 periodics [active] = periodics [periodiccnt];
1714 adjustheap ((WT *)periodics, periodiccnt, active); 1739 adjustheap (periodics, periodiccnt, active);
1715 } 1740 }
1716 } 1741 }
1717 1742
1718 ev_stop (EV_A_ (W)w); 1743 ev_stop (EV_A_ (W)w);
1719} 1744}
1720 1745
1721void 1746void noinline
1722ev_periodic_again (EV_P_ ev_periodic *w) 1747ev_periodic_again (EV_P_ ev_periodic *w)
1723{ 1748{
1724 /* TODO: use adjustheap and recalculation */ 1749 /* TODO: use adjustheap and recalculation */
1725 ev_periodic_stop (EV_A_ w); 1750 ev_periodic_stop (EV_A_ w);
1726 ev_periodic_start (EV_A_ w); 1751 ev_periodic_start (EV_A_ w);
… …
1729 1754
1730#ifndef SA_RESTART 1755#ifndef SA_RESTART
1731# define SA_RESTART 0 1756# define SA_RESTART 0
1732#endif 1757#endif
1733 1758
1734void 1759void noinline
1735ev_signal_start (EV_P_ ev_signal *w) 1760ev_signal_start (EV_P_ ev_signal *w)
1736{ 1761{
1737#if EV_MULTIPLICITY 1762#if EV_MULTIPLICITY
1738 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));
1739#endif 1764#endif
1740 if (expect_false (ev_is_active (w))) 1765 if (expect_false (ev_is_active (w)))
1741 return; 1766 return;
1742 1767
1743 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));
1744 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
1745 ev_start (EV_A_ (W)w, 1); 1784 ev_start (EV_A_ (W)w, 1);
1746 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1747 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1785 wlist_add (&signals [w->signum - 1].head, (WL)w);
1748 1786
1749 if (!((WL)w)->next) 1787 if (!((WL)w)->next)
1750 { 1788 {
1751#if _WIN32 1789#if _WIN32
1752 signal (w->signum, sighandler); 1790 signal (w->signum, sighandler);
… …
1758 sigaction (w->signum, &sa, 0); 1796 sigaction (w->signum, &sa, 0);
1759#endif 1797#endif
1760 } 1798 }
1761} 1799}
1762 1800
1763void 1801void noinline
1764ev_signal_stop (EV_P_ ev_signal *w) 1802ev_signal_stop (EV_P_ ev_signal *w)
1765{ 1803{
1766 clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1767 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1768 return; 1806 return;
1769 1807
1770 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1808 wlist_del (&signals [w->signum - 1].head, (WL)w);
1771 ev_stop (EV_A_ (W)w); 1809 ev_stop (EV_A_ (W)w);
1772 1810
1773 if (!signals [w->signum - 1].head) 1811 if (!signals [w->signum - 1].head)
1774 signal (w->signum, SIG_DFL); 1812 signal (w->signum, SIG_DFL);
1775} 1813}
… …
1782#endif 1820#endif
1783 if (expect_false (ev_is_active (w))) 1821 if (expect_false (ev_is_active (w)))
1784 return; 1822 return;
1785 1823
1786 ev_start (EV_A_ (W)w, 1); 1824 ev_start (EV_A_ (W)w, 1);
1787 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1825 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1788} 1826}
1789 1827
1790void 1828void
1791ev_child_stop (EV_P_ ev_child *w) 1829ev_child_stop (EV_P_ ev_child *w)
1792{ 1830{
1793 clear_pending (EV_A_ (W)w); 1831 clear_pending (EV_A_ (W)w);
1794 if (expect_false (!ev_is_active (w))) 1832 if (expect_false (!ev_is_active (w)))
1795 return; 1833 return;
1796 1834
1797 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1835 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1798 ev_stop (EV_A_ (W)w); 1836 ev_stop (EV_A_ (W)w);
1799} 1837}
1800 1838
1801#if EV_STAT_ENABLE 1839#if EV_STAT_ENABLE
1802 1840
… …
2144 2182
2145#if EV_EMBED_ENABLE 2183#if EV_EMBED_ENABLE
2146void noinline 2184void noinline
2147ev_embed_sweep (EV_P_ ev_embed *w) 2185ev_embed_sweep (EV_P_ ev_embed *w)
2148{ 2186{
2149 ev_loop (w->loop, EVLOOP_NONBLOCK); 2187 ev_loop (w->other, EVLOOP_NONBLOCK);
2150} 2188}
2151 2189
2152static void 2190static void
2153embed_cb (EV_P_ ev_io *io, int revents) 2191embed_io_cb (EV_P_ ev_io *io, int revents)
2154{ 2192{
2155 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2156 2194
2157 if (ev_cb (w)) 2195 if (ev_cb (w))
2158 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2196 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2159 else 2197 else
2160 ev_embed_sweep (loop, w); 2198 ev_embed_sweep (loop, w);
2161} 2199}
2162 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
2163void 2209void
2164ev_embed_start (EV_P_ ev_embed *w) 2210ev_embed_start (EV_P_ ev_embed *w)
2165{ 2211{
2166 if (expect_false (ev_is_active (w))) 2212 if (expect_false (ev_is_active (w)))
2167 return; 2213 return;
2168 2214
2169 { 2215 {
2170 struct ev_loop *loop = w->loop; 2216 struct ev_loop *loop = w->other;
2171 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 ()));
2172 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2218 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2173 } 2219 }
2174 2220
2175 ev_set_priority (&w->io, ev_priority (w)); 2221 ev_set_priority (&w->io, ev_priority (w));
2176 ev_io_start (EV_A_ &w->io); 2222 ev_io_start (EV_A_ &w->io);
2177 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
2178 ev_start (EV_A_ (W)w, 1); 2228 ev_start (EV_A_ (W)w, 1);
2179} 2229}
2180 2230
2181void 2231void
2182ev_embed_stop (EV_P_ ev_embed *w) 2232ev_embed_stop (EV_P_ ev_embed *w)
… …
2184 clear_pending (EV_A_ (W)w); 2234 clear_pending (EV_A_ (W)w);
2185 if (expect_false (!ev_is_active (w))) 2235 if (expect_false (!ev_is_active (w)))
2186 return; 2236 return;
2187 2237
2188 ev_io_stop (EV_A_ &w->io); 2238 ev_io_stop (EV_A_ &w->io);
2239 ev_prepare_stop (EV_A_ &w->prepare);
2189 2240
2190 ev_stop (EV_A_ (W)w); 2241 ev_stop (EV_A_ (W)w);
2191} 2242}
2192#endif 2243#endif
2193 2244
… …
2282 ev_timer_set (&once->to, timeout, 0.); 2333 ev_timer_set (&once->to, timeout, 0.);
2283 ev_timer_start (EV_A_ &once->to); 2334 ev_timer_start (EV_A_ &once->to);
2284 } 2335 }
2285} 2336}
2286 2337
2338#if EV_MULTIPLICITY
2339 #include "ev_wrap.h"
2340#endif
2341
2287#ifdef __cplusplus 2342#ifdef __cplusplus
2288} 2343}
2289#endif 2344#endif
2290 2345

Diff Legend

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