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

Comparing libev/ev.c (file contents):
Revision 1.276 by root, Sun Dec 14 13:03:54 2008 UTC vs.
Revision 1.279 by root, Fri Feb 6 20:17:43 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
64# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
67# endif 67# endif
68# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
69# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
70# endif 70# endif
71# else 71# else
72# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
73# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
74# endif 74# endif
… …
193# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif 194# endif
195#endif 195#endif
196 196
197#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
198# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 199#endif
200 200
201#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
… …
397typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
398 398
399#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
400#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
401 401
402#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
403/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
404/* giving it a reasonably high chance of working on typical architetcures */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
405static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
406#endif 410#endif
407 411
408#ifdef _WIN32 412#ifdef _WIN32
409# include "ev_win32.c" 413# include "ev_win32.c"
… …
553 557
554ev_tstamp 558ev_tstamp
555ev_time (void) 559ev_time (void)
556{ 560{
557#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
558 struct timespec ts; 564 struct timespec ts;
559 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
560 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
561#else 567 }
568#endif
569
562 struct timeval tv; 570 struct timeval tv;
563 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
564 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
565#endif
566} 573}
567 574
568ev_tstamp inline_size 575ev_tstamp inline_size
569get_clock (void) 576get_clock (void)
570{ 577{
… …
748 #ifdef EV_FD_TO_WIN32_HANDLE 755 #ifdef EV_FD_TO_WIN32_HANDLE
749 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 756 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
750 #else 757 #else
751 anfd->handle = _get_osfhandle (fd); 758 anfd->handle = _get_osfhandle (fd);
752 #endif 759 #endif
753 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 760 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
754 } 761 }
755#endif 762#endif
756 763
757 { 764 {
758 unsigned char o_events = anfd->events; 765 unsigned char o_events = anfd->events;
… …
1131ev_feed_signal_event (EV_P_ int signum) 1138ev_feed_signal_event (EV_P_ int signum)
1132{ 1139{
1133 WL w; 1140 WL w;
1134 1141
1135#if EV_MULTIPLICITY 1142#if EV_MULTIPLICITY
1136 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1143 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1137#endif 1144#endif
1138 1145
1139 --signum; 1146 --signum;
1140 1147
1141 if (signum < 0 || signum >= signalmax) 1148 if (signum < 0 || signum >= signalmax)
… …
1270 /* kqueue is borked on everything but netbsd apparently */ 1277 /* kqueue is borked on everything but netbsd apparently */
1271 /* it usually doesn't work correctly on anything but sockets and pipes */ 1278 /* it usually doesn't work correctly on anything but sockets and pipes */
1272 flags &= ~EVBACKEND_KQUEUE; 1279 flags &= ~EVBACKEND_KQUEUE;
1273#endif 1280#endif
1274#ifdef __APPLE__ 1281#ifdef __APPLE__
1275 // flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation 1282 /* only select works correctly on that "unix-certified" platform */
1276 flags &= ~EVBACKEND_SELECT; 1283 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1284 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1277#endif 1285#endif
1278 1286
1279 return flags; 1287 return flags;
1280} 1288}
1281 1289
… …
1318static void noinline 1326static void noinline
1319loop_init (EV_P_ unsigned int flags) 1327loop_init (EV_P_ unsigned int flags)
1320{ 1328{
1321 if (!backend) 1329 if (!backend)
1322 { 1330 {
1331#if EV_USE_REALTIME
1332 if (!have_realtime)
1333 {
1334 struct timespec ts;
1335
1336 if (!clock_gettime (CLOCK_REALTIME, &ts))
1337 have_realtime = 1;
1338 }
1339#endif
1340
1323#if EV_USE_MONOTONIC 1341#if EV_USE_MONOTONIC
1342 if (!have_monotonic)
1324 { 1343 {
1325 struct timespec ts; 1344 struct timespec ts;
1345
1326 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1346 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1327 have_monotonic = 1; 1347 have_monotonic = 1;
1328 } 1348 }
1329#endif 1349#endif
1330 1350
1331 ev_rt_now = ev_time (); 1351 ev_rt_now = ev_time ();
1332 mn_now = get_clock (); 1352 mn_now = get_clock ();
1333 now_floor = mn_now; 1353 now_floor = mn_now;
… …
1534 1554
1535#if EV_VERIFY 1555#if EV_VERIFY
1536static void noinline 1556static void noinline
1537verify_watcher (EV_P_ W w) 1557verify_watcher (EV_P_ W w)
1538{ 1558{
1539 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1559 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1540 1560
1541 if (w->pending) 1561 if (w->pending)
1542 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1562 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1543} 1563}
1544 1564
1545static void noinline 1565static void noinline
1546verify_heap (EV_P_ ANHE *heap, int N) 1566verify_heap (EV_P_ ANHE *heap, int N)
1547{ 1567{
1548 int i; 1568 int i;
1549 1569
1550 for (i = HEAP0; i < N + HEAP0; ++i) 1570 for (i = HEAP0; i < N + HEAP0; ++i)
1551 { 1571 {
1552 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1572 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1553 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1573 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1554 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1574 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1555 1575
1556 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1576 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1557 } 1577 }
1558} 1578}
1559 1579
1560static void noinline 1580static void noinline
1561array_verify (EV_P_ W *ws, int cnt) 1581array_verify (EV_P_ W *ws, int cnt)
1562{ 1582{
1563 while (cnt--) 1583 while (cnt--)
1564 { 1584 {
1565 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1585 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1566 verify_watcher (EV_A_ ws [cnt]); 1586 verify_watcher (EV_A_ ws [cnt]);
1567 } 1587 }
1568} 1588}
1569#endif 1589#endif
1570 1590
… …
1577 1597
1578 assert (activecnt >= -1); 1598 assert (activecnt >= -1);
1579 1599
1580 assert (fdchangemax >= fdchangecnt); 1600 assert (fdchangemax >= fdchangecnt);
1581 for (i = 0; i < fdchangecnt; ++i) 1601 for (i = 0; i < fdchangecnt; ++i)
1582 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1602 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1583 1603
1584 assert (anfdmax >= 0); 1604 assert (anfdmax >= 0);
1585 for (i = 0; i < anfdmax; ++i) 1605 for (i = 0; i < anfdmax; ++i)
1586 for (w = anfds [i].head; w; w = w->next) 1606 for (w = anfds [i].head; w; w = w->next)
1587 { 1607 {
1588 verify_watcher (EV_A_ (W)w); 1608 verify_watcher (EV_A_ (W)w);
1589 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1609 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1590 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1610 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1591 } 1611 }
1592 1612
1593 assert (timermax >= timercnt); 1613 assert (timermax >= timercnt);
1594 verify_heap (EV_A_ timers, timercnt); 1614 verify_heap (EV_A_ timers, timercnt);
1595 1615
… …
1712 { 1732 {
1713 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1733 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1714 1734
1715 if (expect_true (p->w)) 1735 if (expect_true (p->w))
1716 { 1736 {
1717 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1737 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1718 1738
1719 p->w->pending = 0; 1739 p->w->pending = 0;
1720 EV_CB_INVOKE (p->w, p->events); 1740 EV_CB_INVOKE (p->w, p->events);
1721 EV_FREQUENT_CHECK; 1741 EV_FREQUENT_CHECK;
1722 } 1742 }
… …
1753 1773
1754 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1774 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1755 { 1775 {
1756 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1776 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1757 1777
1758 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1778 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1759 1779
1760 /* first reschedule or stop timer */ 1780 /* first reschedule or stop timer */
1761 if (w->repeat) 1781 if (w->repeat)
1762 { 1782 {
1763 ev_at (w) += w->repeat; 1783 ev_at (w) += w->repeat;
1764 if (ev_at (w) < mn_now) 1784 if (ev_at (w) < mn_now)
1765 ev_at (w) = mn_now; 1785 ev_at (w) = mn_now;
1766 1786
1767 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1787 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1768 1788
1769 ANHE_at_cache (timers [HEAP0]); 1789 ANHE_at_cache (timers [HEAP0]);
1770 downheap (timers, timercnt, HEAP0); 1790 downheap (timers, timercnt, HEAP0);
1771 } 1791 }
1772 else 1792 else
… …
1785 1805
1786 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1806 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1787 { 1807 {
1788 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1808 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1789 1809
1790 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1810 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1791 1811
1792 /* first reschedule or stop timer */ 1812 /* first reschedule or stop timer */
1793 if (w->reschedule_cb) 1813 if (w->reschedule_cb)
1794 { 1814 {
1795 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1815 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1796 1816
1797 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1817 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1798 1818
1799 ANHE_at_cache (periodics [HEAP0]); 1819 ANHE_at_cache (periodics [HEAP0]);
1800 downheap (periodics, periodiccnt, HEAP0); 1820 downheap (periodics, periodiccnt, HEAP0);
1801 } 1821 }
1802 else if (w->interval) 1822 else if (w->interval)
… …
2153 int fd = w->fd; 2173 int fd = w->fd;
2154 2174
2155 if (expect_false (ev_is_active (w))) 2175 if (expect_false (ev_is_active (w)))
2156 return; 2176 return;
2157 2177
2158 assert (("ev_io_start called with negative fd", fd >= 0)); 2178 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2159 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2179 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE))));
2160 2180
2161 EV_FREQUENT_CHECK; 2181 EV_FREQUENT_CHECK;
2162 2182
2163 ev_start (EV_A_ (W)w, 1); 2183 ev_start (EV_A_ (W)w, 1);
2164 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2184 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2175{ 2195{
2176 clear_pending (EV_A_ (W)w); 2196 clear_pending (EV_A_ (W)w);
2177 if (expect_false (!ev_is_active (w))) 2197 if (expect_false (!ev_is_active (w)))
2178 return; 2198 return;
2179 2199
2180 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2200 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2181 2201
2182 EV_FREQUENT_CHECK; 2202 EV_FREQUENT_CHECK;
2183 2203
2184 wlist_del (&anfds[w->fd].head, (WL)w); 2204 wlist_del (&anfds[w->fd].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2205 ev_stop (EV_A_ (W)w);
… …
2195 if (expect_false (ev_is_active (w))) 2215 if (expect_false (ev_is_active (w)))
2196 return; 2216 return;
2197 2217
2198 ev_at (w) += mn_now; 2218 ev_at (w) += mn_now;
2199 2219
2200 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2220 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2201 2221
2202 EV_FREQUENT_CHECK; 2222 EV_FREQUENT_CHECK;
2203 2223
2204 ++timercnt; 2224 ++timercnt;
2205 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2225 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2208 ANHE_at_cache (timers [ev_active (w)]); 2228 ANHE_at_cache (timers [ev_active (w)]);
2209 upheap (timers, ev_active (w)); 2229 upheap (timers, ev_active (w));
2210 2230
2211 EV_FREQUENT_CHECK; 2231 EV_FREQUENT_CHECK;
2212 2232
2213 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2233 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2214} 2234}
2215 2235
2216void noinline 2236void noinline
2217ev_timer_stop (EV_P_ ev_timer *w) 2237ev_timer_stop (EV_P_ ev_timer *w)
2218{ 2238{
… …
2223 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2224 2244
2225 { 2245 {
2226 int active = ev_active (w); 2246 int active = ev_active (w);
2227 2247
2228 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2248 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2229 2249
2230 --timercnt; 2250 --timercnt;
2231 2251
2232 if (expect_true (active < timercnt + HEAP0)) 2252 if (expect_true (active < timercnt + HEAP0))
2233 { 2253 {
… …
2277 2297
2278 if (w->reschedule_cb) 2298 if (w->reschedule_cb)
2279 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2299 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2280 else if (w->interval) 2300 else if (w->interval)
2281 { 2301 {
2282 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2302 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2283 /* this formula differs from the one in periodic_reify because we do not always round up */ 2303 /* this formula differs from the one in periodic_reify because we do not always round up */
2284 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2304 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2285 } 2305 }
2286 else 2306 else
2287 ev_at (w) = w->offset; 2307 ev_at (w) = w->offset;
… …
2295 ANHE_at_cache (periodics [ev_active (w)]); 2315 ANHE_at_cache (periodics [ev_active (w)]);
2296 upheap (periodics, ev_active (w)); 2316 upheap (periodics, ev_active (w));
2297 2317
2298 EV_FREQUENT_CHECK; 2318 EV_FREQUENT_CHECK;
2299 2319
2300 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2320 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2301} 2321}
2302 2322
2303void noinline 2323void noinline
2304ev_periodic_stop (EV_P_ ev_periodic *w) 2324ev_periodic_stop (EV_P_ ev_periodic *w)
2305{ 2325{
… …
2310 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2311 2331
2312 { 2332 {
2313 int active = ev_active (w); 2333 int active = ev_active (w);
2314 2334
2315 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2335 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2316 2336
2317 --periodiccnt; 2337 --periodiccnt;
2318 2338
2319 if (expect_true (active < periodiccnt + HEAP0)) 2339 if (expect_true (active < periodiccnt + HEAP0))
2320 { 2340 {
… …
2343 2363
2344void noinline 2364void noinline
2345ev_signal_start (EV_P_ ev_signal *w) 2365ev_signal_start (EV_P_ ev_signal *w)
2346{ 2366{
2347#if EV_MULTIPLICITY 2367#if EV_MULTIPLICITY
2348 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2368 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2349#endif 2369#endif
2350 if (expect_false (ev_is_active (w))) 2370 if (expect_false (ev_is_active (w)))
2351 return; 2371 return;
2352 2372
2353 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2373 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2354 2374
2355 evpipe_init (EV_A); 2375 evpipe_init (EV_A);
2356 2376
2357 EV_FREQUENT_CHECK; 2377 EV_FREQUENT_CHECK;
2358 2378
… …
2409 2429
2410void 2430void
2411ev_child_start (EV_P_ ev_child *w) 2431ev_child_start (EV_P_ ev_child *w)
2412{ 2432{
2413#if EV_MULTIPLICITY 2433#if EV_MULTIPLICITY
2414 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2434 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2415#endif 2435#endif
2416 if (expect_false (ev_is_active (w))) 2436 if (expect_false (ev_is_active (w)))
2417 return; 2437 return;
2418 2438
2419 EV_FREQUENT_CHECK; 2439 EV_FREQUENT_CHECK;
… …
2905static void 2925static void
2906embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2926embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2907{ 2927{
2908 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2928 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2909 2929
2930 ev_embed_stop (EV_A_ w);
2931
2910 { 2932 {
2911 struct ev_loop *loop = w->other; 2933 struct ev_loop *loop = w->other;
2912 2934
2913 ev_loop_fork (EV_A); 2935 ev_loop_fork (EV_A);
2936 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2914 } 2937 }
2938
2939 ev_embed_start (EV_A_ w);
2915} 2940}
2916 2941
2917#if 0 2942#if 0
2918static void 2943static void
2919embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2944embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2928 if (expect_false (ev_is_active (w))) 2953 if (expect_false (ev_is_active (w)))
2929 return; 2954 return;
2930 2955
2931 { 2956 {
2932 struct ev_loop *loop = w->other; 2957 struct ev_loop *loop = w->other;
2933 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2958 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2934 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 2959 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2935 } 2960 }
2936 2961
2937 EV_FREQUENT_CHECK; 2962 EV_FREQUENT_CHECK;
2938 2963

Diff Legend

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