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

Comparing libev/ev.c (file contents):
Revision 1.304 by root, Sun Jul 19 03:12:28 2009 UTC vs.
Revision 1.306 by root, Sun Jul 19 06:35:25 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/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
191#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
194# else 222# else
195# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
… …
1099/*****************************************************************************/ 1127/*****************************************************************************/
1100 1128
1101/* associate signal watchers to a signal signal */ 1129/* associate signal watchers to a signal signal */
1102typedef struct 1130typedef struct
1103{ 1131{
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1104 WL head; 1135 WL head;
1105 EV_ATOMIC_T gotsig; 1136 EV_ATOMIC_T gotsig;
1106} ANSIG; 1137} ANSIG;
1107 1138
1108static ANSIG *signals; 1139static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig; 1140static EV_ATOMIC_T gotsig;
1112 1141
1113/*****************************************************************************/ 1142/*****************************************************************************/
1114 1143
1115/* used to prepare libev internal fd's */ 1144/* used to prepare libev internal fd's */
… …
1202 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (gotsig && ev_is_default_loop (EV_A))
1203 { 1232 {
1204 int signum; 1233 int signum;
1205 gotsig = 0; 1234 gotsig = 0;
1206 1235
1207 for (signum = signalmax; signum--; ) 1236 for (signum = EV_NSIG - 1; signum--; )
1208 if (signals [signum].gotsig) 1237 if (signals [signum].gotsig)
1209 ev_feed_signal_event (EV_A_ signum + 1); 1238 ev_feed_signal_event (EV_A_ signum + 1);
1210 } 1239 }
1211 1240
1212#if EV_ASYNC_ENABLE 1241#if EV_ASYNC_ENABLE
… …
1229 1258
1230static void 1259static void
1231ev_sighandler (int signum) 1260ev_sighandler (int signum)
1232{ 1261{
1233#if EV_MULTIPLICITY 1262#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1263 EV_P = signals [signum - 1].loop;
1235#endif 1264#endif
1236 1265
1237#if _WIN32 1266#if _WIN32
1238 signal (signum, ev_sighandler); 1267 signal (signum, ev_sighandler);
1239#endif 1268#endif
… …
1249 1278
1250#if EV_MULTIPLICITY 1279#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1252#endif 1281#endif
1253 1282
1283 if (signum <= 0 || signum > EV_NSIG)
1284 return;
1285
1254 --signum; 1286 --signum;
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return;
1258 1287
1259 signals [signum].gotsig = 0; 1288 signals [signum].gotsig = 0;
1260 1289
1261 for (w = signals [signum].head; w; w = w->next) 1290 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
… …
1264 1293
1265#if EV_USE_SIGNALFD 1294#if EV_USE_SIGNALFD
1266static void 1295static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1296sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1297{
1269 struct signalfd_siginfo si[4], *sip; 1298 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1299
1271 for (;;) 1300 for (;;)
1272 { 1301 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1302 ssize_t res = read (sigfd, si, sizeof (si));
1274 1303
… …
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1537 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1538 have_monotonic = 1;
1510 } 1539 }
1511#endif 1540#endif
1512 1541
1542 /* pid check not overridable via env */
1543#ifndef _WIN32
1544 if (flags & EVFLAG_FORKCHECK)
1545 curpid = getpid ();
1546#endif
1547
1548 if (!(flags & EVFLAG_NOENV)
1549 && !enable_secure ()
1550 && getenv ("LIBEV_FLAGS"))
1551 flags = atoi (getenv ("LIBEV_FLAGS"));
1552
1513 ev_rt_now = ev_time (); 1553 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1554 mn_now = get_clock ();
1515 now_floor = mn_now; 1555 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1556 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1557#if EV_MINIMAL < 2
… …
1522 timeout_blocktime = 0.; 1562 timeout_blocktime = 0.;
1523 backend = 0; 1563 backend = 0;
1524 backend_fd = -1; 1564 backend_fd = -1;
1525 gotasync = 0; 1565 gotasync = 0;
1526#if EV_USE_INOTIFY 1566#if EV_USE_INOTIFY
1527 fs_fd = -2; 1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1568#endif
1529#if EV_USE_SIGNALFD 1569#if EV_USE_SIGNALFD
1530 sigfd = -2; 1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1531#endif 1571#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 1572
1544 if (!(flags & 0x0000ffffU)) 1573 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1574 flags |= ev_recommended_backends ();
1546 1575
1547#if EV_USE_PORT 1576#if EV_USE_PORT
… …
1630#if EV_IDLE_ENABLE 1659#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1660 array_free (idle, [i]);
1632#endif 1661#endif
1633 } 1662 }
1634 1663
1635 ev_free (anfds); anfdmax = 0; 1664 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1665
1637 /* have to use the microsoft-never-gets-it-right macro */ 1666 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1667 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1668 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1669 array_free (timer, EMPTY);
… …
1707#if EV_MULTIPLICITY 1736#if EV_MULTIPLICITY
1708 1737
1709struct ev_loop * 1738struct ev_loop *
1710ev_loop_new (unsigned int flags) 1739ev_loop_new (unsigned int flags)
1711{ 1740{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1741 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1742
1714 memset (loop, 0, sizeof (struct ev_loop)); 1743 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1744 loop_init (EV_A_ flags);
1716 1745
1717 if (ev_backend (EV_A)) 1746 if (ev_backend (EV_A))
1718 return loop; 1747 return EV_A;
1719 1748
1720 return 0; 1749 return 0;
1721} 1750}
1722 1751
1723void 1752void
… …
1827 assert (checkmax >= checkcnt); 1856 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1857 array_verify (EV_A_ (W *)checks, checkcnt);
1829 1858
1830# if 0 1859# if 0
1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1860 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) 1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig)
1833# endif 1862# endif
1834#endif 1863#endif
1835} 1864}
1836#endif 1865#endif
1837 1866
… …
1844#endif 1873#endif
1845{ 1874{
1846 if (!ev_default_loop_ptr) 1875 if (!ev_default_loop_ptr)
1847 { 1876 {
1848#if EV_MULTIPLICITY 1877#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1878 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1879#else
1851 ev_default_loop_ptr = 1; 1880 ev_default_loop_ptr = 1;
1852#endif 1881#endif
1853 1882
1854 loop_init (EV_A_ flags); 1883 loop_init (EV_A_ flags);
… …
1871 1900
1872void 1901void
1873ev_default_destroy (void) 1902ev_default_destroy (void)
1874{ 1903{
1875#if EV_MULTIPLICITY 1904#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1905 EV_P = ev_default_loop_ptr;
1877#endif 1906#endif
1878 1907
1879 ev_default_loop_ptr = 0; 1908 ev_default_loop_ptr = 0;
1880 1909
1881#ifndef _WIN32 1910#ifndef _WIN32
… …
1888 1917
1889void 1918void
1890ev_default_fork (void) 1919ev_default_fork (void)
1891{ 1920{
1892#if EV_MULTIPLICITY 1921#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 1922 EV_P = ev_default_loop_ptr;
1894#endif 1923#endif
1895 1924
1896 postfork = 1; /* must be in line with ev_loop_fork */ 1925 postfork = 1; /* must be in line with ev_loop_fork */
1897} 1926}
1898 1927
… …
2631#endif 2660#endif
2632 2661
2633void noinline 2662void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2663ev_signal_start (EV_P_ ev_signal *w)
2635{ 2664{
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))) 2665 if (expect_false (ev_is_active (w)))
2640 return; 2666 return;
2641 2667
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669
2670#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673
2674 signals [w->signum - 1].loop = EV_A;
2675#endif
2643 2676
2644 EV_FREQUENT_CHECK; 2677 EV_FREQUENT_CHECK;
2645 2678
2646#if EV_USE_SIGNALFD 2679#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2680 if (sigfd == -2)
… …
2669 sigaddset (&sigfd_set, w->signum); 2702 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2703 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2704
2672 signalfd (sigfd, &sigfd_set, 0); 2705 signalfd (sigfd, &sigfd_set, 0);
2673 } 2706 }
2674 else
2675#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 EV_USE_SIGNALFD
2689 if (sigfd < 0)/*TODO*/
2690# endif 2707#endif
2691 sigdelset (&prev, w->signum);
2692 sigprocmask (SIG_SETMASK, &prev, 0);
2693#endif
2694 }
2695 2708
2696 ev_start (EV_A_ (W)w, 1); 2709 ev_start (EV_A_ (W)w, 1);
2697 wlist_add (&signals [w->signum - 1].head, (WL)w); 2710 wlist_add (&signals [w->signum - 1].head, (WL)w);
2698 2711
2699 if (!((WL)w)->next) 2712 if (!((WL)w)->next)
2700 {
2701#if _WIN32
2702 signal (w->signum, ev_sighandler);
2703#else
2704# if EV_USE_SIGNALFD 2713# if EV_USE_SIGNALFD
2705 if (sigfd < 0) /*TODO*/ 2714 if (sigfd < 0) /*TODO*/
2706# endif 2715# endif
2707 { 2716 {
2717# if _WIN32
2718 signal (w->signum, ev_sighandler);
2719# else
2708 struct sigaction sa = { }; 2720 struct sigaction sa;
2721
2722 evpipe_init (EV_A);
2723
2709 sa.sa_handler = ev_sighandler; 2724 sa.sa_handler = ev_sighandler;
2710 sigfillset (&sa.sa_mask); 2725 sigfillset (&sa.sa_mask);
2711 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2726 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2712 sigaction (w->signum, &sa, 0); 2727 sigaction (w->signum, &sa, 0);
2728
2729 sigemptyset (&sa.sa_mask);
2730 sigaddset (&sa.sa_mask, w->signum);
2731 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2732#endif
2713 } 2733 }
2714#endif
2715 }
2716 2734
2717 EV_FREQUENT_CHECK; 2735 EV_FREQUENT_CHECK;
2718} 2736}
2719 2737
2720void noinline 2738void noinline
… …
2728 2746
2729 wlist_del (&signals [w->signum - 1].head, (WL)w); 2747 wlist_del (&signals [w->signum - 1].head, (WL)w);
2730 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2731 2749
2732 if (!signals [w->signum - 1].head) 2750 if (!signals [w->signum - 1].head)
2751 {
2752 #if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif
2733#if EV_USE_SIGNALFD 2755 #if EV_USE_SIGNALFD
2734 if (sigfd >= 0) 2756 if (sigfd >= 0)
2735 { 2757 {
2736 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2737 sigdelset (&sigfd_set, w->signum); 2759 sigdelset (&sigfd_set, w->signum);
2738 signalfd (sigfd, &sigfd_set, 0); 2760 signalfd (sigfd, &sigfd_set, 0);
2739 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2740 /*TODO: maybe unblock signal? */ 2762 /*TODO: maybe unblock signal? */
2741 } 2763 }
2742 else 2764 else
2743#endif 2765 #endif
2744 signal (w->signum, SIG_DFL); 2766 signal (w->signum, SIG_DFL);
2767 }
2745 2768
2746 EV_FREQUENT_CHECK; 2769 EV_FREQUENT_CHECK;
2747} 2770}
2748 2771
2749void 2772void
… …
3229embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3230{ 3253{
3231 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3254 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3232 3255
3233 { 3256 {
3234 struct ev_loop *loop = w->other; 3257 EV_P = w->other;
3235 3258
3236 while (fdchangecnt) 3259 while (fdchangecnt)
3237 { 3260 {
3238 fd_reify (EV_A); 3261 fd_reify (EV_A);
3239 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3262 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3247 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3270 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3248 3271
3249 ev_embed_stop (EV_A_ w); 3272 ev_embed_stop (EV_A_ w);
3250 3273
3251 { 3274 {
3252 struct ev_loop *loop = w->other; 3275 EV_P = w->other;
3253 3276
3254 ev_loop_fork (EV_A); 3277 ev_loop_fork (EV_A);
3255 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3256 } 3279 }
3257 3280
… …
3271{ 3294{
3272 if (expect_false (ev_is_active (w))) 3295 if (expect_false (ev_is_active (w)))
3273 return; 3296 return;
3274 3297
3275 { 3298 {
3276 struct ev_loop *loop = w->other; 3299 EV_P = w->other;
3277 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3300 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3278 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3301 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3279 } 3302 }
3280 3303
3281 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
… …
3552 if (types & EV_CHECK) 3575 if (types & EV_CHECK)
3553 for (i = checkcnt; i--; ) 3576 for (i = checkcnt; i--; )
3554 cb (EV_A_ EV_CHECK, checks [i]); 3577 cb (EV_A_ EV_CHECK, checks [i]);
3555 3578
3556 if (types & EV_SIGNAL) 3579 if (types & EV_SIGNAL)
3557 for (i = 0; i < signalmax; ++i) 3580 for (i = 0; i < EV_NSIG - 1; ++i)
3558 for (wl = signals [i].head; wl; ) 3581 for (wl = signals [i].head; wl; )
3559 { 3582 {
3560 wn = wl->next; 3583 wn = wl->next;
3561 cb (EV_A_ EV_SIGNAL, wl); 3584 cb (EV_A_ EV_SIGNAL, wl);
3562 wl = wn; 3585 wl = wn;

Diff Legend

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