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

Comparing libev/ev.c (file contents):
Revision 1.181 by root, Wed Dec 12 00:17:08 2007 UTC vs.
Revision 1.196 by root, Sat Dec 22 12:43:28 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
… …
792 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
793} 848}
794 849
795/*****************************************************************************/ 850/*****************************************************************************/
796 851
797static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
798 853
799#ifndef _WIN32 854#ifndef _WIN32
800 855
801static ev_signal childev; 856static ev_signal childev;
802 857
… …
917} 972}
918 973
919unsigned int 974unsigned int
920ev_embeddable_backends (void) 975ev_embeddable_backends (void)
921{ 976{
922 return EVBACKEND_EPOLL 977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
923 | EVBACKEND_KQUEUE 978
924 | EVBACKEND_PORT; 979 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
980 /* please fix it and tell me how to detect the fix */
981 flags &= ~EVBACKEND_EPOLL;
982
983#ifdef __APPLE__
984 /* is there anything thats not broken on darwin? */
985 flags &= ~EVBACKEND_KQUEUE;
986#endif
987
988 return flags;
925} 989}
926 990
927unsigned int 991unsigned int
928ev_backend (EV_P) 992ev_backend (EV_P)
929{ 993{
… …
932 996
933unsigned int 997unsigned int
934ev_loop_count (EV_P) 998ev_loop_count (EV_P)
935{ 999{
936 return loop_count; 1000 return loop_count;
1001}
1002
1003void
1004ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1005{
1006 io_blocktime = interval;
1007}
1008
1009void
1010ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1011{
1012 timeout_blocktime = interval;
937} 1013}
938 1014
939static void noinline 1015static void noinline
940loop_init (EV_P_ unsigned int flags) 1016loop_init (EV_P_ unsigned int flags)
941{ 1017{
… …
952 ev_rt_now = ev_time (); 1028 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1029 mn_now = get_clock ();
954 now_floor = mn_now; 1030 now_floor = mn_now;
955 rtmn_diff = ev_rt_now - mn_now; 1031 rtmn_diff = ev_rt_now - mn_now;
956 1032
1033 io_blocktime = 0.;
1034 timeout_blocktime = 0.;
1035
957 /* pid check not overridable via env */ 1036 /* pid check not overridable via env */
958#ifndef _WIN32 1037#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1038 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1039 curpid = getpid ();
961#endif 1040#endif
… …
1029 array_free (pending, [i]); 1108 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1109#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1110 array_free (idle, [i]);
1032#endif 1111#endif
1033 } 1112 }
1113
1114 ev_free (anfds); anfdmax = 0;
1034 1115
1035 /* have to use the microsoft-never-gets-it-right macro */ 1116 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1117 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1118 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1119#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1120 array_free (periodic, EMPTY);
1121#endif
1122#if EV_FORK_ENABLE
1123 array_free (fork, EMPTY);
1040#endif 1124#endif
1041 array_free (prepare, EMPTY); 1125 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1126 array_free (check, EMPTY);
1043 1127
1044 backend = 0; 1128 backend = 0;
… …
1443 /* update fd-related kernel structures */ 1527 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1528 fd_reify (EV_A);
1445 1529
1446 /* calculate blocking time */ 1530 /* calculate blocking time */
1447 { 1531 {
1448 ev_tstamp block; 1532 ev_tstamp waittime = 0.;
1533 ev_tstamp sleeptime = 0.;
1449 1534
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1535 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1536 {
1454 /* update time to cancel out callback processing overhead */ 1537 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 1538 time_update (EV_A_ 1e100);
1456 1539
1457 block = MAX_BLOCKTIME; 1540 waittime = MAX_BLOCKTIME;
1458 1541
1459 if (timercnt) 1542 if (timercnt)
1460 { 1543 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1544 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1462 if (block > to) block = to; 1545 if (waittime > to) waittime = to;
1463 } 1546 }
1464 1547
1465#if EV_PERIODIC_ENABLE 1548#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 1549 if (periodiccnt)
1467 { 1550 {
1468 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1551 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1469 if (block > to) block = to; 1552 if (waittime > to) waittime = to;
1470 } 1553 }
1471#endif 1554#endif
1472 1555
1473 if (expect_false (block < 0.)) block = 0.; 1556 if (expect_false (waittime < timeout_blocktime))
1557 waittime = timeout_blocktime;
1558
1559 sleeptime = waittime - backend_fudge;
1560
1561 if (expect_true (sleeptime > io_blocktime))
1562 sleeptime = io_blocktime;
1563
1564 if (sleeptime)
1565 {
1566 ev_sleep (sleeptime);
1567 waittime -= sleeptime;
1568 }
1474 } 1569 }
1475 1570
1476 ++loop_count; 1571 ++loop_count;
1477 backend_poll (EV_A_ block); 1572 backend_poll (EV_A_ waittime);
1478 1573
1479 /* update ev_rt_now, do magic */ 1574 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 1575 time_update (EV_A_ waittime + sleeptime);
1481 } 1576 }
1482 1577
1483 /* queue pending timers and reschedule them */ 1578 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 1579 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 1580#if EV_PERIODIC_ENABLE
… …
1597 1692
1598 assert (("ev_io_start called with negative fd", fd >= 0)); 1693 assert (("ev_io_start called with negative fd", fd >= 0));
1599 1694
1600 ev_start (EV_A_ (W)w, 1); 1695 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1696 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1602 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1697 wlist_add (&anfds[fd].head, (WL)w);
1603 1698
1604 fd_change (EV_A_ fd); 1699 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1700 w->events &= ~EV_IOFDSET;
1605} 1701}
1606 1702
1607void noinline 1703void noinline
1608ev_io_stop (EV_P_ ev_io *w) 1704ev_io_stop (EV_P_ ev_io *w)
1609{ 1705{
… …
1611 if (expect_false (!ev_is_active (w))) 1707 if (expect_false (!ev_is_active (w)))
1612 return; 1708 return;
1613 1709
1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1710 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1615 1711
1616 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1712 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 1713 ev_stop (EV_A_ (W)w);
1618 1714
1619 fd_change (EV_A_ w->fd); 1715 fd_change (EV_A_ w->fd, 1);
1620} 1716}
1621 1717
1622void noinline 1718void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 1719ev_timer_start (EV_P_ ev_timer *w)
1624{ 1720{
… …
1766 sigprocmask (SIG_SETMASK, &prev, 0); 1862 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif 1863#endif
1768 } 1864 }
1769 1865
1770 ev_start (EV_A_ (W)w, 1); 1866 ev_start (EV_A_ (W)w, 1);
1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1867 wlist_add (&signals [w->signum - 1].head, (WL)w);
1772 1868
1773 if (!((WL)w)->next) 1869 if (!((WL)w)->next)
1774 { 1870 {
1775#if _WIN32 1871#if _WIN32
1776 signal (w->signum, sighandler); 1872 signal (w->signum, sighandler);
… …
1789{ 1885{
1790 clear_pending (EV_A_ (W)w); 1886 clear_pending (EV_A_ (W)w);
1791 if (expect_false (!ev_is_active (w))) 1887 if (expect_false (!ev_is_active (w)))
1792 return; 1888 return;
1793 1889
1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1890 wlist_del (&signals [w->signum - 1].head, (WL)w);
1795 ev_stop (EV_A_ (W)w); 1891 ev_stop (EV_A_ (W)w);
1796 1892
1797 if (!signals [w->signum - 1].head) 1893 if (!signals [w->signum - 1].head)
1798 signal (w->signum, SIG_DFL); 1894 signal (w->signum, SIG_DFL);
1799} 1895}
… …
1806#endif 1902#endif
1807 if (expect_false (ev_is_active (w))) 1903 if (expect_false (ev_is_active (w)))
1808 return; 1904 return;
1809 1905
1810 ev_start (EV_A_ (W)w, 1); 1906 ev_start (EV_A_ (W)w, 1);
1811 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1907 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1812} 1908}
1813 1909
1814void 1910void
1815ev_child_stop (EV_P_ ev_child *w) 1911ev_child_stop (EV_P_ ev_child *w)
1816{ 1912{
1817 clear_pending (EV_A_ (W)w); 1913 clear_pending (EV_A_ (W)w);
1818 if (expect_false (!ev_is_active (w))) 1914 if (expect_false (!ev_is_active (w)))
1819 return; 1915 return;
1820 1916
1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1917 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1822 ev_stop (EV_A_ (W)w); 1918 ev_stop (EV_A_ (W)w);
1823} 1919}
1824 1920
1825#if EV_STAT_ENABLE 1921#if EV_STAT_ENABLE
1826 1922
… …
2168 2264
2169#if EV_EMBED_ENABLE 2265#if EV_EMBED_ENABLE
2170void noinline 2266void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2267ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2268{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2269 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2270}
2175 2271
2176static void 2272static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2273embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2274{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2275 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2276
2181 if (ev_cb (w)) 2277 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2278 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2279 else
2184 ev_embed_sweep (loop, w); 2280 ev_loop (w->other, EVLOOP_NONBLOCK);
2185} 2281}
2282
2283static void
2284embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2285{
2286 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2287
2288 {
2289 struct ev_loop *loop = w->other;
2290
2291 while (fdchangecnt)
2292 {
2293 fd_reify (EV_A);
2294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2295 }
2296 }
2297}
2298
2299#if 0
2300static void
2301embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2302{
2303 ev_idle_stop (EV_A_ idle);
2304}
2305#endif
2186 2306
2187void 2307void
2188ev_embed_start (EV_P_ ev_embed *w) 2308ev_embed_start (EV_P_ ev_embed *w)
2189{ 2309{
2190 if (expect_false (ev_is_active (w))) 2310 if (expect_false (ev_is_active (w)))
2191 return; 2311 return;
2192 2312
2193 { 2313 {
2194 struct ev_loop *loop = w->loop; 2314 struct ev_loop *loop = w->other;
2195 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2315 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2316 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2317 }
2198 2318
2199 ev_set_priority (&w->io, ev_priority (w)); 2319 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2320 ev_io_start (EV_A_ &w->io);
2201 2321
2322 ev_prepare_init (&w->prepare, embed_prepare_cb);
2323 ev_set_priority (&w->prepare, EV_MINPRI);
2324 ev_prepare_start (EV_A_ &w->prepare);
2325
2326 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2327
2202 ev_start (EV_A_ (W)w, 1); 2328 ev_start (EV_A_ (W)w, 1);
2203} 2329}
2204 2330
2205void 2331void
2206ev_embed_stop (EV_P_ ev_embed *w) 2332ev_embed_stop (EV_P_ ev_embed *w)
… …
2208 clear_pending (EV_A_ (W)w); 2334 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2335 if (expect_false (!ev_is_active (w)))
2210 return; 2336 return;
2211 2337
2212 ev_io_stop (EV_A_ &w->io); 2338 ev_io_stop (EV_A_ &w->io);
2339 ev_prepare_stop (EV_A_ &w->prepare);
2213 2340
2214 ev_stop (EV_A_ (W)w); 2341 ev_stop (EV_A_ (W)w);
2215} 2342}
2216#endif 2343#endif
2217 2344
… …
2306 ev_timer_set (&once->to, timeout, 0.); 2433 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 2434 ev_timer_start (EV_A_ &once->to);
2308 } 2435 }
2309} 2436}
2310 2437
2438#if EV_MULTIPLICITY
2439 #include "ev_wrap.h"
2440#endif
2441
2311#ifdef __cplusplus 2442#ifdef __cplusplus
2312} 2443}
2313#endif 2444#endif
2314 2445

Diff Legend

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