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

Comparing libev/ev.c (file contents):
Revision 1.248 by root, Wed May 21 23:25:21 2008 UTC vs.
Revision 1.264 by root, Mon Oct 13 23:20:12 2008 UTC

… …
126# define EV_USE_EVENTFD 1 126# define EV_USE_EVENTFD 1
127# else 127# else
128# define EV_USE_EVENTFD 0 128# define EV_USE_EVENTFD 0
129# endif 129# endif
130# endif 130# endif
131 131
132#endif 132#endif
133 133
134#include <math.h> 134#include <math.h>
135#include <stdlib.h> 135#include <stdlib.h>
136#include <fcntl.h> 136#include <fcntl.h>
… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
235# else 244# else
236# define EV_USE_EVENTFD 0 245# define EV_USE_EVENTFD 0
237# endif 246# endif
238#endif 247#endif
239 248
249#if 0 /* debugging */
250# define EV_VERIFY 3
251# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1
253#endif
254
255#ifndef EV_VERIFY
256# define EV_VERIFY !EV_MINIMAL
257#endif
258
240#ifndef EV_USE_4HEAP 259#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 260# define EV_USE_4HEAP !EV_MINIMAL
242#endif 261#endif
243 262
244#ifndef EV_HEAP_CACHE_AT 263#ifndef EV_HEAP_CACHE_AT
… …
267# include <sys/select.h> 286# include <sys/select.h>
268# endif 287# endif
269#endif 288#endif
270 289
271#if EV_USE_INOTIFY 290#if EV_USE_INOTIFY
291# include <sys/utsname.h>
272# include <sys/inotify.h> 292# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0
297# endif
273#endif 298#endif
274 299
275#if EV_SELECT_IS_WINSOCKET 300#if EV_SELECT_IS_WINSOCKET
276# include <winsock.h> 301# include <winsock.h>
277#endif 302#endif
… …
288# endif 313# endif
289#endif 314#endif
290 315
291/**/ 316/**/
292 317
293/* undefined or zero: no verification done or available */
294/* 1 or higher: ev_loop_verify function available */
295/* 2 or higher: ev_loop_verify is called frequently */
296#define EV_VERIFY 1
297
298#if EV_VERIFY > 1 318#if EV_VERIFY >= 3
299# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
300#else 320#else
301# define EV_FREQUENT_CHECK do { } while (0) 321# define EV_FREQUENT_CHECK do { } while (0)
302#endif 322#endif
303 323
… …
551 struct timeval tv; 571 struct timeval tv;
552 572
553 tv.tv_sec = (time_t)delay; 573 tv.tv_sec = (time_t)delay;
554 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 574 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
555 575
576 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
577 /* somehting nto guaranteed by newer posix versions, but guaranteed */
578 /* by older ones */
556 select (0, 0, 0, 0, &tv); 579 select (0, 0, 0, 0, &tv);
557#endif 580#endif
558 } 581 }
559} 582}
560 583
… …
694 events |= (unsigned char)w->events; 717 events |= (unsigned char)w->events;
695 718
696#if EV_SELECT_IS_WINSOCKET 719#if EV_SELECT_IS_WINSOCKET
697 if (events) 720 if (events)
698 { 721 {
699 unsigned long argp; 722 unsigned long arg;
700 #ifdef EV_FD_TO_WIN32_HANDLE 723 #ifdef EV_FD_TO_WIN32_HANDLE
701 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 724 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
702 #else 725 #else
703 anfd->handle = _get_osfhandle (fd); 726 anfd->handle = _get_osfhandle (fd);
704 #endif 727 #endif
705 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 728 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
706 } 729 }
707#endif 730#endif
708 731
709 { 732 {
710 unsigned char o_events = anfd->events; 733 unsigned char o_events = anfd->events;
… …
763{ 786{
764 int fd; 787 int fd;
765 788
766 for (fd = 0; fd < anfdmax; ++fd) 789 for (fd = 0; fd < anfdmax; ++fd)
767 if (anfds [fd].events) 790 if (anfds [fd].events)
768 if (!fd_valid (fd) == -1 && errno == EBADF) 791 if (!fd_valid (fd) && errno == EBADF)
769 fd_kill (EV_A_ fd); 792 fd_kill (EV_A_ fd);
770} 793}
771 794
772/* called on ENOMEM in select/poll to kill some fds and retry */ 795/* called on ENOMEM in select/poll to kill some fds and retry */
773static void noinline 796static void noinline
… …
932/* rebuild the heap: this function is used only once and executed rarely */ 955/* rebuild the heap: this function is used only once and executed rarely */
933void inline_size 956void inline_size
934reheap (ANHE *heap, int N) 957reheap (ANHE *heap, int N)
935{ 958{
936 int i; 959 int i;
960
937 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 961 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
938 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */ 962 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
939 for (i = 0; i < N; ++i) 963 for (i = 0; i < N; ++i)
940 upheap (heap, i + HEAP0); 964 upheap (heap, i + HEAP0);
941} 965}
942 966
943#if EV_VERIFY
944static void
945checkheap (ANHE *heap, int N)
946{
947 int i;
948
949 for (i = HEAP0; i < N + HEAP0; ++i)
950 {
951 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
952 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
953 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
954 }
955}
956#endif
957
958/*****************************************************************************/ 967/*****************************************************************************/
959 968
960typedef struct 969typedef struct
961{ 970{
962 WL head; 971 WL head;
… …
984 993
985void inline_speed 994void inline_speed
986fd_intern (int fd) 995fd_intern (int fd)
987{ 996{
988#ifdef _WIN32 997#ifdef _WIN32
989 int arg = 1; 998 unsigned long arg = 1;
990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 999 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
991#else 1000#else
992 fcntl (fd, F_SETFD, FD_CLOEXEC); 1001 fcntl (fd, F_SETFD, FD_CLOEXEC);
993 fcntl (fd, F_SETFL, O_NONBLOCK); 1002 fcntl (fd, F_SETFL, O_NONBLOCK);
994#endif 1003#endif
… …
1478 1487
1479 postfork = 0; 1488 postfork = 0;
1480} 1489}
1481 1490
1482#if EV_MULTIPLICITY 1491#if EV_MULTIPLICITY
1492
1483struct ev_loop * 1493struct ev_loop *
1484ev_loop_new (unsigned int flags) 1494ev_loop_new (unsigned int flags)
1485{ 1495{
1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1496 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1487 1497
… …
1507{ 1517{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1518 postfork = 1; /* must be in line with ev_default_fork */
1509} 1519}
1510 1520
1511#if EV_VERIFY 1521#if EV_VERIFY
1512static void 1522static void noinline
1523verify_watcher (EV_P_ W w)
1524{
1525 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1526
1527 if (w->pending)
1528 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1529}
1530
1531static void noinline
1532verify_heap (EV_P_ ANHE *heap, int N)
1533{
1534 int i;
1535
1536 for (i = HEAP0; i < N + HEAP0; ++i)
1537 {
1538 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1539 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1540 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1541
1542 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1543 }
1544}
1545
1546static void noinline
1513array_check (W **ws, int cnt) 1547array_verify (EV_P_ W *ws, int cnt)
1514{ 1548{
1515 while (cnt--) 1549 while (cnt--)
1550 {
1516 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1551 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1552 verify_watcher (EV_A_ ws [cnt]);
1553 }
1517} 1554}
1555#endif
1518 1556
1519static void 1557void
1520ev_loop_verify (EV_P) 1558ev_loop_verify (EV_P)
1521{ 1559{
1560#if EV_VERIFY
1522 int i; 1561 int i;
1562 WL w;
1523 1563
1564 assert (activecnt >= -1);
1565
1566 assert (fdchangemax >= fdchangecnt);
1567 for (i = 0; i < fdchangecnt; ++i)
1568 assert (("negative fd in fdchanges", fdchanges [i] >= 0));
1569
1570 assert (anfdmax >= 0);
1571 for (i = 0; i < anfdmax; ++i)
1572 for (w = anfds [i].head; w; w = w->next)
1573 {
1574 verify_watcher (EV_A_ (W)w);
1575 assert (("inactive fd watcher on anfd list", ev_active (w) == 1));
1576 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1577 }
1578
1579 assert (timermax >= timercnt);
1524 checkheap (timers, timercnt); 1580 verify_heap (EV_A_ timers, timercnt);
1581
1525#if EV_PERIODIC_ENABLE 1582#if EV_PERIODIC_ENABLE
1583 assert (periodicmax >= periodiccnt);
1526 checkheap (periodics, periodiccnt); 1584 verify_heap (EV_A_ periodics, periodiccnt);
1527#endif 1585#endif
1528 1586
1587 for (i = NUMPRI; i--; )
1588 {
1589 assert (pendingmax [i] >= pendingcnt [i]);
1529#if EV_IDLE_ENABLE 1590#if EV_IDLE_ENABLE
1530 for (i = NUMPRI; i--; ) 1591 assert (idleall >= 0);
1592 assert (idlemax [i] >= idlecnt [i]);
1531 array_check ((W **)idles [i], idlecnt [i]); 1593 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1532#endif 1594#endif
1595 }
1596
1533#if EV_FORK_ENABLE 1597#if EV_FORK_ENABLE
1598 assert (forkmax >= forkcnt);
1534 array_check ((W **)forks, forkcnt); 1599 array_verify (EV_A_ (W *)forks, forkcnt);
1535#endif 1600#endif
1536 array_check ((W **)prepares, preparecnt); 1601
1537 array_check ((W **)checks, checkcnt);
1538#if EV_ASYNC_ENABLE 1602#if EV_ASYNC_ENABLE
1603 assert (asyncmax >= asynccnt);
1539 array_check ((W **)asyncs, asynccnt); 1604 array_verify (EV_A_ (W *)asyncs, asynccnt);
1605#endif
1606
1607 assert (preparemax >= preparecnt);
1608 array_verify (EV_A_ (W *)prepares, preparecnt);
1609
1610 assert (checkmax >= checkcnt);
1611 array_verify (EV_A_ (W *)checks, checkcnt);
1612
1613# if 0
1614 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1615 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1540#endif 1616# endif
1541}
1542#endif 1617#endif
1618}
1543 1619
1544#endif 1620#endif /* multiplicity */
1545 1621
1546#if EV_MULTIPLICITY 1622#if EV_MULTIPLICITY
1547struct ev_loop * 1623struct ev_loop *
1548ev_default_loop_init (unsigned int flags) 1624ev_default_loop_init (unsigned int flags)
1549#else 1625#else
… …
1614void inline_speed 1690void inline_speed
1615call_pending (EV_P) 1691call_pending (EV_P)
1616{ 1692{
1617 int pri; 1693 int pri;
1618 1694
1619 EV_FREQUENT_CHECK;
1620
1621 for (pri = NUMPRI; pri--; ) 1695 for (pri = NUMPRI; pri--; )
1622 while (pendingcnt [pri]) 1696 while (pendingcnt [pri])
1623 { 1697 {
1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1698 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1625 1699
… …
1627 { 1701 {
1628 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1702 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1629 1703
1630 p->w->pending = 0; 1704 p->w->pending = 0;
1631 EV_CB_INVOKE (p->w, p->events); 1705 EV_CB_INVOKE (p->w, p->events);
1706 EV_FREQUENT_CHECK;
1632 } 1707 }
1633 } 1708 }
1634
1635 EV_FREQUENT_CHECK;
1636} 1709}
1637 1710
1638#if EV_IDLE_ENABLE 1711#if EV_IDLE_ENABLE
1639void inline_size 1712void inline_size
1640idle_reify (EV_P) 1713idle_reify (EV_P)
… …
1692#if EV_PERIODIC_ENABLE 1765#if EV_PERIODIC_ENABLE
1693void inline_size 1766void inline_size
1694periodics_reify (EV_P) 1767periodics_reify (EV_P)
1695{ 1768{
1696 EV_FREQUENT_CHECK; 1769 EV_FREQUENT_CHECK;
1770
1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1771 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1698 { 1772 {
1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1773 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1700 1774
1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1775 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
… …
1707 1781
1708 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1782 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1709 1783
1710 ANHE_at_cache (periodics [HEAP0]); 1784 ANHE_at_cache (periodics [HEAP0]);
1711 downheap (periodics, periodiccnt, HEAP0); 1785 downheap (periodics, periodiccnt, HEAP0);
1712 EV_FREQUENT_CHECK;
1713 } 1786 }
1714 else if (w->interval) 1787 else if (w->interval)
1715 { 1788 {
1716 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1789 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1717 /* if next trigger time is not sufficiently in the future, put it there */ 1790 /* if next trigger time is not sufficiently in the future, put it there */
… …
1842ev_unref (EV_P) 1915ev_unref (EV_P)
1843{ 1916{
1844 --activecnt; 1917 --activecnt;
1845} 1918}
1846 1919
1920void
1921ev_now_update (EV_P)
1922{
1923 time_update (EV_A_ 1e100);
1924}
1925
1847static int loop_done; 1926static int loop_done;
1848 1927
1849void 1928void
1850ev_loop (EV_P_ int flags) 1929ev_loop (EV_P_ int flags)
1851{ 1930{
… …
1853 1932
1854 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1933 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1855 1934
1856 do 1935 do
1857 { 1936 {
1937#if EV_VERIFY >= 2
1938 ev_loop_verify (EV_A);
1939#endif
1940
1858#ifndef _WIN32 1941#ifndef _WIN32
1859 if (expect_false (curpid)) /* penalise the forking check even more */ 1942 if (expect_false (curpid)) /* penalise the forking check even more */
1860 if (expect_false (getpid () != curpid)) 1943 if (expect_false (getpid () != curpid))
1861 { 1944 {
1862 curpid = getpid (); 1945 curpid = getpid ();
… …
2414 2497
2415static void noinline 2498static void noinline
2416infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2499infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2417{ 2500{
2418 if (slot < 0) 2501 if (slot < 0)
2419 /* overflow, need to check for all hahs slots */ 2502 /* overflow, need to check for all hash slots */
2420 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2503 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2421 infy_wd (EV_A_ slot, wd, ev); 2504 infy_wd (EV_A_ slot, wd, ev);
2422 else 2505 else
2423 { 2506 {
2424 WL w_; 2507 WL w_;
… …
2458infy_init (EV_P) 2541infy_init (EV_P)
2459{ 2542{
2460 if (fs_fd != -2) 2543 if (fs_fd != -2)
2461 return; 2544 return;
2462 2545
2546 /* kernels < 2.6.25 are borked
2547 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2548 */
2549 {
2550 struct utsname buf;
2551 int major, minor, micro;
2552
2553 fs_fd = -1;
2554
2555 if (uname (&buf))
2556 return;
2557
2558 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559 return;
2560
2561 if (major < 2
2562 || (major == 2 && minor < 6)
2563 || (major == 2 && minor == 6 && micro < 25))
2564 return;
2565 }
2566
2463 fs_fd = inotify_init (); 2567 fs_fd = inotify_init ();
2464 2568
2465 if (fs_fd >= 0) 2569 if (fs_fd >= 0)
2466 { 2570 {
2467 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 2571 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
… …
2496 if (fs_fd >= 0) 2600 if (fs_fd >= 0)
2497 infy_add (EV_A_ w); /* re-add, no matter what */ 2601 infy_add (EV_A_ w); /* re-add, no matter what */
2498 else 2602 else
2499 ev_timer_start (EV_A_ &w->timer); 2603 ev_timer_start (EV_A_ &w->timer);
2500 } 2604 }
2501
2502 } 2605 }
2503} 2606}
2504 2607
2608#endif
2609
2610#ifdef _WIN32
2611# define EV_LSTAT(p,b) _stati64 (p, b)
2612#else
2613# define EV_LSTAT(p,b) lstat (p, b)
2505#endif 2614#endif
2506 2615
2507void 2616void
2508ev_stat_stat (EV_P_ ev_stat *w) 2617ev_stat_stat (EV_P_ ev_stat *w)
2509{ 2618{
… …
2536 || w->prev.st_atime != w->attr.st_atime 2645 || w->prev.st_atime != w->attr.st_atime
2537 || w->prev.st_mtime != w->attr.st_mtime 2646 || w->prev.st_mtime != w->attr.st_mtime
2538 || w->prev.st_ctime != w->attr.st_ctime 2647 || w->prev.st_ctime != w->attr.st_ctime
2539 ) { 2648 ) {
2540 #if EV_USE_INOTIFY 2649 #if EV_USE_INOTIFY
2650 if (fs_fd >= 0)
2651 {
2541 infy_del (EV_A_ w); 2652 infy_del (EV_A_ w);
2542 infy_add (EV_A_ w); 2653 infy_add (EV_A_ w);
2543 ev_stat_stat (EV_A_ w); /* avoid race... */ 2654 ev_stat_stat (EV_A_ w); /* avoid race... */
2655 }
2544 #endif 2656 #endif
2545 2657
2546 ev_feed_event (EV_A_ w, EV_STAT); 2658 ev_feed_event (EV_A_ w, EV_STAT);
2547 } 2659 }
2548} 2660}
… …
2750 ev_loop (EV_A_ EVLOOP_NONBLOCK); 2862 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2751 } 2863 }
2752 } 2864 }
2753} 2865}
2754 2866
2867static void
2868embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2869{
2870 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2871
2872 {
2873 struct ev_loop *loop = w->other;
2874
2875 ev_loop_fork (EV_A);
2876 }
2877}
2878
2755#if 0 2879#if 0
2756static void 2880static void
2757embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2881embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2758{ 2882{
2759 ev_idle_stop (EV_A_ idle); 2883 ev_idle_stop (EV_A_ idle);
… …
2779 2903
2780 ev_prepare_init (&w->prepare, embed_prepare_cb); 2904 ev_prepare_init (&w->prepare, embed_prepare_cb);
2781 ev_set_priority (&w->prepare, EV_MINPRI); 2905 ev_set_priority (&w->prepare, EV_MINPRI);
2782 ev_prepare_start (EV_A_ &w->prepare); 2906 ev_prepare_start (EV_A_ &w->prepare);
2783 2907
2908 ev_fork_init (&w->fork, embed_fork_cb);
2909 ev_fork_start (EV_A_ &w->fork);
2910
2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 2911 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2785 2912
2786 ev_start (EV_A_ (W)w, 1); 2913 ev_start (EV_A_ (W)w, 1);
2787 2914
2788 EV_FREQUENT_CHECK; 2915 EV_FREQUENT_CHECK;
… …
2795 if (expect_false (!ev_is_active (w))) 2922 if (expect_false (!ev_is_active (w)))
2796 return; 2923 return;
2797 2924
2798 EV_FREQUENT_CHECK; 2925 EV_FREQUENT_CHECK;
2799 2926
2800 ev_io_stop (EV_A_ &w->io); 2927 ev_io_stop (EV_A_ &w->io);
2801 ev_prepare_stop (EV_A_ &w->prepare); 2928 ev_prepare_stop (EV_A_ &w->prepare);
2802 2929 ev_fork_stop (EV_A_ &w->fork);
2803 ev_stop (EV_A_ (W)w);
2804 2930
2805 EV_FREQUENT_CHECK; 2931 EV_FREQUENT_CHECK;
2806} 2932}
2807#endif 2933#endif
2808 2934
… …
2905once_cb (EV_P_ struct ev_once *once, int revents) 3031once_cb (EV_P_ struct ev_once *once, int revents)
2906{ 3032{
2907 void (*cb)(int revents, void *arg) = once->cb; 3033 void (*cb)(int revents, void *arg) = once->cb;
2908 void *arg = once->arg; 3034 void *arg = once->arg;
2909 3035
2910 ev_io_stop (EV_A_ &once->io); 3036 ev_io_stop (EV_A_ &once->io);
2911 ev_timer_stop (EV_A_ &once->to); 3037 ev_timer_stop (EV_A_ &once->to);
2912 ev_free (once); 3038 ev_free (once);
2913 3039
2914 cb (revents, arg); 3040 cb (revents, arg);
2915} 3041}
2916 3042
2917static void 3043static void
2918once_cb_io (EV_P_ ev_io *w, int revents) 3044once_cb_io (EV_P_ ev_io *w, int revents)
2919{ 3045{
2920 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3046 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3047
3048 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2921} 3049}
2922 3050
2923static void 3051static void
2924once_cb_to (EV_P_ ev_timer *w, int revents) 3052once_cb_to (EV_P_ ev_timer *w, int revents)
2925{ 3053{
2926 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3054 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3055
3056 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2927} 3057}
2928 3058
2929void 3059void
2930ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3060ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2931{ 3061{

Diff Legend

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