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

Comparing libev/ev.c (file contents):
Revision 1.303 by root, Sun Jul 19 01:36:34 2009 UTC vs.
Revision 1.307 by root, Sun Jul 19 07:20:41 2009 UTC

… …
186# endif 186# endif
187#endif 187#endif
188 188
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
190 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
191#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
194# else 221# else
195# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
930 957
931 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 959 if (anfds [fd].events)
933 { 960 {
934 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
935 return; 962 break;
936 } 963 }
937} 964}
938 965
939/* usually called after fork if backend needs to re-arm all fds from scratch */ 966/* usually called after fork if backend needs to re-arm all fds from scratch */
940static void noinline 967static void noinline
… …
1099/*****************************************************************************/ 1126/*****************************************************************************/
1100 1127
1101/* associate signal watchers to a signal signal */ 1128/* associate signal watchers to a signal signal */
1102typedef struct 1129typedef struct
1103{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1104 WL head; 1135 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1136} ANSIG;
1107 1137
1108static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1139
1113/*****************************************************************************/ 1140/*****************************************************************************/
1114 1141
1115/* used to prepare libev internal fd's */ 1142/* used to prepare libev internal fd's */
1116/* this is not fork-safe */ 1143/* this is not fork-safe */
… …
1184/* called whenever the libev signal pipe */ 1211/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1212/* got some events (signal, async) */
1186static void 1213static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1215{
1216 int i;
1217
1189#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1219 if (evfd >= 0)
1191 { 1220 {
1192 uint64_t counter; 1221 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
… …
1197 { 1226 {
1198 char dummy; 1227 char dummy;
1199 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
1200 } 1229 }
1201 1230
1202 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
1203 { 1232 {
1204 int signum; 1233 sig_pending = 0;
1205 gotsig = 0;
1206 1234
1207 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1238 }
1211 1239
1212#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
1213 if (gotasync) 1241 if (async_pending)
1214 { 1242 {
1215 int i; 1243 async_pending = 0;
1216 gotasync = 0;
1217 1244
1218 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
1220 { 1247 {
1221 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
… …
1229 1256
1230static void 1257static void
1231ev_sighandler (int signum) 1258ev_sighandler (int signum)
1232{ 1259{
1233#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
1235#endif 1262#endif
1236 1263
1237#if _WIN32 1264#if _WIN32
1238 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
1239#endif 1266#endif
1240 1267
1241 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
1243} 1270}
1244 1271
1245void noinline 1272void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
1247{ 1274{
1248 WL w; 1275 WL w;
1249 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
1250#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1283 /* it is permissible to try to feed a signal to the wrong loop */
1252#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1285
1254 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1287 return;
1288#endif
1258 1289
1259 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
1260 1291
1261 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1294}
1264 1295
1265#if EV_USE_SIGNALFD 1296#if EV_USE_SIGNALFD
1266static void 1297static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1298sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1299{
1269 struct signalfd_siginfo si[4], *sip; 1300 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1301
1271 for (;;) 1302 for (;;)
1272 { 1303 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1304 ssize_t res = read (sigfd, si, sizeof (si));
1274 1305
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1540 have_monotonic = 1;
1510 } 1541 }
1511#endif 1542#endif
1512 1543
1544 /* pid check not overridable via env */
1545#ifndef _WIN32
1546 if (flags & EVFLAG_FORKCHECK)
1547 curpid = getpid ();
1548#endif
1549
1550 if (!(flags & EVFLAG_NOENV)
1551 && !enable_secure ()
1552 && getenv ("LIBEV_FLAGS"))
1553 flags = atoi (getenv ("LIBEV_FLAGS"));
1554
1513 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1556 mn_now = get_clock ();
1515 now_floor = mn_now; 1557 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1558 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1559#if EV_MINIMAL < 2
… …
1520 1562
1521 io_blocktime = 0.; 1563 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1523 backend = 0; 1565 backend = 0;
1524 backend_fd = -1; 1566 backend_fd = -1;
1525 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1526#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1527 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1573#endif
1529#if EV_USE_SIGNALFD 1574#if EV_USE_SIGNALFD
1530 sigfd = -2; 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1531#endif 1576#endif
1532
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV)
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543 1577
1544 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1546 1580
1547#if EV_USE_PORT 1581#if EV_USE_PORT
… …
1630#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1665 array_free (idle, [i]);
1632#endif 1666#endif
1633 } 1667 }
1634 1668
1635 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1670
1637 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1675 1709
1676 if (ev_is_active (&pipe_w)) 1710 if (ev_is_active (&pipe_w))
1677 { 1711 {
1678 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1680 gotsig = 1; 1714 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1716 async_pending = 1;
1683#endif 1717#endif
1684 1718
1685 ev_ref (EV_A); 1719 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1720 ev_io_stop (EV_A_ &pipe_w);
1687 1721
… …
1707#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1708 1742
1709struct ev_loop * 1743struct ev_loop *
1710ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1711{ 1745{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1747
1714 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1716 1750
1717 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1718 return loop; 1752 return EV_A;
1719 1753
1720 return 0; 1754 return 0;
1721} 1755}
1722 1756
1723void 1757void
… …
1827 assert (checkmax >= checkcnt); 1861 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1862 array_verify (EV_A_ (W *)checks, checkcnt);
1829 1863
1830# if 0 1864# if 0
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1833# endif 1867# endif
1834#endif 1868#endif
1835} 1869}
1836#endif 1870#endif
1837 1871
… …
1844#endif 1878#endif
1845{ 1879{
1846 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1847 { 1881 {
1848#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1884#else
1851 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1852#endif 1886#endif
1853 1887
1854 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
… …
1871 1905
1872void 1906void
1873ev_default_destroy (void) 1907ev_default_destroy (void)
1874{ 1908{
1875#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1877#endif 1911#endif
1878 1912
1879 ev_default_loop_ptr = 0; 1913 ev_default_loop_ptr = 0;
1880 1914
1881#ifndef _WIN32 1915#ifndef _WIN32
… …
1888 1922
1889void 1923void
1890ev_default_fork (void) 1924ev_default_fork (void)
1891{ 1925{
1892#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1894#endif 1928#endif
1895 1929
1896 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1897} 1931}
1898 1932
… …
2364inline_size void 2398inline_size void
2365wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
2366{ 2400{
2367 while (*head) 2401 while (*head)
2368 { 2402 {
2369 if (*head == elem) 2403 if (expect_true (*head == elem))
2370 { 2404 {
2371 *head = elem->next; 2405 *head = elem->next;
2372 return; 2406 break;
2373 } 2407 }
2374 2408
2375 head = &(*head)->next; 2409 head = &(*head)->next;
2376 } 2410 }
2377} 2411}
… …
2631#endif 2665#endif
2632 2666
2633void noinline 2667void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2635{ 2669{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2640 return; 2671 return;
2641 2672
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2673 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2674
2675#if EV_MULTIPLICITY
2676 assert (("libev: tried to attach to a signal from two different loops",
2677 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2678
2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2643 2681
2644 EV_FREQUENT_CHECK; 2682 EV_FREQUENT_CHECK;
2645 2683
2646#if EV_USE_SIGNALFD 2684#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2685 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2707 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2708 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2709
2672 signalfd (sigfd, &sigfd_set, 0); 2710 signalfd (sigfd, &sigfd_set, 0);
2673 } 2711 }
2674 else
2675#endif 2712#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688 if (sigfd < 0)/*TODO*/
2689 sigdelset (&prev, w->signum);
2690 sigprocmask (SIG_SETMASK, &prev, 0);
2691#endif
2692 }
2693 2713
2694 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2695 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2696 2716
2697 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2698 { 2721 {
2699#if _WIN32 2722# if _WIN32
2700 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2701#else 2724# else
2702 if (sigfd < 0) /*TODO*/
2703 {
2704 struct sigaction sa = { }; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2705 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2706 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2707 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2731 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2708 sigaction (w->signum, &sa, 0); 2732 sigaction (w->signum, &sa, 0);
2733
2734 sigemptyset (&sa.sa_mask);
2735 sigaddset (&sa.sa_mask, w->signum);
2736 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2737#endif
2709 } 2738 }
2710#endif
2711 }
2712 2739
2713 EV_FREQUENT_CHECK; 2740 EV_FREQUENT_CHECK;
2714} 2741}
2715 2742
2716void noinline 2743void noinline
… …
2724 2751
2725 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2726 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2727 2754
2728 if (!signals [w->signum - 1].head) 2755 if (!signals [w->signum - 1].head)
2756 {
2757#if EV_MULTIPLICITY
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif
2729#if EV_USE_SIGNALFD 2760#if EV_USE_SIGNALFD
2730 if (sigfd >= 0) 2761 if (sigfd >= 0)
2731 { 2762 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2733 sigdelset (&sigfd_set, w->signum); 2764 sigdelset (&sigfd_set, w->signum);
2734 signalfd (sigfd, &sigfd_set, 0); 2765 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2736 /*TODO: maybe unblock signal? */ 2767 /*TODO: maybe unblock signal? */
2737 } 2768 }
2738 else 2769 else
2739#endif 2770#endif
2740 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2741 2773
2742 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2743} 2775}
2744 2776
2745void 2777void
… …
3225embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3226{ 3258{
3227 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3228 3260
3229 { 3261 {
3230 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
3231 3263
3232 while (fdchangecnt) 3264 while (fdchangecnt)
3233 { 3265 {
3234 fd_reify (EV_A); 3266 fd_reify (EV_A);
3235 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3243 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3275 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3244 3276
3245 ev_embed_stop (EV_A_ w); 3277 ev_embed_stop (EV_A_ w);
3246 3278
3247 { 3279 {
3248 struct ev_loop *loop = w->other; 3280 EV_P = w->other;
3249 3281
3250 ev_loop_fork (EV_A); 3282 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 } 3284 }
3253 3285
… …
3267{ 3299{
3268 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
3269 return; 3301 return;
3270 3302
3271 { 3303 {
3272 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
3273 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3305 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3274 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3306 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3275 } 3307 }
3276 3308
3277 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
… …
3389 3421
3390void 3422void
3391ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
3392{ 3424{
3393 w->sent = 1; 3425 w->sent = 1;
3394 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
3395} 3427}
3396#endif 3428#endif
3397 3429
3398/*****************************************************************************/ 3430/*****************************************************************************/
3399 3431
… …
3548 if (types & EV_CHECK) 3580 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; ) 3581 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]); 3582 cb (EV_A_ EV_CHECK, checks [i]);
3551 3583
3552 if (types & EV_SIGNAL) 3584 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i) 3585 for (i = 0; i < EV_NSIG - 1; ++i)
3554 for (wl = signals [i].head; wl; ) 3586 for (wl = signals [i].head; wl; )
3555 { 3587 {
3556 wn = wl->next; 3588 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl); 3589 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn; 3590 wl = wn;

Diff Legend

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