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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC

… …
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 */ 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 */
192#if defined (EV_NSIG) 193#if defined (EV_NSIG)
193/* use what's provided */ 194/* use what's provided */
194#elif defined (NSIG) 195#elif defined (NSIG)
195# define EV_NSIG (NSIG) 196# define EV_NSIG (NSIG)
196#elif defined(_NSIG) 197#elif defined(_NSIG)
… …
210#elif defined (_sys_nsig) 211#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 213#else
213# error "unable to find value for NSIG, please report" 214# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 215/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 64 216# define EV_NSIG 65
216#endif 217#endif
217 218
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
228# else 222# else
229# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
… …
1133/*****************************************************************************/ 1127/*****************************************************************************/
1134 1128
1135/* associate signal watchers to a signal signal */ 1129/* associate signal watchers to a signal signal */
1136typedef struct 1130typedef struct
1137{ 1131{
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1138 WL head; 1135 WL head;
1139 EV_ATOMIC_T gotsig; 1136 EV_ATOMIC_T gotsig;
1140} ANSIG; 1137} ANSIG;
1141 1138
1142static ANSIG *signals; 1139static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig; 1140static EV_ATOMIC_T gotsig;
1146 1141
1147/*****************************************************************************/ 1142/*****************************************************************************/
1148 1143
1149/* used to prepare libev internal fd's */ 1144/* used to prepare libev internal fd's */
… …
1236 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (gotsig && ev_is_default_loop (EV_A))
1237 { 1232 {
1238 int signum; 1233 int signum;
1239 gotsig = 0; 1234 gotsig = 0;
1240 1235
1241 for (signum = signalmax; signum--; ) 1236 for (signum = EV_NSIG - 1; signum--; )
1242 if (signals [signum].gotsig) 1237 if (signals [signum].gotsig)
1243 ev_feed_signal_event (EV_A_ signum + 1); 1238 ev_feed_signal_event (EV_A_ signum + 1);
1244 } 1239 }
1245 1240
1246#if EV_ASYNC_ENABLE 1241#if EV_ASYNC_ENABLE
… …
1263 1258
1264static void 1259static void
1265ev_sighandler (int signum) 1260ev_sighandler (int signum)
1266{ 1261{
1267#if EV_MULTIPLICITY 1262#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1263 EV_P = signals [signum - 1].loop;
1269#endif 1264#endif
1270 1265
1271#if _WIN32 1266#if _WIN32
1272 signal (signum, ev_sighandler); 1267 signal (signum, ev_sighandler);
1273#endif 1268#endif
… …
1283 1278
1284#if EV_MULTIPLICITY 1279#if EV_MULTIPLICITY
1285 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));
1286#endif 1281#endif
1287 1282
1283 if (signum <= 0 || signum > EV_NSIG)
1284 return;
1285
1288 --signum; 1286 --signum;
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return;
1292 1287
1293 signals [signum].gotsig = 0; 1288 signals [signum].gotsig = 0;
1294 1289
1295 for (w = signals [signum].head; w; w = w->next) 1290 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
… …
1298 1293
1299#if EV_USE_SIGNALFD 1294#if EV_USE_SIGNALFD
1300static void 1295static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1296sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1297{
1303 struct signalfd_siginfo si[4], *sip; 1298 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1299
1305 for (;;) 1300 for (;;)
1306 { 1301 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1302 ssize_t res = read (sigfd, si, sizeof (si));
1308 1303
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1537 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1538 have_monotonic = 1;
1544 } 1539 }
1545#endif 1540#endif
1546 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
1547 ev_rt_now = ev_time (); 1553 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1554 mn_now = get_clock ();
1549 now_floor = mn_now; 1555 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1556 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1557#if EV_MINIMAL < 2
… …
1556 timeout_blocktime = 0.; 1562 timeout_blocktime = 0.;
1557 backend = 0; 1563 backend = 0;
1558 backend_fd = -1; 1564 backend_fd = -1;
1559 gotasync = 0; 1565 gotasync = 0;
1560#if EV_USE_INOTIFY 1566#if EV_USE_INOTIFY
1561 fs_fd = -2; 1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1568#endif
1563#if EV_USE_SIGNALFD 1569#if EV_USE_SIGNALFD
1564 sigfd = -2; 1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1565#endif 1571#endif
1566
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV)
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577 1572
1578 if (!(flags & 0x0000ffffU)) 1573 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1574 flags |= ev_recommended_backends ();
1580 1575
1581#if EV_USE_PORT 1576#if EV_USE_PORT
… …
1741#if EV_MULTIPLICITY 1736#if EV_MULTIPLICITY
1742 1737
1743struct ev_loop * 1738struct ev_loop *
1744ev_loop_new (unsigned int flags) 1739ev_loop_new (unsigned int flags)
1745{ 1740{
1746 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));
1747 1742
1748 memset (loop, 0, sizeof (struct ev_loop)); 1743 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1744 loop_init (EV_A_ flags);
1750 1745
1751 if (ev_backend (EV_A)) 1746 if (ev_backend (EV_A))
1752 return loop; 1747 return EV_A;
1753 1748
1754 return 0; 1749 return 0;
1755} 1750}
1756 1751
1757void 1752void
… …
1861 assert (checkmax >= checkcnt); 1856 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1857 array_verify (EV_A_ (W *)checks, checkcnt);
1863 1858
1864# if 0 1859# if 0
1865 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)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig)
1867# endif 1862# endif
1868#endif 1863#endif
1869} 1864}
1870#endif 1865#endif
1871 1866
… …
1878#endif 1873#endif
1879{ 1874{
1880 if (!ev_default_loop_ptr) 1875 if (!ev_default_loop_ptr)
1881 { 1876 {
1882#if EV_MULTIPLICITY 1877#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1878 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1879#else
1885 ev_default_loop_ptr = 1; 1880 ev_default_loop_ptr = 1;
1886#endif 1881#endif
1887 1882
1888 loop_init (EV_A_ flags); 1883 loop_init (EV_A_ flags);
… …
1905 1900
1906void 1901void
1907ev_default_destroy (void) 1902ev_default_destroy (void)
1908{ 1903{
1909#if EV_MULTIPLICITY 1904#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1905 EV_P = ev_default_loop_ptr;
1911#endif 1906#endif
1912 1907
1913 ev_default_loop_ptr = 0; 1908 ev_default_loop_ptr = 0;
1914 1909
1915#ifndef _WIN32 1910#ifndef _WIN32
… …
1922 1917
1923void 1918void
1924ev_default_fork (void) 1919ev_default_fork (void)
1925{ 1920{
1926#if EV_MULTIPLICITY 1921#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 1922 EV_P = ev_default_loop_ptr;
1928#endif 1923#endif
1929 1924
1930 postfork = 1; /* must be in line with ev_loop_fork */ 1925 postfork = 1; /* must be in line with ev_loop_fork */
1931} 1926}
1932 1927
… …
2665#endif 2660#endif
2666 2661
2667void noinline 2662void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2663ev_signal_start (EV_P_ ev_signal *w)
2669{ 2664{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2665 if (expect_false (ev_is_active (w)))
2674 return; 2666 return;
2675 2667
2676 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
2677 2676
2678 EV_FREQUENT_CHECK; 2677 EV_FREQUENT_CHECK;
2679 2678
2680#if EV_USE_SIGNALFD 2679#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2680 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2702 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2703 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2704
2706 signalfd (sigfd, &sigfd_set, 0); 2705 signalfd (sigfd, &sigfd_set, 0);
2707 } 2706 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2707#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2708
2730 ev_start (EV_A_ (W)w, 1); 2709 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2710 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2711
2733 if (!((WL)w)->next) 2712 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2713# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2714 if (sigfd < 0) /*TODO*/
2740# endif 2715# endif
2741 { 2716 {
2717# if _WIN32
2718 signal (w->signum, ev_sighandler);
2719# else
2742 struct sigaction sa = { }; 2720 struct sigaction sa;
2721
2722 evpipe_init (EV_A);
2723
2743 sa.sa_handler = ev_sighandler; 2724 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2725 sigfillset (&sa.sa_mask);
2745 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 */
2746 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
2747 } 2733 }
2748#endif
2749 }
2750 2734
2751 EV_FREQUENT_CHECK; 2735 EV_FREQUENT_CHECK;
2752} 2736}
2753 2737
2754void noinline 2738void noinline
… …
2762 2746
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2747 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2765 2749
2766 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
2767#if EV_USE_SIGNALFD 2755 #if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2756 if (sigfd >= 0)
2769 { 2757 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2771 sigdelset (&sigfd_set, w->signum); 2759 sigdelset (&sigfd_set, w->signum);
2772 signalfd (sigfd, &sigfd_set, 0); 2760 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2774 /*TODO: maybe unblock signal? */ 2762 /*TODO: maybe unblock signal? */
2775 } 2763 }
2776 else 2764 else
2777#endif 2765 #endif
2778 signal (w->signum, SIG_DFL); 2766 signal (w->signum, SIG_DFL);
2767 }
2779 2768
2780 EV_FREQUENT_CHECK; 2769 EV_FREQUENT_CHECK;
2781} 2770}
2782 2771
2783void 2772void
… …
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3253{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3254 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3255
3267 { 3256 {
3268 struct ev_loop *loop = w->other; 3257 EV_P = w->other;
3269 3258
3270 while (fdchangecnt) 3259 while (fdchangecnt)
3271 { 3260 {
3272 fd_reify (EV_A); 3261 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3262 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3281 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));
3282 3271
3283 ev_embed_stop (EV_A_ w); 3272 ev_embed_stop (EV_A_ w);
3284 3273
3285 { 3274 {
3286 struct ev_loop *loop = w->other; 3275 EV_P = w->other;
3287 3276
3288 ev_loop_fork (EV_A); 3277 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3279 }
3291 3280
… …
3305{ 3294{
3306 if (expect_false (ev_is_active (w))) 3295 if (expect_false (ev_is_active (w)))
3307 return; 3296 return;
3308 3297
3309 { 3298 {
3310 struct ev_loop *loop = w->other; 3299 EV_P = w->other;
3311 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 ()));
3312 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);
3313 } 3302 }
3314 3303
3315 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
… …
3586 if (types & EV_CHECK) 3575 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3576 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3577 cb (EV_A_ EV_CHECK, checks [i]);
3589 3578
3590 if (types & EV_SIGNAL) 3579 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3580 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3581 for (wl = signals [i].head; wl; )
3593 { 3582 {
3594 wn = wl->next; 3583 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3584 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3585 wl = wn;

Diff Legend

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