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.197 by root, Sat Dec 22 15:20:13 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 return flags;
925} 984}
926 985
927unsigned int 986unsigned int
928ev_backend (EV_P) 987ev_backend (EV_P)
929{ 988{
… …
932 991
933unsigned int 992unsigned int
934ev_loop_count (EV_P) 993ev_loop_count (EV_P)
935{ 994{
936 return loop_count; 995 return loop_count;
996}
997
998void
999ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1000{
1001 io_blocktime = interval;
1002}
1003
1004void
1005ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1006{
1007 timeout_blocktime = interval;
937} 1008}
938 1009
939static void noinline 1010static void noinline
940loop_init (EV_P_ unsigned int flags) 1011loop_init (EV_P_ unsigned int flags)
941{ 1012{
… …
952 ev_rt_now = ev_time (); 1023 ev_rt_now = ev_time ();
953 mn_now = get_clock (); 1024 mn_now = get_clock ();
954 now_floor = mn_now; 1025 now_floor = mn_now;
955 rtmn_diff = ev_rt_now - mn_now; 1026 rtmn_diff = ev_rt_now - mn_now;
956 1027
1028 io_blocktime = 0.;
1029 timeout_blocktime = 0.;
1030
957 /* pid check not overridable via env */ 1031 /* pid check not overridable via env */
958#ifndef _WIN32 1032#ifndef _WIN32
959 if (flags & EVFLAG_FORKCHECK) 1033 if (flags & EVFLAG_FORKCHECK)
960 curpid = getpid (); 1034 curpid = getpid ();
961#endif 1035#endif
… …
1029 array_free (pending, [i]); 1103 array_free (pending, [i]);
1030#if EV_IDLE_ENABLE 1104#if EV_IDLE_ENABLE
1031 array_free (idle, [i]); 1105 array_free (idle, [i]);
1032#endif 1106#endif
1033 } 1107 }
1108
1109 ev_free (anfds); anfdmax = 0;
1034 1110
1035 /* have to use the microsoft-never-gets-it-right macro */ 1111 /* have to use the microsoft-never-gets-it-right macro */
1036 array_free (fdchange, EMPTY); 1112 array_free (fdchange, EMPTY);
1037 array_free (timer, EMPTY); 1113 array_free (timer, EMPTY);
1038#if EV_PERIODIC_ENABLE 1114#if EV_PERIODIC_ENABLE
1039 array_free (periodic, EMPTY); 1115 array_free (periodic, EMPTY);
1116#endif
1117#if EV_FORK_ENABLE
1118 array_free (fork, EMPTY);
1040#endif 1119#endif
1041 array_free (prepare, EMPTY); 1120 array_free (prepare, EMPTY);
1042 array_free (check, EMPTY); 1121 array_free (check, EMPTY);
1043 1122
1044 backend = 0; 1123 backend = 0;
… …
1443 /* update fd-related kernel structures */ 1522 /* update fd-related kernel structures */
1444 fd_reify (EV_A); 1523 fd_reify (EV_A);
1445 1524
1446 /* calculate blocking time */ 1525 /* calculate blocking time */
1447 { 1526 {
1448 ev_tstamp block; 1527 ev_tstamp waittime = 0.;
1528 ev_tstamp sleeptime = 0.;
1449 1529
1450 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1530 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1451 block = 0.; /* do not block at all */
1452 else
1453 { 1531 {
1454 /* update time to cancel out callback processing overhead */ 1532 /* update time to cancel out callback processing overhead */
1455 time_update (EV_A_ 1e100); 1533 time_update (EV_A_ 1e100);
1456 1534
1457 block = MAX_BLOCKTIME; 1535 waittime = MAX_BLOCKTIME;
1458 1536
1459 if (timercnt) 1537 if (timercnt)
1460 { 1538 {
1461 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1539 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1462 if (block > to) block = to; 1540 if (waittime > to) waittime = to;
1463 } 1541 }
1464 1542
1465#if EV_PERIODIC_ENABLE 1543#if EV_PERIODIC_ENABLE
1466 if (periodiccnt) 1544 if (periodiccnt)
1467 { 1545 {
1468 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1546 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1469 if (block > to) block = to; 1547 if (waittime > to) waittime = to;
1470 } 1548 }
1471#endif 1549#endif
1472 1550
1473 if (expect_false (block < 0.)) block = 0.; 1551 if (expect_false (waittime < timeout_blocktime))
1552 waittime = timeout_blocktime;
1553
1554 sleeptime = waittime - backend_fudge;
1555
1556 if (expect_true (sleeptime > io_blocktime))
1557 sleeptime = io_blocktime;
1558
1559 if (sleeptime)
1560 {
1561 ev_sleep (sleeptime);
1562 waittime -= sleeptime;
1563 }
1474 } 1564 }
1475 1565
1476 ++loop_count; 1566 ++loop_count;
1477 backend_poll (EV_A_ block); 1567 backend_poll (EV_A_ waittime);
1478 1568
1479 /* update ev_rt_now, do magic */ 1569 /* update ev_rt_now, do magic */
1480 time_update (EV_A_ block); 1570 time_update (EV_A_ waittime + sleeptime);
1481 } 1571 }
1482 1572
1483 /* queue pending timers and reschedule them */ 1573 /* queue pending timers and reschedule them */
1484 timers_reify (EV_A); /* relative timers called last */ 1574 timers_reify (EV_A); /* relative timers called last */
1485#if EV_PERIODIC_ENABLE 1575#if EV_PERIODIC_ENABLE
… …
1597 1687
1598 assert (("ev_io_start called with negative fd", fd >= 0)); 1688 assert (("ev_io_start called with negative fd", fd >= 0));
1599 1689
1600 ev_start (EV_A_ (W)w, 1); 1690 ev_start (EV_A_ (W)w, 1);
1601 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1691 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1602 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1692 wlist_add (&anfds[fd].head, (WL)w);
1603 1693
1604 fd_change (EV_A_ fd); 1694 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1695 w->events &= ~EV_IOFDSET;
1605} 1696}
1606 1697
1607void noinline 1698void noinline
1608ev_io_stop (EV_P_ ev_io *w) 1699ev_io_stop (EV_P_ ev_io *w)
1609{ 1700{
… …
1611 if (expect_false (!ev_is_active (w))) 1702 if (expect_false (!ev_is_active (w)))
1612 return; 1703 return;
1613 1704
1614 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1705 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1615 1706
1616 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1707 wlist_del (&anfds[w->fd].head, (WL)w);
1617 ev_stop (EV_A_ (W)w); 1708 ev_stop (EV_A_ (W)w);
1618 1709
1619 fd_change (EV_A_ w->fd); 1710 fd_change (EV_A_ w->fd, 1);
1620} 1711}
1621 1712
1622void noinline 1713void noinline
1623ev_timer_start (EV_P_ ev_timer *w) 1714ev_timer_start (EV_P_ ev_timer *w)
1624{ 1715{
… …
1766 sigprocmask (SIG_SETMASK, &prev, 0); 1857 sigprocmask (SIG_SETMASK, &prev, 0);
1767#endif 1858#endif
1768 } 1859 }
1769 1860
1770 ev_start (EV_A_ (W)w, 1); 1861 ev_start (EV_A_ (W)w, 1);
1771 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1862 wlist_add (&signals [w->signum - 1].head, (WL)w);
1772 1863
1773 if (!((WL)w)->next) 1864 if (!((WL)w)->next)
1774 { 1865 {
1775#if _WIN32 1866#if _WIN32
1776 signal (w->signum, sighandler); 1867 signal (w->signum, sighandler);
… …
1789{ 1880{
1790 clear_pending (EV_A_ (W)w); 1881 clear_pending (EV_A_ (W)w);
1791 if (expect_false (!ev_is_active (w))) 1882 if (expect_false (!ev_is_active (w)))
1792 return; 1883 return;
1793 1884
1794 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_del (&signals [w->signum - 1].head, (WL)w);
1795 ev_stop (EV_A_ (W)w); 1886 ev_stop (EV_A_ (W)w);
1796 1887
1797 if (!signals [w->signum - 1].head) 1888 if (!signals [w->signum - 1].head)
1798 signal (w->signum, SIG_DFL); 1889 signal (w->signum, SIG_DFL);
1799} 1890}
… …
1806#endif 1897#endif
1807 if (expect_false (ev_is_active (w))) 1898 if (expect_false (ev_is_active (w)))
1808 return; 1899 return;
1809 1900
1810 ev_start (EV_A_ (W)w, 1); 1901 ev_start (EV_A_ (W)w, 1);
1811 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1902 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1812} 1903}
1813 1904
1814void 1905void
1815ev_child_stop (EV_P_ ev_child *w) 1906ev_child_stop (EV_P_ ev_child *w)
1816{ 1907{
1817 clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1818 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1819 return; 1910 return;
1820 1911
1821 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1912 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1822 ev_stop (EV_A_ (W)w); 1913 ev_stop (EV_A_ (W)w);
1823} 1914}
1824 1915
1825#if EV_STAT_ENABLE 1916#if EV_STAT_ENABLE
1826 1917
… …
2168 2259
2169#if EV_EMBED_ENABLE 2260#if EV_EMBED_ENABLE
2170void noinline 2261void noinline
2171ev_embed_sweep (EV_P_ ev_embed *w) 2262ev_embed_sweep (EV_P_ ev_embed *w)
2172{ 2263{
2173 ev_loop (w->loop, EVLOOP_NONBLOCK); 2264 ev_loop (w->other, EVLOOP_NONBLOCK);
2174} 2265}
2175 2266
2176static void 2267static void
2177embed_cb (EV_P_ ev_io *io, int revents) 2268embed_io_cb (EV_P_ ev_io *io, int revents)
2178{ 2269{
2179 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2270 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2180 2271
2181 if (ev_cb (w)) 2272 if (ev_cb (w))
2182 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2273 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2183 else 2274 else
2184 ev_embed_sweep (loop, w); 2275 ev_loop (w->other, EVLOOP_NONBLOCK);
2185} 2276}
2277
2278static void
2279embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2280{
2281 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2282
2283 {
2284 struct ev_loop *loop = w->other;
2285
2286 while (fdchangecnt)
2287 {
2288 fd_reify (EV_A);
2289 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2290 }
2291 }
2292}
2293
2294#if 0
2295static void
2296embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2297{
2298 ev_idle_stop (EV_A_ idle);
2299}
2300#endif
2186 2301
2187void 2302void
2188ev_embed_start (EV_P_ ev_embed *w) 2303ev_embed_start (EV_P_ ev_embed *w)
2189{ 2304{
2190 if (expect_false (ev_is_active (w))) 2305 if (expect_false (ev_is_active (w)))
2191 return; 2306 return;
2192 2307
2193 { 2308 {
2194 struct ev_loop *loop = w->loop; 2309 struct ev_loop *loop = w->other;
2195 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2310 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2196 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2197 } 2312 }
2198 2313
2199 ev_set_priority (&w->io, ev_priority (w)); 2314 ev_set_priority (&w->io, ev_priority (w));
2200 ev_io_start (EV_A_ &w->io); 2315 ev_io_start (EV_A_ &w->io);
2201 2316
2317 ev_prepare_init (&w->prepare, embed_prepare_cb);
2318 ev_set_priority (&w->prepare, EV_MINPRI);
2319 ev_prepare_start (EV_A_ &w->prepare);
2320
2321 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2322
2202 ev_start (EV_A_ (W)w, 1); 2323 ev_start (EV_A_ (W)w, 1);
2203} 2324}
2204 2325
2205void 2326void
2206ev_embed_stop (EV_P_ ev_embed *w) 2327ev_embed_stop (EV_P_ ev_embed *w)
… …
2208 clear_pending (EV_A_ (W)w); 2329 clear_pending (EV_A_ (W)w);
2209 if (expect_false (!ev_is_active (w))) 2330 if (expect_false (!ev_is_active (w)))
2210 return; 2331 return;
2211 2332
2212 ev_io_stop (EV_A_ &w->io); 2333 ev_io_stop (EV_A_ &w->io);
2334 ev_prepare_stop (EV_A_ &w->prepare);
2213 2335
2214 ev_stop (EV_A_ (W)w); 2336 ev_stop (EV_A_ (W)w);
2215} 2337}
2216#endif 2338#endif
2217 2339
… …
2306 ev_timer_set (&once->to, timeout, 0.); 2428 ev_timer_set (&once->to, timeout, 0.);
2307 ev_timer_start (EV_A_ &once->to); 2429 ev_timer_start (EV_A_ &once->to);
2308 } 2430 }
2309} 2431}
2310 2432
2433#if EV_MULTIPLICITY
2434 #include "ev_wrap.h"
2435#endif
2436
2311#ifdef __cplusplus 2437#ifdef __cplusplus
2312} 2438}
2313#endif 2439#endif
2314 2440

Diff Legend

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