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

Comparing libev/ev.c (file contents):
Revision 1.164 by root, Fri Dec 7 16:44:10 2007 UTC vs.
Revision 1.185 by root, Fri Dec 14 18:22:30 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
… …
1163 postfork = 1; 1191 postfork = 1;
1164} 1192}
1165 1193
1166/*****************************************************************************/ 1194/*****************************************************************************/
1167 1195
1196void
1197ev_invoke (EV_P_ void *w, int revents)
1198{
1199 EV_CB_INVOKE ((W)w, revents);
1200}
1201
1168void inline_speed 1202void inline_speed
1169call_pending (EV_P) 1203call_pending (EV_P)
1170{ 1204{
1171 int pri; 1205 int pri;
1172 1206
… …
1188void inline_size 1222void inline_size
1189timers_reify (EV_P) 1223timers_reify (EV_P)
1190{ 1224{
1191 while (timercnt && ((WT)timers [0])->at <= mn_now) 1225 while (timercnt && ((WT)timers [0])->at <= mn_now)
1192 { 1226 {
1193 ev_timer *w = timers [0]; 1227 ev_timer *w = (ev_timer *)timers [0];
1194 1228
1195 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1229 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1196 1230
1197 /* first reschedule or stop timer */ 1231 /* first reschedule or stop timer */
1198 if (w->repeat) 1232 if (w->repeat)
… …
1201 1235
1202 ((WT)w)->at += w->repeat; 1236 ((WT)w)->at += w->repeat;
1203 if (((WT)w)->at < mn_now) 1237 if (((WT)w)->at < mn_now)
1204 ((WT)w)->at = mn_now; 1238 ((WT)w)->at = mn_now;
1205 1239
1206 downheap ((WT *)timers, timercnt, 0); 1240 downheap (timers, timercnt, 0);
1207 } 1241 }
1208 else 1242 else
1209 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1243 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1210 1244
1211 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1245 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1216void inline_size 1250void inline_size
1217periodics_reify (EV_P) 1251periodics_reify (EV_P)
1218{ 1252{
1219 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1253 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1220 { 1254 {
1221 ev_periodic *w = periodics [0]; 1255 ev_periodic *w = (ev_periodic *)periodics [0];
1222 1256
1223 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1257 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1224 1258
1225 /* first reschedule or stop timer */ 1259 /* first reschedule or stop timer */
1226 if (w->reschedule_cb) 1260 if (w->reschedule_cb)
1227 { 1261 {
1228 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1262 ((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)); 1263 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1230 downheap ((WT *)periodics, periodiccnt, 0); 1264 downheap (periodics, periodiccnt, 0);
1231 } 1265 }
1232 else if (w->interval) 1266 else if (w->interval)
1233 { 1267 {
1234 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1268 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1269 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)); 1270 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); 1271 downheap (periodics, periodiccnt, 0);
1237 } 1272 }
1238 else 1273 else
1239 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1274 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1240 1275
1241 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1276 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1248 int i; 1283 int i;
1249 1284
1250 /* adjust periodics after time jump */ 1285 /* adjust periodics after time jump */
1251 for (i = 0; i < periodiccnt; ++i) 1286 for (i = 0; i < periodiccnt; ++i)
1252 { 1287 {
1253 ev_periodic *w = periodics [i]; 1288 ev_periodic *w = (ev_periodic *)periodics [i];
1254 1289
1255 if (w->reschedule_cb) 1290 if (w->reschedule_cb)
1256 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1291 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1257 else if (w->interval) 1292 else if (w->interval)
1258 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1293 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1259 } 1294 }
1260 1295
1261 /* now rebuild the heap */ 1296 /* now rebuild the heap */
1262 for (i = periodiccnt >> 1; i--; ) 1297 for (i = periodiccnt >> 1; i--; )
1263 downheap ((WT *)periodics, periodiccnt, i); 1298 downheap (periodics, periodiccnt, i);
1264} 1299}
1265#endif 1300#endif
1266 1301
1267#if EV_IDLE_ENABLE 1302#if EV_IDLE_ENABLE
1268void inline_size 1303void inline_size
1269idle_reify (EV_P) 1304idle_reify (EV_P)
1270{ 1305{
1271 if (expect_false (!idleall)) 1306 if (expect_false (idleall))
1272 { 1307 {
1273 int pri; 1308 int pri;
1274 1309
1275 for (pri = NUMPRI; pri--; ) 1310 for (pri = NUMPRI; pri--; )
1276 { 1311 {
… …
1285 } 1320 }
1286 } 1321 }
1287} 1322}
1288#endif 1323#endif
1289 1324
1290int inline_size 1325void inline_speed
1291time_update_monotonic (EV_P) 1326time_update (EV_P_ ev_tstamp max_block)
1292{ 1327{
1328 int i;
1329
1330#if EV_USE_MONOTONIC
1331 if (expect_true (have_monotonic))
1332 {
1333 ev_tstamp odiff = rtmn_diff;
1334
1293 mn_now = get_clock (); 1335 mn_now = get_clock ();
1294 1336
1337 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1338 /* interpolate in the meantime */
1295 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1339 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1296 { 1340 {
1297 ev_rt_now = rtmn_diff + mn_now; 1341 ev_rt_now = rtmn_diff + mn_now;
1298 return 0; 1342 return;
1299 } 1343 }
1300 else 1344
1301 {
1302 now_floor = mn_now; 1345 now_floor = mn_now;
1303 ev_rt_now = ev_time (); 1346 ev_rt_now = ev_time ();
1304 return 1;
1305 }
1306}
1307 1347
1308void inline_size 1348 /* loop a few times, before making important decisions.
1309time_update (EV_P) 1349 * on the choice of "4": one iteration isn't enough,
1310{ 1350 * in case we get preempted during the calls to
1311 int i; 1351 * ev_time and get_clock. a second call is almost guaranteed
1312 1352 * to succeed in that case, though. and looping a few more times
1313#if EV_USE_MONOTONIC 1353 * doesn't hurt either as we only do this on time-jumps or
1314 if (expect_true (have_monotonic)) 1354 * in the unlikely event of having been preempted here.
1315 { 1355 */
1316 if (time_update_monotonic (EV_A)) 1356 for (i = 4; --i; )
1317 { 1357 {
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; 1358 rtmn_diff = ev_rt_now - mn_now;
1331 1359
1332 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1360 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1333 return; /* all is well */ 1361 return; /* all is well */
1334 1362
1335 ev_rt_now = ev_time (); 1363 ev_rt_now = ev_time ();
1336 mn_now = get_clock (); 1364 mn_now = get_clock ();
1337 now_floor = mn_now; 1365 now_floor = mn_now;
1338 } 1366 }
1339 1367
1340# if EV_PERIODIC_ENABLE 1368# if EV_PERIODIC_ENABLE
1341 periodics_reschedule (EV_A); 1369 periodics_reschedule (EV_A);
1342# endif 1370# endif
1343 /* no timer adjustment, as the monotonic clock doesn't jump */ 1371 /* no timer adjustment, as the monotonic clock doesn't jump */
1344 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1372 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1345 }
1346 } 1373 }
1347 else 1374 else
1348#endif 1375#endif
1349 { 1376 {
1350 ev_rt_now = ev_time (); 1377 ev_rt_now = ev_time ();
1351 1378
1352 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1379 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1353 { 1380 {
1354#if EV_PERIODIC_ENABLE 1381#if EV_PERIODIC_ENABLE
1355 periodics_reschedule (EV_A); 1382 periodics_reschedule (EV_A);
1356#endif 1383#endif
1357
1358 /* adjust timers. this is easy, as the offset is the same for all of them */ 1384 /* adjust timers. this is easy, as the offset is the same for all of them */
1359 for (i = 0; i < timercnt; ++i) 1385 for (i = 0; i < timercnt; ++i)
1360 ((WT)timers [i])->at += ev_rt_now - mn_now; 1386 ((WT)timers [i])->at += ev_rt_now - mn_now;
1361 } 1387 }
1362 1388
… …
1406 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1432 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1407 call_pending (EV_A); 1433 call_pending (EV_A);
1408 } 1434 }
1409#endif 1435#endif
1410 1436
1411 /* queue check watchers (and execute them) */ 1437 /* queue prepare watchers (and execute them) */
1412 if (expect_false (preparecnt)) 1438 if (expect_false (preparecnt))
1413 { 1439 {
1414 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1440 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1415 call_pending (EV_A); 1441 call_pending (EV_A);
1416 } 1442 }
… …
1432 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1458 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1433 block = 0.; /* do not block at all */ 1459 block = 0.; /* do not block at all */
1434 else 1460 else
1435 { 1461 {
1436 /* update time to cancel out callback processing overhead */ 1462 /* 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); 1463 time_update (EV_A_ 1e100);
1440 else
1441#endif
1442 {
1443 ev_rt_now = ev_time ();
1444 mn_now = ev_rt_now;
1445 }
1446 1464
1447 block = MAX_BLOCKTIME; 1465 block = MAX_BLOCKTIME;
1448 1466
1449 if (timercnt) 1467 if (timercnt)
1450 { 1468 {
… …
1463 if (expect_false (block < 0.)) block = 0.; 1481 if (expect_false (block < 0.)) block = 0.;
1464 } 1482 }
1465 1483
1466 ++loop_count; 1484 ++loop_count;
1467 backend_poll (EV_A_ block); 1485 backend_poll (EV_A_ block);
1486
1487 /* update ev_rt_now, do magic */
1488 time_update (EV_A_ block);
1468 } 1489 }
1469
1470 /* update ev_rt_now, do magic */
1471 time_update (EV_A);
1472 1490
1473 /* queue pending timers and reschedule them */ 1491 /* queue pending timers and reschedule them */
1474 timers_reify (EV_A); /* relative timers called last */ 1492 timers_reify (EV_A); /* relative timers called last */
1475#if EV_PERIODIC_ENABLE 1493#if EV_PERIODIC_ENABLE
1476 periodics_reify (EV_A); /* absolute timers called first */ 1494 periodics_reify (EV_A); /* absolute timers called first */
… …
1523 head = &(*head)->next; 1541 head = &(*head)->next;
1524 } 1542 }
1525} 1543}
1526 1544
1527void inline_speed 1545void inline_speed
1528ev_clear_pending (EV_P_ W w) 1546clear_pending (EV_P_ W w)
1529{ 1547{
1530 if (w->pending) 1548 if (w->pending)
1531 { 1549 {
1532 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1550 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1533 w->pending = 0; 1551 w->pending = 0;
1534 } 1552 }
1553}
1554
1555int
1556ev_clear_pending (EV_P_ void *w)
1557{
1558 W w_ = (W)w;
1559 int pending = w_->pending;
1560
1561 if (expect_true (pending))
1562 {
1563 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1564 w_->pending = 0;
1565 p->w = 0;
1566 return p->events;
1567 }
1568 else
1569 return 0;
1535} 1570}
1536 1571
1537void inline_size 1572void inline_size
1538pri_adjust (EV_P_ W w) 1573pri_adjust (EV_P_ W w)
1539{ 1574{
… …
1558 w->active = 0; 1593 w->active = 0;
1559} 1594}
1560 1595
1561/*****************************************************************************/ 1596/*****************************************************************************/
1562 1597
1563void 1598void noinline
1564ev_io_start (EV_P_ ev_io *w) 1599ev_io_start (EV_P_ ev_io *w)
1565{ 1600{
1566 int fd = w->fd; 1601 int fd = w->fd;
1567 1602
1568 if (expect_false (ev_is_active (w))) 1603 if (expect_false (ev_is_active (w)))
… …
1570 1605
1571 assert (("ev_io_start called with negative fd", fd >= 0)); 1606 assert (("ev_io_start called with negative fd", fd >= 0));
1572 1607
1573 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
1574 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1609 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1575 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1610 wlist_add (&anfds[fd].head, (WL)w);
1576 1611
1577 fd_change (EV_A_ fd); 1612 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1613 w->events &= ~EV_IOFDSET;
1578} 1614}
1579 1615
1580void 1616void noinline
1581ev_io_stop (EV_P_ ev_io *w) 1617ev_io_stop (EV_P_ ev_io *w)
1582{ 1618{
1583 ev_clear_pending (EV_A_ (W)w); 1619 clear_pending (EV_A_ (W)w);
1584 if (expect_false (!ev_is_active (w))) 1620 if (expect_false (!ev_is_active (w)))
1585 return; 1621 return;
1586 1622
1587 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1623 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1588 1624
1589 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1625 wlist_del (&anfds[w->fd].head, (WL)w);
1590 ev_stop (EV_A_ (W)w); 1626 ev_stop (EV_A_ (W)w);
1591 1627
1592 fd_change (EV_A_ w->fd); 1628 fd_change (EV_A_ w->fd, 1);
1593} 1629}
1594 1630
1595void 1631void noinline
1596ev_timer_start (EV_P_ ev_timer *w) 1632ev_timer_start (EV_P_ ev_timer *w)
1597{ 1633{
1598 if (expect_false (ev_is_active (w))) 1634 if (expect_false (ev_is_active (w)))
1599 return; 1635 return;
1600 1636
1601 ((WT)w)->at += mn_now; 1637 ((WT)w)->at += mn_now;
1602 1638
1603 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1639 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1604 1640
1605 ev_start (EV_A_ (W)w, ++timercnt); 1641 ev_start (EV_A_ (W)w, ++timercnt);
1606 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1642 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1607 timers [timercnt - 1] = w; 1643 timers [timercnt - 1] = (WT)w;
1608 upheap ((WT *)timers, timercnt - 1); 1644 upheap (timers, timercnt - 1);
1609 1645
1610 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1646 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1611} 1647}
1612 1648
1613void 1649void noinline
1614ev_timer_stop (EV_P_ ev_timer *w) 1650ev_timer_stop (EV_P_ ev_timer *w)
1615{ 1651{
1616 ev_clear_pending (EV_A_ (W)w); 1652 clear_pending (EV_A_ (W)w);
1617 if (expect_false (!ev_is_active (w))) 1653 if (expect_false (!ev_is_active (w)))
1618 return; 1654 return;
1619 1655
1620 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1656 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1621 1657
1622 { 1658 {
1623 int active = ((W)w)->active; 1659 int active = ((W)w)->active;
1624 1660
1625 if (expect_true (--active < --timercnt)) 1661 if (expect_true (--active < --timercnt))
1626 { 1662 {
1627 timers [active] = timers [timercnt]; 1663 timers [active] = timers [timercnt];
1628 adjustheap ((WT *)timers, timercnt, active); 1664 adjustheap (timers, timercnt, active);
1629 } 1665 }
1630 } 1666 }
1631 1667
1632 ((WT)w)->at -= mn_now; 1668 ((WT)w)->at -= mn_now;
1633 1669
1634 ev_stop (EV_A_ (W)w); 1670 ev_stop (EV_A_ (W)w);
1635} 1671}
1636 1672
1637void 1673void noinline
1638ev_timer_again (EV_P_ ev_timer *w) 1674ev_timer_again (EV_P_ ev_timer *w)
1639{ 1675{
1640 if (ev_is_active (w)) 1676 if (ev_is_active (w))
1641 { 1677 {
1642 if (w->repeat) 1678 if (w->repeat)
1643 { 1679 {
1644 ((WT)w)->at = mn_now + w->repeat; 1680 ((WT)w)->at = mn_now + w->repeat;
1645 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1681 adjustheap (timers, timercnt, ((W)w)->active - 1);
1646 } 1682 }
1647 else 1683 else
1648 ev_timer_stop (EV_A_ w); 1684 ev_timer_stop (EV_A_ w);
1649 } 1685 }
1650 else if (w->repeat) 1686 else if (w->repeat)
… …
1653 ev_timer_start (EV_A_ w); 1689 ev_timer_start (EV_A_ w);
1654 } 1690 }
1655} 1691}
1656 1692
1657#if EV_PERIODIC_ENABLE 1693#if EV_PERIODIC_ENABLE
1658void 1694void noinline
1659ev_periodic_start (EV_P_ ev_periodic *w) 1695ev_periodic_start (EV_P_ ev_periodic *w)
1660{ 1696{
1661 if (expect_false (ev_is_active (w))) 1697 if (expect_false (ev_is_active (w)))
1662 return; 1698 return;
1663 1699
… …
1665 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1701 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1666 else if (w->interval) 1702 else if (w->interval)
1667 { 1703 {
1668 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1704 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1669 /* this formula differs from the one in periodic_reify because we do not always round up */ 1705 /* this formula differs from the one in periodic_reify because we do not always round up */
1670 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1706 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1671 } 1707 }
1708 else
1709 ((WT)w)->at = w->offset;
1672 1710
1673 ev_start (EV_A_ (W)w, ++periodiccnt); 1711 ev_start (EV_A_ (W)w, ++periodiccnt);
1674 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1712 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1675 periodics [periodiccnt - 1] = w; 1713 periodics [periodiccnt - 1] = (WT)w;
1676 upheap ((WT *)periodics, periodiccnt - 1); 1714 upheap (periodics, periodiccnt - 1);
1677 1715
1678 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1716 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1679} 1717}
1680 1718
1681void 1719void noinline
1682ev_periodic_stop (EV_P_ ev_periodic *w) 1720ev_periodic_stop (EV_P_ ev_periodic *w)
1683{ 1721{
1684 ev_clear_pending (EV_A_ (W)w); 1722 clear_pending (EV_A_ (W)w);
1685 if (expect_false (!ev_is_active (w))) 1723 if (expect_false (!ev_is_active (w)))
1686 return; 1724 return;
1687 1725
1688 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1726 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1689 1727
1690 { 1728 {
1691 int active = ((W)w)->active; 1729 int active = ((W)w)->active;
1692 1730
1693 if (expect_true (--active < --periodiccnt)) 1731 if (expect_true (--active < --periodiccnt))
1694 { 1732 {
1695 periodics [active] = periodics [periodiccnt]; 1733 periodics [active] = periodics [periodiccnt];
1696 adjustheap ((WT *)periodics, periodiccnt, active); 1734 adjustheap (periodics, periodiccnt, active);
1697 } 1735 }
1698 } 1736 }
1699 1737
1700 ev_stop (EV_A_ (W)w); 1738 ev_stop (EV_A_ (W)w);
1701} 1739}
1702 1740
1703void 1741void noinline
1704ev_periodic_again (EV_P_ ev_periodic *w) 1742ev_periodic_again (EV_P_ ev_periodic *w)
1705{ 1743{
1706 /* TODO: use adjustheap and recalculation */ 1744 /* TODO: use adjustheap and recalculation */
1707 ev_periodic_stop (EV_A_ w); 1745 ev_periodic_stop (EV_A_ w);
1708 ev_periodic_start (EV_A_ w); 1746 ev_periodic_start (EV_A_ w);
… …
1711 1749
1712#ifndef SA_RESTART 1750#ifndef SA_RESTART
1713# define SA_RESTART 0 1751# define SA_RESTART 0
1714#endif 1752#endif
1715 1753
1716void 1754void noinline
1717ev_signal_start (EV_P_ ev_signal *w) 1755ev_signal_start (EV_P_ ev_signal *w)
1718{ 1756{
1719#if EV_MULTIPLICITY 1757#if EV_MULTIPLICITY
1720 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1758 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1721#endif 1759#endif
1722 if (expect_false (ev_is_active (w))) 1760 if (expect_false (ev_is_active (w)))
1723 return; 1761 return;
1724 1762
1725 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1763 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1726 1764
1765 {
1766#ifndef _WIN32
1767 sigset_t full, prev;
1768 sigfillset (&full);
1769 sigprocmask (SIG_SETMASK, &full, &prev);
1770#endif
1771
1772 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1773
1774#ifndef _WIN32
1775 sigprocmask (SIG_SETMASK, &prev, 0);
1776#endif
1777 }
1778
1727 ev_start (EV_A_ (W)w, 1); 1779 ev_start (EV_A_ (W)w, 1);
1728 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1729 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1780 wlist_add (&signals [w->signum - 1].head, (WL)w);
1730 1781
1731 if (!((WL)w)->next) 1782 if (!((WL)w)->next)
1732 { 1783 {
1733#if _WIN32 1784#if _WIN32
1734 signal (w->signum, sighandler); 1785 signal (w->signum, sighandler);
… …
1740 sigaction (w->signum, &sa, 0); 1791 sigaction (w->signum, &sa, 0);
1741#endif 1792#endif
1742 } 1793 }
1743} 1794}
1744 1795
1745void 1796void noinline
1746ev_signal_stop (EV_P_ ev_signal *w) 1797ev_signal_stop (EV_P_ ev_signal *w)
1747{ 1798{
1748 ev_clear_pending (EV_A_ (W)w); 1799 clear_pending (EV_A_ (W)w);
1749 if (expect_false (!ev_is_active (w))) 1800 if (expect_false (!ev_is_active (w)))
1750 return; 1801 return;
1751 1802
1752 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1803 wlist_del (&signals [w->signum - 1].head, (WL)w);
1753 ev_stop (EV_A_ (W)w); 1804 ev_stop (EV_A_ (W)w);
1754 1805
1755 if (!signals [w->signum - 1].head) 1806 if (!signals [w->signum - 1].head)
1756 signal (w->signum, SIG_DFL); 1807 signal (w->signum, SIG_DFL);
1757} 1808}
… …
1764#endif 1815#endif
1765 if (expect_false (ev_is_active (w))) 1816 if (expect_false (ev_is_active (w)))
1766 return; 1817 return;
1767 1818
1768 ev_start (EV_A_ (W)w, 1); 1819 ev_start (EV_A_ (W)w, 1);
1769 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1820 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1770} 1821}
1771 1822
1772void 1823void
1773ev_child_stop (EV_P_ ev_child *w) 1824ev_child_stop (EV_P_ ev_child *w)
1774{ 1825{
1775 ev_clear_pending (EV_A_ (W)w); 1826 clear_pending (EV_A_ (W)w);
1776 if (expect_false (!ev_is_active (w))) 1827 if (expect_false (!ev_is_active (w)))
1777 return; 1828 return;
1778 1829
1779 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1830 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1780 ev_stop (EV_A_ (W)w); 1831 ev_stop (EV_A_ (W)w);
1781} 1832}
1782 1833
1783#if EV_STAT_ENABLE 1834#if EV_STAT_ENABLE
1784 1835
… …
2016} 2067}
2017 2068
2018void 2069void
2019ev_stat_stop (EV_P_ ev_stat *w) 2070ev_stat_stop (EV_P_ ev_stat *w)
2020{ 2071{
2021 ev_clear_pending (EV_A_ (W)w); 2072 clear_pending (EV_A_ (W)w);
2022 if (expect_false (!ev_is_active (w))) 2073 if (expect_false (!ev_is_active (w)))
2023 return; 2074 return;
2024 2075
2025#if EV_USE_INOTIFY 2076#if EV_USE_INOTIFY
2026 infy_del (EV_A_ w); 2077 infy_del (EV_A_ w);
… …
2052} 2103}
2053 2104
2054void 2105void
2055ev_idle_stop (EV_P_ ev_idle *w) 2106ev_idle_stop (EV_P_ ev_idle *w)
2056{ 2107{
2057 ev_clear_pending (EV_A_ (W)w); 2108 clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w))) 2109 if (expect_false (!ev_is_active (w)))
2059 return; 2110 return;
2060 2111
2061 { 2112 {
2062 int active = ((W)w)->active; 2113 int active = ((W)w)->active;
… …
2082} 2133}
2083 2134
2084void 2135void
2085ev_prepare_stop (EV_P_ ev_prepare *w) 2136ev_prepare_stop (EV_P_ ev_prepare *w)
2086{ 2137{
2087 ev_clear_pending (EV_A_ (W)w); 2138 clear_pending (EV_A_ (W)w);
2088 if (expect_false (!ev_is_active (w))) 2139 if (expect_false (!ev_is_active (w)))
2089 return; 2140 return;
2090 2141
2091 { 2142 {
2092 int active = ((W)w)->active; 2143 int active = ((W)w)->active;
… …
2109} 2160}
2110 2161
2111void 2162void
2112ev_check_stop (EV_P_ ev_check *w) 2163ev_check_stop (EV_P_ ev_check *w)
2113{ 2164{
2114 ev_clear_pending (EV_A_ (W)w); 2165 clear_pending (EV_A_ (W)w);
2115 if (expect_false (!ev_is_active (w))) 2166 if (expect_false (!ev_is_active (w)))
2116 return; 2167 return;
2117 2168
2118 { 2169 {
2119 int active = ((W)w)->active; 2170 int active = ((W)w)->active;
… …
2161} 2212}
2162 2213
2163void 2214void
2164ev_embed_stop (EV_P_ ev_embed *w) 2215ev_embed_stop (EV_P_ ev_embed *w)
2165{ 2216{
2166 ev_clear_pending (EV_A_ (W)w); 2217 clear_pending (EV_A_ (W)w);
2167 if (expect_false (!ev_is_active (w))) 2218 if (expect_false (!ev_is_active (w)))
2168 return; 2219 return;
2169 2220
2170 ev_io_stop (EV_A_ &w->io); 2221 ev_io_stop (EV_A_ &w->io);
2171 2222
… …
2186} 2237}
2187 2238
2188void 2239void
2189ev_fork_stop (EV_P_ ev_fork *w) 2240ev_fork_stop (EV_P_ ev_fork *w)
2190{ 2241{
2191 ev_clear_pending (EV_A_ (W)w); 2242 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2243 if (expect_false (!ev_is_active (w)))
2193 return; 2244 return;
2194 2245
2195 { 2246 {
2196 int active = ((W)w)->active; 2247 int active = ((W)w)->active;

Diff Legend

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