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

Comparing libev/ev.c (file contents):
Revision 1.178 by root, Tue Dec 11 18:36:11 2007 UTC vs.
Revision 1.193 by root, Sat Dec 22 05:47:58 2007 UTC

… …
51# ifndef EV_USE_MONOTONIC 51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 52# define EV_USE_MONOTONIC 0
53# endif 53# endif
54# ifndef EV_USE_REALTIME 54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 55# define EV_USE_REALTIME 0
56# endif
57# endif
58
59# ifndef EV_USE_NANOSLEEP
60# if HAVE_NANOSLEEP
61# define EV_USE_NANOSLEEP 1
62# else
63# define EV_USE_NANOSLEEP 0
56# endif 64# endif
57# endif 65# endif
58 66
59# ifndef EV_USE_SELECT 67# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 68# if HAVE_SELECT && HAVE_SYS_SELECT_H
… …
146 154
147#ifndef EV_USE_REALTIME 155#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 156# define EV_USE_REALTIME 0
149#endif 157#endif
150 158
159#ifndef EV_USE_NANOSLEEP
160# define EV_USE_NANOSLEEP 0
161#endif
162
151#ifndef EV_USE_SELECT 163#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 164# define EV_USE_SELECT 1
153#endif 165#endif
154 166
155#ifndef EV_USE_POLL 167#ifndef EV_USE_POLL
… …
202#ifndef CLOCK_REALTIME 214#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 215# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 216# define EV_USE_REALTIME 0
205#endif 217#endif
206 218
219#if !EV_STAT_ENABLE
220# undef EV_USE_INOTIFY
221# define EV_USE_INOTIFY 0
222#endif
223
224#if !EV_USE_NANOSLEEP
225# ifndef _WIN32
226# include <sys/select.h>
227# endif
228#endif
229
230#if EV_USE_INOTIFY
231# include <sys/inotify.h>
232#endif
233
207#if EV_SELECT_IS_WINSOCKET 234#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 235# include <winsock.h>
209#endif
210
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 236#endif
218 237
219/**/ 238/**/
220 239
221/* 240/*
… …
230 249
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 250#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 251#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 252/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 253
235#if __GNUC__ >= 3 254#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 255# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 256# define noinline __attribute__ ((noinline))
238#else 257#else
239# define expect(expr,value) (expr) 258# define expect(expr,value) (expr)
240# define noinline 259# define noinline
… …
407{ 426{
408 return ev_rt_now; 427 return ev_rt_now;
409} 428}
410#endif 429#endif
411 430
431void
432ev_sleep (ev_tstamp delay)
433{
434 if (delay > 0.)
435 {
436#if EV_USE_NANOSLEEP
437 struct timespec ts;
438
439 ts.tv_sec = (time_t)delay;
440 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
441
442 nanosleep (&ts, 0);
443#elif defined(_WIN32)
444 Sleep (delay * 1e3);
445#else
446 struct timeval tv;
447
448 tv.tv_sec = (time_t)delay;
449 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
450
451 select (0, 0, 0, 0, &tv);
452#endif
453 }
454}
455
456/*****************************************************************************/
457
412int inline_size 458int inline_size
413array_nextsize (int elem, int cur, int cnt) 459array_nextsize (int elem, int cur, int cnt)
414{ 460{
415 int ncur = cur + 1; 461 int ncur = cur + 1;
416 462
… …
476 pendings [pri][w_->pending - 1].w = w_; 522 pendings [pri][w_->pending - 1].w = w_;
477 pendings [pri][w_->pending - 1].events = revents; 523 pendings [pri][w_->pending - 1].events = revents;
478 } 524 }
479} 525}
480 526
481void inline_size 527void inline_speed
482queue_events (EV_P_ W *events, int eventcnt, int type) 528queue_events (EV_P_ W *events, int eventcnt, int type)
483{ 529{
484 int i; 530 int i;
485 531
486 for (i = 0; i < eventcnt; ++i) 532 for (i = 0; i < eventcnt; ++i)
… …
533 { 579 {
534 int fd = fdchanges [i]; 580 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 581 ANFD *anfd = anfds + fd;
536 ev_io *w; 582 ev_io *w;
537 583
538 int events = 0; 584 unsigned char events = 0;
539 585
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 586 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 587 events |= (unsigned char)w->events;
542 588
543#if EV_SELECT_IS_WINSOCKET 589#if EV_SELECT_IS_WINSOCKET
544 if (events) 590 if (events)
545 { 591 {
546 unsigned long argp; 592 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 593 anfd->handle = _get_osfhandle (fd);
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 594 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 595 }
550#endif 596#endif
551 597
598 {
599 unsigned char o_events = anfd->events;
600 unsigned char o_reify = anfd->reify;
601
552 anfd->reify = 0; 602 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 603 anfd->events = events;
604
605 if (o_events != events || o_reify & EV_IOFDSET)
606 backend_modify (EV_A_ fd, o_events, events);
607 }
556 } 608 }
557 609
558 fdchangecnt = 0; 610 fdchangecnt = 0;
559} 611}
560 612
561void inline_size 613void inline_size
562fd_change (EV_P_ int fd) 614fd_change (EV_P_ int fd, int flags)
563{ 615{
564 if (expect_false (anfds [fd].reify)) 616 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 617 anfds [fd].reify |= flags;
568 618
619 if (expect_true (!reify))
620 {
569 ++fdchangecnt; 621 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 622 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 623 fdchanges [fdchangecnt - 1] = fd;
624 }
572} 625}
573 626
574void inline_speed 627void inline_speed
575fd_kill (EV_P_ int fd) 628fd_kill (EV_P_ int fd)
576{ 629{
… …
627 680
628 for (fd = 0; fd < anfdmax; ++fd) 681 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 682 if (anfds [fd].events)
630 { 683 {
631 anfds [fd].events = 0; 684 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 685 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 686 }
634} 687}
635 688
636/*****************************************************************************/ 689/*****************************************************************************/
637 690
638void inline_speed 691void inline_speed
639upheap (WT *heap, int k) 692upheap (WT *heap, int k)
640{ 693{
641 WT w = heap [k]; 694 WT w = heap [k];
642 695
643 while (k && heap [k >> 1]->at > w->at) 696 while (k)
644 { 697 {
698 int p = (k - 1) >> 1;
699
700 if (heap [p]->at <= w->at)
701 break;
702
645 heap [k] = heap [k >> 1]; 703 heap [k] = heap [p];
646 ((W)heap [k])->active = k + 1; 704 ((W)heap [k])->active = k + 1;
647 k >>= 1; 705 k = p;
648 } 706 }
649 707
650 heap [k] = w; 708 heap [k] = w;
651 ((W)heap [k])->active = k + 1; 709 ((W)heap [k])->active = k + 1;
652
653} 710}
654 711
655void inline_speed 712void inline_speed
656downheap (WT *heap, int N, int k) 713downheap (WT *heap, int N, int k)
657{ 714{
658 WT w = heap [k]; 715 WT w = heap [k];
659 716
660 while (k < (N >> 1)) 717 for (;;)
661 { 718 {
662 int j = k << 1; 719 int c = (k << 1) + 1;
663 720
664 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 721 if (c >= N)
665 ++j;
666
667 if (w->at <= heap [j]->at)
668 break; 722 break;
669 723
724 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
725 ? 1 : 0;
726
727 if (w->at <= heap [c]->at)
728 break;
729
670 heap [k] = heap [j]; 730 heap [k] = heap [c];
671 ((W)heap [k])->active = k + 1; 731 ((W)heap [k])->active = k + 1;
732
672 k = j; 733 k = c;
673 } 734 }
674 735
675 heap [k] = w; 736 heap [k] = w;
676 ((W)heap [k])->active = k + 1; 737 ((W)heap [k])->active = k + 1;
677} 738}
… …
784 ev_unref (EV_A); /* child watcher should not keep loop alive */ 845 ev_unref (EV_A); /* child watcher should not keep loop alive */
785} 846}
786 847
787/*****************************************************************************/ 848/*****************************************************************************/
788 849
789static ev_child *childs [EV_PID_HASHSIZE]; 850static WL childs [EV_PID_HASHSIZE];
790 851
791#ifndef _WIN32 852#ifndef _WIN32
792 853
793static ev_signal childev; 854static ev_signal childev;
794 855
… …
909} 970}
910 971
911unsigned int 972unsigned int
912ev_embeddable_backends (void) 973ev_embeddable_backends (void)
913{ 974{
975 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
914 return EVBACKEND_EPOLL 976 return EVBACKEND_KQUEUE
915 | EVBACKEND_KQUEUE
916 | EVBACKEND_PORT; 977 | EVBACKEND_PORT;
917} 978}
918 979
919unsigned int 980unsigned int
920ev_backend (EV_P) 981ev_backend (EV_P)
… …
924 985
925unsigned int 986unsigned int
926ev_loop_count (EV_P) 987ev_loop_count (EV_P)
927{ 988{
928 return loop_count; 989 return loop_count;
990}
991
992void
993ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
994{
995 io_blocktime = interval;
996}
997
998void
999ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1000{
1001 timeout_blocktime = interval;
929} 1002}
930 1003
931static void noinline 1004static void noinline
932loop_init (EV_P_ unsigned int flags) 1005loop_init (EV_P_ unsigned int flags)
933{ 1006{
… …
944 ev_rt_now = ev_time (); 1017 ev_rt_now = ev_time ();
945 mn_now = get_clock (); 1018 mn_now = get_clock ();
946 now_floor = mn_now; 1019 now_floor = mn_now;
947 rtmn_diff = ev_rt_now - mn_now; 1020 rtmn_diff = ev_rt_now - mn_now;
948 1021
1022 io_blocktime = 0.;
1023 timeout_blocktime = 0.;
1024
949 /* pid check not overridable via env */ 1025 /* pid check not overridable via env */
950#ifndef _WIN32 1026#ifndef _WIN32
951 if (flags & EVFLAG_FORKCHECK) 1027 if (flags & EVFLAG_FORKCHECK)
952 curpid = getpid (); 1028 curpid = getpid ();
953#endif 1029#endif
… …
1021 array_free (pending, [i]); 1097 array_free (pending, [i]);
1022#if EV_IDLE_ENABLE 1098#if EV_IDLE_ENABLE
1023 array_free (idle, [i]); 1099 array_free (idle, [i]);
1024#endif 1100#endif
1025 } 1101 }
1102
1103 ev_free (anfds); anfdmax = 0;
1026 1104
1027 /* have to use the microsoft-never-gets-it-right macro */ 1105 /* have to use the microsoft-never-gets-it-right macro */
1028 array_free (fdchange, EMPTY); 1106 array_free (fdchange, EMPTY);
1029 array_free (timer, EMPTY); 1107 array_free (timer, EMPTY);
1030#if EV_PERIODIC_ENABLE 1108#if EV_PERIODIC_ENABLE
1031 array_free (periodic, EMPTY); 1109 array_free (periodic, EMPTY);
1110#endif
1111#if EV_FORK_ENABLE
1112 array_free (fork, EMPTY);
1032#endif 1113#endif
1033 array_free (prepare, EMPTY); 1114 array_free (prepare, EMPTY);
1034 array_free (check, EMPTY); 1115 array_free (check, EMPTY);
1035 1116
1036 backend = 0; 1117 backend = 0;
… …
1206void inline_size 1287void inline_size
1207timers_reify (EV_P) 1288timers_reify (EV_P)
1208{ 1289{
1209 while (timercnt && ((WT)timers [0])->at <= mn_now) 1290 while (timercnt && ((WT)timers [0])->at <= mn_now)
1210 { 1291 {
1211 ev_timer *w = timers [0]; 1292 ev_timer *w = (ev_timer *)timers [0];
1212 1293
1213 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1294 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1214 1295
1215 /* first reschedule or stop timer */ 1296 /* first reschedule or stop timer */
1216 if (w->repeat) 1297 if (w->repeat)
… …
1219 1300
1220 ((WT)w)->at += w->repeat; 1301 ((WT)w)->at += w->repeat;
1221 if (((WT)w)->at < mn_now) 1302 if (((WT)w)->at < mn_now)
1222 ((WT)w)->at = mn_now; 1303 ((WT)w)->at = mn_now;
1223 1304
1224 downheap ((WT *)timers, timercnt, 0); 1305 downheap (timers, timercnt, 0);
1225 } 1306 }
1226 else 1307 else
1227 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1308 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1228 1309
1229 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1310 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1234void inline_size 1315void inline_size
1235periodics_reify (EV_P) 1316periodics_reify (EV_P)
1236{ 1317{
1237 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1318 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1238 { 1319 {
1239 ev_periodic *w = periodics [0]; 1320 ev_periodic *w = (ev_periodic *)periodics [0];
1240 1321
1241 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1322 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1242 1323
1243 /* first reschedule or stop timer */ 1324 /* first reschedule or stop timer */
1244 if (w->reschedule_cb) 1325 if (w->reschedule_cb)
1245 { 1326 {
1246 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1327 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1247 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1328 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1248 downheap ((WT *)periodics, periodiccnt, 0); 1329 downheap (periodics, periodiccnt, 0);
1249 } 1330 }
1250 else if (w->interval) 1331 else if (w->interval)
1251 { 1332 {
1252 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1333 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1253 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1334 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1254 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1335 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1255 downheap ((WT *)periodics, periodiccnt, 0); 1336 downheap (periodics, periodiccnt, 0);
1256 } 1337 }
1257 else 1338 else
1258 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1339 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1259 1340
1260 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1341 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1267 int i; 1348 int i;
1268 1349
1269 /* adjust periodics after time jump */ 1350 /* adjust periodics after time jump */
1270 for (i = 0; i < periodiccnt; ++i) 1351 for (i = 0; i < periodiccnt; ++i)
1271 { 1352 {
1272 ev_periodic *w = periodics [i]; 1353 ev_periodic *w = (ev_periodic *)periodics [i];
1273 1354
1274 if (w->reschedule_cb) 1355 if (w->reschedule_cb)
1275 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1356 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1276 else if (w->interval) 1357 else if (w->interval)
1277 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1358 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1278 } 1359 }
1279 1360
1280 /* now rebuild the heap */ 1361 /* now rebuild the heap */
1281 for (i = periodiccnt >> 1; i--; ) 1362 for (i = periodiccnt >> 1; i--; )
1282 downheap ((WT *)periodics, periodiccnt, i); 1363 downheap (periodics, periodiccnt, i);
1283} 1364}
1284#endif 1365#endif
1285 1366
1286#if EV_IDLE_ENABLE 1367#if EV_IDLE_ENABLE
1287void inline_size 1368void inline_size
… …
1435 /* update fd-related kernel structures */ 1516 /* update fd-related kernel structures */
1436 fd_reify (EV_A); 1517 fd_reify (EV_A);
1437 1518
1438 /* calculate blocking time */ 1519 /* calculate blocking time */
1439 { 1520 {
1440 ev_tstamp block; 1521 ev_tstamp waittime = 0.;
1522 ev_tstamp sleeptime = 0.;
1441 1523
1442 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1524 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1443 block = 0.; /* do not block at all */
1444 else
1445 { 1525 {
1446 /* update time to cancel out callback processing overhead */ 1526 /* update time to cancel out callback processing overhead */
1447 time_update (EV_A_ 1e100); 1527 time_update (EV_A_ 1e100);
1448 1528
1449 block = MAX_BLOCKTIME; 1529 waittime = MAX_BLOCKTIME;
1450 1530
1451 if (timercnt) 1531 if (timercnt)
1452 { 1532 {
1453 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1533 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1454 if (block > to) block = to; 1534 if (waittime > to) waittime = to;
1455 } 1535 }
1456 1536
1457#if EV_PERIODIC_ENABLE 1537#if EV_PERIODIC_ENABLE
1458 if (periodiccnt) 1538 if (periodiccnt)
1459 { 1539 {
1460 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1540 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1461 if (block > to) block = to; 1541 if (waittime > to) waittime = to;
1462 } 1542 }
1463#endif 1543#endif
1464 1544
1465 if (expect_false (block < 0.)) block = 0.; 1545 if (expect_false (waittime < timeout_blocktime))
1546 waittime = timeout_blocktime;
1547
1548 sleeptime = waittime - backend_fudge;
1549
1550 if (expect_true (sleeptime > io_blocktime))
1551 sleeptime = io_blocktime;
1552
1553 if (sleeptime)
1554 {
1555 ev_sleep (sleeptime);
1556 waittime -= sleeptime;
1557 }
1466 } 1558 }
1467 1559
1468 ++loop_count; 1560 ++loop_count;
1469 backend_poll (EV_A_ block); 1561 backend_poll (EV_A_ waittime);
1470 1562
1471 /* update ev_rt_now, do magic */ 1563 /* update ev_rt_now, do magic */
1472 time_update (EV_A_ block); 1564 time_update (EV_A_ waittime + sleeptime);
1473 } 1565 }
1474 1566
1475 /* queue pending timers and reschedule them */ 1567 /* queue pending timers and reschedule them */
1476 timers_reify (EV_A); /* relative timers called last */ 1568 timers_reify (EV_A); /* relative timers called last */
1477#if EV_PERIODIC_ENABLE 1569#if EV_PERIODIC_ENABLE
… …
1589 1681
1590 assert (("ev_io_start called with negative fd", fd >= 0)); 1682 assert (("ev_io_start called with negative fd", fd >= 0));
1591 1683
1592 ev_start (EV_A_ (W)w, 1); 1684 ev_start (EV_A_ (W)w, 1);
1593 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1685 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1594 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1686 wlist_add (&anfds[fd].head, (WL)w);
1595 1687
1596 fd_change (EV_A_ fd); 1688 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1689 w->events &= ~EV_IOFDSET;
1597} 1690}
1598 1691
1599void noinline 1692void noinline
1600ev_io_stop (EV_P_ ev_io *w) 1693ev_io_stop (EV_P_ ev_io *w)
1601{ 1694{
… …
1603 if (expect_false (!ev_is_active (w))) 1696 if (expect_false (!ev_is_active (w)))
1604 return; 1697 return;
1605 1698
1606 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1699 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1607 1700
1608 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1701 wlist_del (&anfds[w->fd].head, (WL)w);
1609 ev_stop (EV_A_ (W)w); 1702 ev_stop (EV_A_ (W)w);
1610 1703
1611 fd_change (EV_A_ w->fd); 1704 fd_change (EV_A_ w->fd, 1);
1612} 1705}
1613 1706
1614void noinline 1707void noinline
1615ev_timer_start (EV_P_ ev_timer *w) 1708ev_timer_start (EV_P_ ev_timer *w)
1616{ 1709{
… …
1620 ((WT)w)->at += mn_now; 1713 ((WT)w)->at += mn_now;
1621 1714
1622 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1715 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1623 1716
1624 ev_start (EV_A_ (W)w, ++timercnt); 1717 ev_start (EV_A_ (W)w, ++timercnt);
1625 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1718 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1626 timers [timercnt - 1] = w; 1719 timers [timercnt - 1] = (WT)w;
1627 upheap ((WT *)timers, timercnt - 1); 1720 upheap (timers, timercnt - 1);
1628 1721
1629 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1722 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1630} 1723}
1631 1724
1632void noinline 1725void noinline
… …
1634{ 1727{
1635 clear_pending (EV_A_ (W)w); 1728 clear_pending (EV_A_ (W)w);
1636 if (expect_false (!ev_is_active (w))) 1729 if (expect_false (!ev_is_active (w)))
1637 return; 1730 return;
1638 1731
1639 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1732 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1640 1733
1641 { 1734 {
1642 int active = ((W)w)->active; 1735 int active = ((W)w)->active;
1643 1736
1644 if (expect_true (--active < --timercnt)) 1737 if (expect_true (--active < --timercnt))
1645 { 1738 {
1646 timers [active] = timers [timercnt]; 1739 timers [active] = timers [timercnt];
1647 adjustheap ((WT *)timers, timercnt, active); 1740 adjustheap (timers, timercnt, active);
1648 } 1741 }
1649 } 1742 }
1650 1743
1651 ((WT)w)->at -= mn_now; 1744 ((WT)w)->at -= mn_now;
1652 1745
… …
1659 if (ev_is_active (w)) 1752 if (ev_is_active (w))
1660 { 1753 {
1661 if (w->repeat) 1754 if (w->repeat)
1662 { 1755 {
1663 ((WT)w)->at = mn_now + w->repeat; 1756 ((WT)w)->at = mn_now + w->repeat;
1664 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1757 adjustheap (timers, timercnt, ((W)w)->active - 1);
1665 } 1758 }
1666 else 1759 else
1667 ev_timer_stop (EV_A_ w); 1760 ev_timer_stop (EV_A_ w);
1668 } 1761 }
1669 else if (w->repeat) 1762 else if (w->repeat)
… …
1690 } 1783 }
1691 else 1784 else
1692 ((WT)w)->at = w->offset; 1785 ((WT)w)->at = w->offset;
1693 1786
1694 ev_start (EV_A_ (W)w, ++periodiccnt); 1787 ev_start (EV_A_ (W)w, ++periodiccnt);
1695 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1788 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1696 periodics [periodiccnt - 1] = w; 1789 periodics [periodiccnt - 1] = (WT)w;
1697 upheap ((WT *)periodics, periodiccnt - 1); 1790 upheap (periodics, periodiccnt - 1);
1698 1791
1699 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1792 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1700} 1793}
1701 1794
1702void noinline 1795void noinline
… …
1704{ 1797{
1705 clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1706 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1707 return; 1800 return;
1708 1801
1709 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1802 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1710 1803
1711 { 1804 {
1712 int active = ((W)w)->active; 1805 int active = ((W)w)->active;
1713 1806
1714 if (expect_true (--active < --periodiccnt)) 1807 if (expect_true (--active < --periodiccnt))
1715 { 1808 {
1716 periodics [active] = periodics [periodiccnt]; 1809 periodics [active] = periodics [periodiccnt];
1717 adjustheap ((WT *)periodics, periodiccnt, active); 1810 adjustheap (periodics, periodiccnt, active);
1718 } 1811 }
1719 } 1812 }
1720 1813
1721 ev_stop (EV_A_ (W)w); 1814 ev_stop (EV_A_ (W)w);
1722} 1815}
… …
1743 if (expect_false (ev_is_active (w))) 1836 if (expect_false (ev_is_active (w)))
1744 return; 1837 return;
1745 1838
1746 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1839 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1747 1840
1841 {
1842#ifndef _WIN32
1843 sigset_t full, prev;
1844 sigfillset (&full);
1845 sigprocmask (SIG_SETMASK, &full, &prev);
1846#endif
1847
1848 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1849
1850#ifndef _WIN32
1851 sigprocmask (SIG_SETMASK, &prev, 0);
1852#endif
1853 }
1854
1748 ev_start (EV_A_ (W)w, 1); 1855 ev_start (EV_A_ (W)w, 1);
1749 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1750 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1856 wlist_add (&signals [w->signum - 1].head, (WL)w);
1751 1857
1752 if (!((WL)w)->next) 1858 if (!((WL)w)->next)
1753 { 1859 {
1754#if _WIN32 1860#if _WIN32
1755 signal (w->signum, sighandler); 1861 signal (w->signum, sighandler);
… …
1768{ 1874{
1769 clear_pending (EV_A_ (W)w); 1875 clear_pending (EV_A_ (W)w);
1770 if (expect_false (!ev_is_active (w))) 1876 if (expect_false (!ev_is_active (w)))
1771 return; 1877 return;
1772 1878
1773 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1879 wlist_del (&signals [w->signum - 1].head, (WL)w);
1774 ev_stop (EV_A_ (W)w); 1880 ev_stop (EV_A_ (W)w);
1775 1881
1776 if (!signals [w->signum - 1].head) 1882 if (!signals [w->signum - 1].head)
1777 signal (w->signum, SIG_DFL); 1883 signal (w->signum, SIG_DFL);
1778} 1884}
… …
1785#endif 1891#endif
1786 if (expect_false (ev_is_active (w))) 1892 if (expect_false (ev_is_active (w)))
1787 return; 1893 return;
1788 1894
1789 ev_start (EV_A_ (W)w, 1); 1895 ev_start (EV_A_ (W)w, 1);
1790 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1896 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1791} 1897}
1792 1898
1793void 1899void
1794ev_child_stop (EV_P_ ev_child *w) 1900ev_child_stop (EV_P_ ev_child *w)
1795{ 1901{
1796 clear_pending (EV_A_ (W)w); 1902 clear_pending (EV_A_ (W)w);
1797 if (expect_false (!ev_is_active (w))) 1903 if (expect_false (!ev_is_active (w)))
1798 return; 1904 return;
1799 1905
1800 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1906 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1801 ev_stop (EV_A_ (W)w); 1907 ev_stop (EV_A_ (W)w);
1802} 1908}
1803 1909
1804#if EV_STAT_ENABLE 1910#if EV_STAT_ENABLE
1805 1911
… …
2147 2253
2148#if EV_EMBED_ENABLE 2254#if EV_EMBED_ENABLE
2149void noinline 2255void noinline
2150ev_embed_sweep (EV_P_ ev_embed *w) 2256ev_embed_sweep (EV_P_ ev_embed *w)
2151{ 2257{
2152 ev_loop (w->loop, EVLOOP_NONBLOCK); 2258 ev_loop (w->other, EVLOOP_NONBLOCK);
2153} 2259}
2154 2260
2155static void 2261static void
2156embed_cb (EV_P_ ev_io *io, int revents) 2262embed_io_cb (EV_P_ ev_io *io, int revents)
2157{ 2263{
2158 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2264 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2159 2265
2160 if (ev_cb (w)) 2266 if (ev_cb (w))
2161 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2267 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2162 else 2268 else
2163 ev_embed_sweep (loop, w); 2269 ev_embed_sweep (loop, w);
2164} 2270}
2165 2271
2272static void
2273embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2274{
2275 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2276
2277 fd_reify (w->other);
2278}
2279
2166void 2280void
2167ev_embed_start (EV_P_ ev_embed *w) 2281ev_embed_start (EV_P_ ev_embed *w)
2168{ 2282{
2169 if (expect_false (ev_is_active (w))) 2283 if (expect_false (ev_is_active (w)))
2170 return; 2284 return;
2171 2285
2172 { 2286 {
2173 struct ev_loop *loop = w->loop; 2287 struct ev_loop *loop = w->other;
2174 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2288 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2175 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2289 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2176 } 2290 }
2177 2291
2178 ev_set_priority (&w->io, ev_priority (w)); 2292 ev_set_priority (&w->io, ev_priority (w));
2179 ev_io_start (EV_A_ &w->io); 2293 ev_io_start (EV_A_ &w->io);
2180 2294
2295 ev_prepare_init (&w->prepare, embed_prepare_cb);
2296 ev_set_priority (&w->prepare, EV_MINPRI);
2297 ev_prepare_start (EV_A_ &w->prepare);
2298
2181 ev_start (EV_A_ (W)w, 1); 2299 ev_start (EV_A_ (W)w, 1);
2182} 2300}
2183 2301
2184void 2302void
2185ev_embed_stop (EV_P_ ev_embed *w) 2303ev_embed_stop (EV_P_ ev_embed *w)
… …
2187 clear_pending (EV_A_ (W)w); 2305 clear_pending (EV_A_ (W)w);
2188 if (expect_false (!ev_is_active (w))) 2306 if (expect_false (!ev_is_active (w)))
2189 return; 2307 return;
2190 2308
2191 ev_io_stop (EV_A_ &w->io); 2309 ev_io_stop (EV_A_ &w->io);
2310 ev_prepare_stop (EV_A_ &w->prepare);
2192 2311
2193 ev_stop (EV_A_ (W)w); 2312 ev_stop (EV_A_ (W)w);
2194} 2313}
2195#endif 2314#endif
2196 2315
… …
2285 ev_timer_set (&once->to, timeout, 0.); 2404 ev_timer_set (&once->to, timeout, 0.);
2286 ev_timer_start (EV_A_ &once->to); 2405 ev_timer_start (EV_A_ &once->to);
2287 } 2406 }
2288} 2407}
2289 2408
2409#if EV_MULTIPLICITY
2410 #include "ev_wrap.h"
2411#endif
2412
2290#ifdef __cplusplus 2413#ifdef __cplusplus
2291} 2414}
2292#endif 2415#endif
2293 2416

Diff Legend

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