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

Comparing libev/ev.c (file contents):
Revision 1.180 by root, Tue Dec 11 22:04:55 2007 UTC vs.
Revision 1.194 by root, Sat Dec 22 07:03:31 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
… …
261 280
262typedef ev_watcher *W; 281typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
265 284
285/* sig_atomic_t is used to avoid per-thread variables or locking but still */
286/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
267 288
268#ifdef _WIN32 289#ifdef _WIN32
269# include "ev_win32.c" 290# include "ev_win32.c"
270#endif 291#endif
271 292
… …
407{ 428{
408 return ev_rt_now; 429 return ev_rt_now;
409} 430}
410#endif 431#endif
411 432
433void
434ev_sleep (ev_tstamp delay)
435{
436 if (delay > 0.)
437 {
438#if EV_USE_NANOSLEEP
439 struct timespec ts;
440
441 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443
444 nanosleep (&ts, 0);
445#elif defined(_WIN32)
446 Sleep (delay * 1e3);
447#else
448 struct timeval tv;
449
450 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
452
453 select (0, 0, 0, 0, &tv);
454#endif
455 }
456}
457
458/*****************************************************************************/
459
412int inline_size 460int inline_size
413array_nextsize (int elem, int cur, int cnt) 461array_nextsize (int elem, int cur, int cnt)
414{ 462{
415 int ncur = cur + 1; 463 int ncur = cur + 1;
416 464
… …
533 { 581 {
534 int fd = fdchanges [i]; 582 int fd = fdchanges [i];
535 ANFD *anfd = anfds + fd; 583 ANFD *anfd = anfds + fd;
536 ev_io *w; 584 ev_io *w;
537 585
538 int events = 0; 586 unsigned char events = 0;
539 587
540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 588 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
541 events |= w->events; 589 events |= (unsigned char)w->events;
542 590
543#if EV_SELECT_IS_WINSOCKET 591#if EV_SELECT_IS_WINSOCKET
544 if (events) 592 if (events)
545 { 593 {
546 unsigned long argp; 594 unsigned long argp;
547 anfd->handle = _get_osfhandle (fd); 595 anfd->handle = _get_osfhandle (fd);
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 596 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 597 }
550#endif 598#endif
551 599
600 {
601 unsigned char o_events = anfd->events;
602 unsigned char o_reify = anfd->reify;
603
552 anfd->reify = 0; 604 anfd->reify = 0;
553
554 backend_modify (EV_A_ fd, anfd->events, events);
555 anfd->events = events; 605 anfd->events = events;
606
607 if (o_events != events || o_reify & EV_IOFDSET)
608 backend_modify (EV_A_ fd, o_events, events);
609 }
556 } 610 }
557 611
558 fdchangecnt = 0; 612 fdchangecnt = 0;
559} 613}
560 614
561void inline_size 615void inline_size
562fd_change (EV_P_ int fd) 616fd_change (EV_P_ int fd, int flags)
563{ 617{
564 if (expect_false (anfds [fd].reify)) 618 unsigned char reify = anfds [fd].reify;
565 return;
566
567 anfds [fd].reify = 1; 619 anfds [fd].reify |= flags;
568 620
621 if (expect_true (!reify))
622 {
569 ++fdchangecnt; 623 ++fdchangecnt;
570 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 624 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
571 fdchanges [fdchangecnt - 1] = fd; 625 fdchanges [fdchangecnt - 1] = fd;
626 }
572} 627}
573 628
574void inline_speed 629void inline_speed
575fd_kill (EV_P_ int fd) 630fd_kill (EV_P_ int fd)
576{ 631{
… …
627 682
628 for (fd = 0; fd < anfdmax; ++fd) 683 for (fd = 0; fd < anfdmax; ++fd)
629 if (anfds [fd].events) 684 if (anfds [fd].events)
630 { 685 {
631 anfds [fd].events = 0; 686 anfds [fd].events = 0;
632 fd_change (EV_A_ fd); 687 fd_change (EV_A_ fd, EV_IOFDSET | 1);
633 } 688 }
634} 689}
635 690
636/*****************************************************************************/ 691/*****************************************************************************/
637 692
… …
652 k = p; 707 k = p;
653 } 708 }
654 709
655 heap [k] = w; 710 heap [k] = w;
656 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
657
658} 712}
659 713
660void inline_speed 714void inline_speed
661downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
662{ 716{
… …
793 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
794} 848}
795 849
796/*****************************************************************************/ 850/*****************************************************************************/
797 851
798static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
799 853
800#ifndef _WIN32 854#ifndef _WIN32
801 855
802static ev_signal childev; 856static ev_signal childev;
803 857
… …
918} 972}
919 973
920unsigned int 974unsigned int
921ev_embeddable_backends (void) 975ev_embeddable_backends (void)
922{ 976{
977 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
923 return EVBACKEND_EPOLL 978 return EVBACKEND_KQUEUE
924 | EVBACKEND_KQUEUE
925 | EVBACKEND_PORT; 979 | EVBACKEND_PORT;
926} 980}
927 981
928unsigned int 982unsigned int
929ev_backend (EV_P) 983ev_backend (EV_P)
… …
933 987
934unsigned int 988unsigned int
935ev_loop_count (EV_P) 989ev_loop_count (EV_P)
936{ 990{
937 return loop_count; 991 return loop_count;
992}
993
994void
995ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
996{
997 io_blocktime = interval;
998}
999
1000void
1001ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1002{
1003 timeout_blocktime = interval;
938} 1004}
939 1005
940static void noinline 1006static void noinline
941loop_init (EV_P_ unsigned int flags) 1007loop_init (EV_P_ unsigned int flags)
942{ 1008{
… …
953 ev_rt_now = ev_time (); 1019 ev_rt_now = ev_time ();
954 mn_now = get_clock (); 1020 mn_now = get_clock ();
955 now_floor = mn_now; 1021 now_floor = mn_now;
956 rtmn_diff = ev_rt_now - mn_now; 1022 rtmn_diff = ev_rt_now - mn_now;
957 1023
1024 io_blocktime = 0.;
1025 timeout_blocktime = 0.;
1026
958 /* pid check not overridable via env */ 1027 /* pid check not overridable via env */
959#ifndef _WIN32 1028#ifndef _WIN32
960 if (flags & EVFLAG_FORKCHECK) 1029 if (flags & EVFLAG_FORKCHECK)
961 curpid = getpid (); 1030 curpid = getpid ();
962#endif 1031#endif
… …
1030 array_free (pending, [i]); 1099 array_free (pending, [i]);
1031#if EV_IDLE_ENABLE 1100#if EV_IDLE_ENABLE
1032 array_free (idle, [i]); 1101 array_free (idle, [i]);
1033#endif 1102#endif
1034 } 1103 }
1104
1105 ev_free (anfds); anfdmax = 0;
1035 1106
1036 /* have to use the microsoft-never-gets-it-right macro */ 1107 /* have to use the microsoft-never-gets-it-right macro */
1037 array_free (fdchange, EMPTY); 1108 array_free (fdchange, EMPTY);
1038 array_free (timer, EMPTY); 1109 array_free (timer, EMPTY);
1039#if EV_PERIODIC_ENABLE 1110#if EV_PERIODIC_ENABLE
1040 array_free (periodic, EMPTY); 1111 array_free (periodic, EMPTY);
1112#endif
1113#if EV_FORK_ENABLE
1114 array_free (fork, EMPTY);
1041#endif 1115#endif
1042 array_free (prepare, EMPTY); 1116 array_free (prepare, EMPTY);
1043 array_free (check, EMPTY); 1117 array_free (check, EMPTY);
1044 1118
1045 backend = 0; 1119 backend = 0;
… …
1215void inline_size 1289void inline_size
1216timers_reify (EV_P) 1290timers_reify (EV_P)
1217{ 1291{
1218 while (timercnt && ((WT)timers [0])->at <= mn_now) 1292 while (timercnt && ((WT)timers [0])->at <= mn_now)
1219 { 1293 {
1220 ev_timer *w = timers [0]; 1294 ev_timer *w = (ev_timer *)timers [0];
1221 1295
1222 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1296 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1223 1297
1224 /* first reschedule or stop timer */ 1298 /* first reschedule or stop timer */
1225 if (w->repeat) 1299 if (w->repeat)
… …
1228 1302
1229 ((WT)w)->at += w->repeat; 1303 ((WT)w)->at += w->repeat;
1230 if (((WT)w)->at < mn_now) 1304 if (((WT)w)->at < mn_now)
1231 ((WT)w)->at = mn_now; 1305 ((WT)w)->at = mn_now;
1232 1306
1233 downheap ((WT *)timers, timercnt, 0); 1307 downheap (timers, timercnt, 0);
1234 } 1308 }
1235 else 1309 else
1236 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1310 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1237 1311
1238 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1312 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
… …
1243void inline_size 1317void inline_size
1244periodics_reify (EV_P) 1318periodics_reify (EV_P)
1245{ 1319{
1246 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1320 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1247 { 1321 {
1248 ev_periodic *w = periodics [0]; 1322 ev_periodic *w = (ev_periodic *)periodics [0];
1249 1323
1250 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1324 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1251 1325
1252 /* first reschedule or stop timer */ 1326 /* first reschedule or stop timer */
1253 if (w->reschedule_cb) 1327 if (w->reschedule_cb)
1254 { 1328 {
1255 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1329 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1256 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1330 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1257 downheap ((WT *)periodics, periodiccnt, 0); 1331 downheap (periodics, periodiccnt, 0);
1258 } 1332 }
1259 else if (w->interval) 1333 else if (w->interval)
1260 { 1334 {
1261 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1335 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1262 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval; 1336 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1263 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1337 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1264 downheap ((WT *)periodics, periodiccnt, 0); 1338 downheap (periodics, periodiccnt, 0);
1265 } 1339 }
1266 else 1340 else
1267 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1341 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1268 1342
1269 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1343 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
… …
1276 int i; 1350 int i;
1277 1351
1278 /* adjust periodics after time jump */ 1352 /* adjust periodics after time jump */
1279 for (i = 0; i < periodiccnt; ++i) 1353 for (i = 0; i < periodiccnt; ++i)
1280 { 1354 {
1281 ev_periodic *w = periodics [i]; 1355 ev_periodic *w = (ev_periodic *)periodics [i];
1282 1356
1283 if (w->reschedule_cb) 1357 if (w->reschedule_cb)
1284 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1358 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1285 else if (w->interval) 1359 else if (w->interval)
1286 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1360 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1287 } 1361 }
1288 1362
1289 /* now rebuild the heap */ 1363 /* now rebuild the heap */
1290 for (i = periodiccnt >> 1; i--; ) 1364 for (i = periodiccnt >> 1; i--; )
1291 downheap ((WT *)periodics, periodiccnt, i); 1365 downheap (periodics, periodiccnt, i);
1292} 1366}
1293#endif 1367#endif
1294 1368
1295#if EV_IDLE_ENABLE 1369#if EV_IDLE_ENABLE
1296void inline_size 1370void inline_size
… …
1444 /* update fd-related kernel structures */ 1518 /* update fd-related kernel structures */
1445 fd_reify (EV_A); 1519 fd_reify (EV_A);
1446 1520
1447 /* calculate blocking time */ 1521 /* calculate blocking time */
1448 { 1522 {
1449 ev_tstamp block; 1523 ev_tstamp waittime = 0.;
1524 ev_tstamp sleeptime = 0.;
1450 1525
1451 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1526 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1452 block = 0.; /* do not block at all */
1453 else
1454 { 1527 {
1455 /* update time to cancel out callback processing overhead */ 1528 /* update time to cancel out callback processing overhead */
1456 time_update (EV_A_ 1e100); 1529 time_update (EV_A_ 1e100);
1457 1530
1458 block = MAX_BLOCKTIME; 1531 waittime = MAX_BLOCKTIME;
1459 1532
1460 if (timercnt) 1533 if (timercnt)
1461 { 1534 {
1462 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1535 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1463 if (block > to) block = to; 1536 if (waittime > to) waittime = to;
1464 } 1537 }
1465 1538
1466#if EV_PERIODIC_ENABLE 1539#if EV_PERIODIC_ENABLE
1467 if (periodiccnt) 1540 if (periodiccnt)
1468 { 1541 {
1469 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1542 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1470 if (block > to) block = to; 1543 if (waittime > to) waittime = to;
1471 } 1544 }
1472#endif 1545#endif
1473 1546
1474 if (expect_false (block < 0.)) block = 0.; 1547 if (expect_false (waittime < timeout_blocktime))
1548 waittime = timeout_blocktime;
1549
1550 sleeptime = waittime - backend_fudge;
1551
1552 if (expect_true (sleeptime > io_blocktime))
1553 sleeptime = io_blocktime;
1554
1555 if (sleeptime)
1556 {
1557 ev_sleep (sleeptime);
1558 waittime -= sleeptime;
1559 }
1475 } 1560 }
1476 1561
1477 ++loop_count; 1562 ++loop_count;
1478 backend_poll (EV_A_ block); 1563 backend_poll (EV_A_ waittime);
1479 1564
1480 /* update ev_rt_now, do magic */ 1565 /* update ev_rt_now, do magic */
1481 time_update (EV_A_ block); 1566 time_update (EV_A_ waittime + sleeptime);
1482 } 1567 }
1483 1568
1484 /* queue pending timers and reschedule them */ 1569 /* queue pending timers and reschedule them */
1485 timers_reify (EV_A); /* relative timers called last */ 1570 timers_reify (EV_A); /* relative timers called last */
1486#if EV_PERIODIC_ENABLE 1571#if EV_PERIODIC_ENABLE
… …
1598 1683
1599 assert (("ev_io_start called with negative fd", fd >= 0)); 1684 assert (("ev_io_start called with negative fd", fd >= 0));
1600 1685
1601 ev_start (EV_A_ (W)w, 1); 1686 ev_start (EV_A_ (W)w, 1);
1602 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1687 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1603 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1688 wlist_add (&anfds[fd].head, (WL)w);
1604 1689
1605 fd_change (EV_A_ fd); 1690 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1691 w->events &= ~EV_IOFDSET;
1606} 1692}
1607 1693
1608void noinline 1694void noinline
1609ev_io_stop (EV_P_ ev_io *w) 1695ev_io_stop (EV_P_ ev_io *w)
1610{ 1696{
… …
1612 if (expect_false (!ev_is_active (w))) 1698 if (expect_false (!ev_is_active (w)))
1613 return; 1699 return;
1614 1700
1615 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1701 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1616 1702
1617 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1703 wlist_del (&anfds[w->fd].head, (WL)w);
1618 ev_stop (EV_A_ (W)w); 1704 ev_stop (EV_A_ (W)w);
1619 1705
1620 fd_change (EV_A_ w->fd); 1706 fd_change (EV_A_ w->fd, 1);
1621} 1707}
1622 1708
1623void noinline 1709void noinline
1624ev_timer_start (EV_P_ ev_timer *w) 1710ev_timer_start (EV_P_ ev_timer *w)
1625{ 1711{
… …
1629 ((WT)w)->at += mn_now; 1715 ((WT)w)->at += mn_now;
1630 1716
1631 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1717 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1632 1718
1633 ev_start (EV_A_ (W)w, ++timercnt); 1719 ev_start (EV_A_ (W)w, ++timercnt);
1634 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1720 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1635 timers [timercnt - 1] = w; 1721 timers [timercnt - 1] = (WT)w;
1636 upheap ((WT *)timers, timercnt - 1); 1722 upheap (timers, timercnt - 1);
1637 1723
1638 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1724 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1639} 1725}
1640 1726
1641void noinline 1727void noinline
… …
1643{ 1729{
1644 clear_pending (EV_A_ (W)w); 1730 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1731 if (expect_false (!ev_is_active (w)))
1646 return; 1732 return;
1647 1733
1648 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1734 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1649 1735
1650 { 1736 {
1651 int active = ((W)w)->active; 1737 int active = ((W)w)->active;
1652 1738
1653 if (expect_true (--active < --timercnt)) 1739 if (expect_true (--active < --timercnt))
1654 { 1740 {
1655 timers [active] = timers [timercnt]; 1741 timers [active] = timers [timercnt];
1656 adjustheap ((WT *)timers, timercnt, active); 1742 adjustheap (timers, timercnt, active);
1657 } 1743 }
1658 } 1744 }
1659 1745
1660 ((WT)w)->at -= mn_now; 1746 ((WT)w)->at -= mn_now;
1661 1747
… …
1668 if (ev_is_active (w)) 1754 if (ev_is_active (w))
1669 { 1755 {
1670 if (w->repeat) 1756 if (w->repeat)
1671 { 1757 {
1672 ((WT)w)->at = mn_now + w->repeat; 1758 ((WT)w)->at = mn_now + w->repeat;
1673 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1759 adjustheap (timers, timercnt, ((W)w)->active - 1);
1674 } 1760 }
1675 else 1761 else
1676 ev_timer_stop (EV_A_ w); 1762 ev_timer_stop (EV_A_ w);
1677 } 1763 }
1678 else if (w->repeat) 1764 else if (w->repeat)
… …
1699 } 1785 }
1700 else 1786 else
1701 ((WT)w)->at = w->offset; 1787 ((WT)w)->at = w->offset;
1702 1788
1703 ev_start (EV_A_ (W)w, ++periodiccnt); 1789 ev_start (EV_A_ (W)w, ++periodiccnt);
1704 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1790 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1705 periodics [periodiccnt - 1] = w; 1791 periodics [periodiccnt - 1] = (WT)w;
1706 upheap ((WT *)periodics, periodiccnt - 1); 1792 upheap (periodics, periodiccnt - 1);
1707 1793
1708 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1794 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1709} 1795}
1710 1796
1711void noinline 1797void noinline
… …
1713{ 1799{
1714 clear_pending (EV_A_ (W)w); 1800 clear_pending (EV_A_ (W)w);
1715 if (expect_false (!ev_is_active (w))) 1801 if (expect_false (!ev_is_active (w)))
1716 return; 1802 return;
1717 1803
1718 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1804 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1719 1805
1720 { 1806 {
1721 int active = ((W)w)->active; 1807 int active = ((W)w)->active;
1722 1808
1723 if (expect_true (--active < --periodiccnt)) 1809 if (expect_true (--active < --periodiccnt))
1724 { 1810 {
1725 periodics [active] = periodics [periodiccnt]; 1811 periodics [active] = periodics [periodiccnt];
1726 adjustheap ((WT *)periodics, periodiccnt, active); 1812 adjustheap (periodics, periodiccnt, active);
1727 } 1813 }
1728 } 1814 }
1729 1815
1730 ev_stop (EV_A_ (W)w); 1816 ev_stop (EV_A_ (W)w);
1731} 1817}
… …
1767 sigprocmask (SIG_SETMASK, &prev, 0); 1853 sigprocmask (SIG_SETMASK, &prev, 0);
1768#endif 1854#endif
1769 } 1855 }
1770 1856
1771 ev_start (EV_A_ (W)w, 1); 1857 ev_start (EV_A_ (W)w, 1);
1772 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1858 wlist_add (&signals [w->signum - 1].head, (WL)w);
1773 1859
1774 if (!((WL)w)->next) 1860 if (!((WL)w)->next)
1775 { 1861 {
1776#if _WIN32 1862#if _WIN32
1777 signal (w->signum, sighandler); 1863 signal (w->signum, sighandler);
… …
1790{ 1876{
1791 clear_pending (EV_A_ (W)w); 1877 clear_pending (EV_A_ (W)w);
1792 if (expect_false (!ev_is_active (w))) 1878 if (expect_false (!ev_is_active (w)))
1793 return; 1879 return;
1794 1880
1795 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1881 wlist_del (&signals [w->signum - 1].head, (WL)w);
1796 ev_stop (EV_A_ (W)w); 1882 ev_stop (EV_A_ (W)w);
1797 1883
1798 if (!signals [w->signum - 1].head) 1884 if (!signals [w->signum - 1].head)
1799 signal (w->signum, SIG_DFL); 1885 signal (w->signum, SIG_DFL);
1800} 1886}
… …
1807#endif 1893#endif
1808 if (expect_false (ev_is_active (w))) 1894 if (expect_false (ev_is_active (w)))
1809 return; 1895 return;
1810 1896
1811 ev_start (EV_A_ (W)w, 1); 1897 ev_start (EV_A_ (W)w, 1);
1812 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1898 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1813} 1899}
1814 1900
1815void 1901void
1816ev_child_stop (EV_P_ ev_child *w) 1902ev_child_stop (EV_P_ ev_child *w)
1817{ 1903{
1818 clear_pending (EV_A_ (W)w); 1904 clear_pending (EV_A_ (W)w);
1819 if (expect_false (!ev_is_active (w))) 1905 if (expect_false (!ev_is_active (w)))
1820 return; 1906 return;
1821 1907
1822 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1908 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1823 ev_stop (EV_A_ (W)w); 1909 ev_stop (EV_A_ (W)w);
1824} 1910}
1825 1911
1826#if EV_STAT_ENABLE 1912#if EV_STAT_ENABLE
1827 1913
… …
2169 2255
2170#if EV_EMBED_ENABLE 2256#if EV_EMBED_ENABLE
2171void noinline 2257void noinline
2172ev_embed_sweep (EV_P_ ev_embed *w) 2258ev_embed_sweep (EV_P_ ev_embed *w)
2173{ 2259{
2174 ev_loop (w->loop, EVLOOP_NONBLOCK); 2260 ev_loop (w->other, EVLOOP_NONBLOCK);
2175} 2261}
2176 2262
2177static void 2263static void
2178embed_cb (EV_P_ ev_io *io, int revents) 2264embed_io_cb (EV_P_ ev_io *io, int revents)
2179{ 2265{
2180 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2266 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2181 2267
2182 if (ev_cb (w)) 2268 if (ev_cb (w))
2183 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2269 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2184 else 2270 else
2185 ev_embed_sweep (loop, w); 2271 ev_embed_sweep (loop, w);
2186} 2272}
2187 2273
2274static void
2275embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2276{
2277 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2278
2279 fd_reify (w->other);
2280}
2281
2188void 2282void
2189ev_embed_start (EV_P_ ev_embed *w) 2283ev_embed_start (EV_P_ ev_embed *w)
2190{ 2284{
2191 if (expect_false (ev_is_active (w))) 2285 if (expect_false (ev_is_active (w)))
2192 return; 2286 return;
2193 2287
2194 { 2288 {
2195 struct ev_loop *loop = w->loop; 2289 struct ev_loop *loop = w->other;
2196 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2290 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2197 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2291 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2198 } 2292 }
2199 2293
2200 ev_set_priority (&w->io, ev_priority (w)); 2294 ev_set_priority (&w->io, ev_priority (w));
2201 ev_io_start (EV_A_ &w->io); 2295 ev_io_start (EV_A_ &w->io);
2202 2296
2297 ev_prepare_init (&w->prepare, embed_prepare_cb);
2298 ev_set_priority (&w->prepare, EV_MINPRI);
2299 ev_prepare_start (EV_A_ &w->prepare);
2300
2203 ev_start (EV_A_ (W)w, 1); 2301 ev_start (EV_A_ (W)w, 1);
2204} 2302}
2205 2303
2206void 2304void
2207ev_embed_stop (EV_P_ ev_embed *w) 2305ev_embed_stop (EV_P_ ev_embed *w)
… …
2209 clear_pending (EV_A_ (W)w); 2307 clear_pending (EV_A_ (W)w);
2210 if (expect_false (!ev_is_active (w))) 2308 if (expect_false (!ev_is_active (w)))
2211 return; 2309 return;
2212 2310
2213 ev_io_stop (EV_A_ &w->io); 2311 ev_io_stop (EV_A_ &w->io);
2312 ev_prepare_stop (EV_A_ &w->prepare);
2214 2313
2215 ev_stop (EV_A_ (W)w); 2314 ev_stop (EV_A_ (W)w);
2216} 2315}
2217#endif 2316#endif
2218 2317
… …
2307 ev_timer_set (&once->to, timeout, 0.); 2406 ev_timer_set (&once->to, timeout, 0.);
2308 ev_timer_start (EV_A_ &once->to); 2407 ev_timer_start (EV_A_ &once->to);
2309 } 2408 }
2310} 2409}
2311 2410
2411#if EV_MULTIPLICITY
2412 #include "ev_wrap.h"
2413#endif
2414
2312#ifdef __cplusplus 2415#ifdef __cplusplus
2313} 2416}
2314#endif 2417#endif
2315 2418

Diff Legend

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