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

Comparing libev/ev.c (file contents):
Revision 1.442 by root, Thu May 31 15:47:59 2012 UTC vs.
Revision 1.449 by root, Sun Sep 23 21:21:58 2012 UTC

… …
1191} 1191}
1192 1192
1193static void * 1193static void *
1194ev_realloc_emul (void *ptr, long size) EV_THROW 1194ev_realloc_emul (void *ptr, long size) EV_THROW
1195{ 1195{
1196#if __GLIBC__
1197 return realloc (ptr, size);
1198#else
1199 /* some systems, notably openbsd and darwin, fail to properly 1196 /* some systems, notably openbsd and darwin, fail to properly
1200 * implement realloc (x, 0) (as required by both ansi c-89 and 1197 * implement realloc (x, 0) (as required by both ansi c-89 and
1201 * the single unix specification, so work around them here. 1198 * the single unix specification, so work around them here.
1199 * recently, also (at least) fedora and debian started breaking it,
1200 * despite documenting it otherwise.
1202 */ 1201 */
1203 1202
1204 if (size) 1203 if (size)
1205 return realloc (ptr, size); 1204 return realloc (ptr, size);
1206 1205
1207 free (ptr); 1206 free (ptr);
1208 return 0; 1207 return 0;
1209#endif
1210} 1208}
1211 1209
1212static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul; 1210static void *(*alloc)(void *ptr, long size) EV_THROW = ev_realloc_emul;
1213 1211
1214void ecb_cold 1212void ecb_cold
… …
1869static void noinline ecb_cold 1867static void noinline ecb_cold
1870evpipe_init (EV_P) 1868evpipe_init (EV_P)
1871{ 1869{
1872 if (!ev_is_active (&pipe_w)) 1870 if (!ev_is_active (&pipe_w))
1873 { 1871 {
1872 int fds [2];
1873
1874# if EV_USE_EVENTFD 1874# if EV_USE_EVENTFD
1875 fds [0] = -1;
1875 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1876 fds [1] = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1876 if (evfd < 0 && errno == EINVAL) 1877 if (fds [1] < 0 && errno == EINVAL)
1877 evfd = eventfd (0, 0); 1878 fds [1] = eventfd (0, 0);
1878 1879
1879 if (evfd >= 0) 1880 if (fds [1] < 0)
1880 {
1881 evpipe [0] = -1;
1882 fd_intern (evfd); /* doing it twice doesn't hurt */
1883 ev_io_set (&pipe_w, evfd, EV_READ);
1884 }
1885 else
1886# endif 1881# endif
1887 { 1882 {
1888 while (pipe (evpipe)) 1883 while (pipe (fds))
1889 ev_syserr ("(libev) error creating signal/async pipe"); 1884 ev_syserr ("(libev) error creating signal/async pipe");
1890 1885
1891 fd_intern (evpipe [0]); 1886 fd_intern (fds [0]);
1892 fd_intern (evpipe [1]);
1893 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1894 } 1887 }
1895 1888
1889 fd_intern (fds [1]);
1890
1891 evpipe [0] = fds [0];
1892
1893 if (evpipe [1] < 0)
1894 evpipe [1] = fds [1]; /* first call, set write fd */
1895 else
1896 {
1897 /* on subsequent calls, do not change evpipe [1] */
1898 /* so that evpipe_write can always rely on its value. */
1899 /* this branch does not do anything sensible on windows, */
1900 /* so must not be executed on windows */
1901
1902 dup2 (fds [1], evpipe [1]);
1903 close (fds [1]);
1904 }
1905
1906 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
1896 ev_io_start (EV_A_ &pipe_w); 1907 ev_io_start (EV_A_ &pipe_w);
1897 ev_unref (EV_A); /* watcher should not keep loop alive */ 1908 ev_unref (EV_A); /* watcher should not keep loop alive */
1898 } 1909 }
1899} 1910}
1900 1911
… …
1921 ECB_MEMORY_FENCE_RELEASE; 1932 ECB_MEMORY_FENCE_RELEASE;
1922 1933
1923 old_errno = errno; /* save errno because write will clobber it */ 1934 old_errno = errno; /* save errno because write will clobber it */
1924 1935
1925#if EV_USE_EVENTFD 1936#if EV_USE_EVENTFD
1926 if (evfd >= 0) 1937 if (evpipe [0] < 0)
1927 { 1938 {
1928 uint64_t counter = 1; 1939 uint64_t counter = 1;
1929 write (evfd, &counter, sizeof (uint64_t)); 1940 write (evpipe [1], &counter, sizeof (uint64_t));
1930 } 1941 }
1931 else 1942 else
1932#endif 1943#endif
1933 { 1944 {
1934#ifdef _WIN32 1945#ifdef _WIN32
… …
1954 int i; 1965 int i;
1955 1966
1956 if (revents & EV_READ) 1967 if (revents & EV_READ)
1957 { 1968 {
1958#if EV_USE_EVENTFD 1969#if EV_USE_EVENTFD
1959 if (evfd >= 0) 1970 if (evpipe [0] < 0)
1960 { 1971 {
1961 uint64_t counter; 1972 uint64_t counter;
1962 read (evfd, &counter, sizeof (uint64_t)); 1973 read (evpipe [1], &counter, sizeof (uint64_t));
1963 } 1974 }
1964 else 1975 else
1965#endif 1976#endif
1966 { 1977 {
1967 char dummy[4]; 1978 char dummy[4];
… …
2017 2028
2018void 2029void
2019ev_feed_signal (int signum) EV_THROW 2030ev_feed_signal (int signum) EV_THROW
2020{ 2031{
2021#if EV_MULTIPLICITY 2032#if EV_MULTIPLICITY
2033 ECB_MEMORY_FENCE_ACQUIRE;
2022 EV_P = signals [signum - 1].loop; 2034 EV_P = signals [signum - 1].loop;
2023 2035
2024 if (!EV_A) 2036 if (!EV_A)
2025 return; 2037 return;
2026#endif 2038#endif
2027 2039
2028 if (!ev_active (&pipe_w))
2029 return;
2030
2031 signals [signum - 1].pending = 1; 2040 signals [signum - 1].pending = 1;
2032 evpipe_write (EV_A_ &sig_pending); 2041 evpipe_write (EV_A_ &sig_pending);
2033} 2042}
2034 2043
2035static void 2044static void
… …
2045void noinline 2054void noinline
2046ev_feed_signal_event (EV_P_ int signum) EV_THROW 2055ev_feed_signal_event (EV_P_ int signum) EV_THROW
2047{ 2056{
2048 WL w; 2057 WL w;
2049 2058
2050 if (expect_false (signum <= 0 || signum > EV_NSIG)) 2059 if (expect_false (signum <= 0 || signum >= EV_NSIG))
2051 return; 2060 return;
2052 2061
2053 --signum; 2062 --signum;
2054 2063
2055#if EV_MULTIPLICITY 2064#if EV_MULTIPLICITY
… …
2353#if EV_ASYNC_ENABLE 2362#if EV_ASYNC_ENABLE
2354 async_pending = 0; 2363 async_pending = 0;
2355#endif 2364#endif
2356 pipe_write_skipped = 0; 2365 pipe_write_skipped = 0;
2357 pipe_write_wanted = 0; 2366 pipe_write_wanted = 0;
2367 evpipe [0] = -1;
2368 evpipe [1] = -1;
2358#if EV_USE_INOTIFY 2369#if EV_USE_INOTIFY
2359 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 2370 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
2360#endif 2371#endif
2361#if EV_USE_SIGNALFD 2372#if EV_USE_SIGNALFD
2362 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 2373 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
… …
2425 if (ev_is_active (&pipe_w)) 2436 if (ev_is_active (&pipe_w))
2426 { 2437 {
2427 /*ev_ref (EV_A);*/ 2438 /*ev_ref (EV_A);*/
2428 /*ev_io_stop (EV_A_ &pipe_w);*/ 2439 /*ev_io_stop (EV_A_ &pipe_w);*/
2429 2440
2430#if EV_USE_EVENTFD
2431 if (evfd >= 0)
2432 close (evfd);
2433#endif
2434
2435 if (evpipe [0] >= 0)
2436 {
2437 EV_WIN32_CLOSE_FD (evpipe [0]); 2441 if (evpipe [0] >= 0) EV_WIN32_CLOSE_FD (evpipe [0]);
2438 EV_WIN32_CLOSE_FD (evpipe [1]); 2442 if (evpipe [1] >= 0) EV_WIN32_CLOSE_FD (evpipe [1]);
2439 }
2440 } 2443 }
2441 2444
2442#if EV_USE_SIGNALFD 2445#if EV_USE_SIGNALFD
2443 if (ev_is_active (&sigfd_w)) 2446 if (ev_is_active (&sigfd_w))
2444 close (sigfd); 2447 close (sigfd);
… …
2530#endif 2533#endif
2531#if EV_USE_INOTIFY 2534#if EV_USE_INOTIFY
2532 infy_fork (EV_A); 2535 infy_fork (EV_A);
2533#endif 2536#endif
2534 2537
2538#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2535 if (ev_is_active (&pipe_w)) 2539 if (ev_is_active (&pipe_w))
2536 { 2540 {
2537 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 2541 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
2538 2542
2539 ev_ref (EV_A); 2543 ev_ref (EV_A);
2540 ev_io_stop (EV_A_ &pipe_w); 2544 ev_io_stop (EV_A_ &pipe_w);
2541 2545
2542#if EV_USE_EVENTFD
2543 if (evfd >= 0)
2544 close (evfd);
2545#endif
2546
2547 if (evpipe [0] >= 0) 2546 if (evpipe [0] >= 0)
2548 {
2549 EV_WIN32_CLOSE_FD (evpipe [0]); 2547 EV_WIN32_CLOSE_FD (evpipe [0]);
2550 EV_WIN32_CLOSE_FD (evpipe [1]);
2551 }
2552 2548
2553#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
2554 evpipe_init (EV_A); 2549 evpipe_init (EV_A);
2555 /* now iterate over everything, in case we missed something */ 2550 /* iterate over everything, in case we missed something before */
2556 pipecb (EV_A_ &pipe_w, EV_READ); 2551 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2557#endif
2558 } 2552 }
2553#endif
2559 2554
2560 postfork = 0; 2555 postfork = 0;
2561} 2556}
2562 2557
2563#if EV_MULTIPLICITY 2558#if EV_MULTIPLICITY
… …
2762} 2757}
2763 2758
2764void noinline 2759void noinline
2765ev_invoke_pending (EV_P) 2760ev_invoke_pending (EV_P)
2766{ 2761{
2767 for (pendingpri = NUMPRI; pendingpri--; ) /* pendingpri is modified during the loop */ 2762 pendingpri = NUMPRI;
2763
2764 while (pendingpri) /* pendingpri possibly gets modified in the inner loop */
2765 {
2766 --pendingpri;
2767
2768 while (pendingcnt [pendingpri]) 2768 while (pendingcnt [pendingpri])
2769 { 2769 {
2770 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri]; 2770 ANPENDING *p = pendings [pendingpri] + --pendingcnt [pendingpri];
2771 2771
2772 p->w->pending = 0; 2772 p->w->pending = 0;
2773 EV_CB_INVOKE (p->w, p->events); 2773 EV_CB_INVOKE (p->w, p->events);
2774 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2775 } 2775 }
2776 }
2776} 2777}
2777 2778
2778#if EV_IDLE_ENABLE 2779#if EV_IDLE_ENABLE
2779/* make idle watchers pending. this handles the "call-idle */ 2780/* make idle watchers pending. this handles the "call-idle */
2780/* only when higher priorities are idle" logic */ 2781/* only when higher priorities are idle" logic */
… …
3526#if EV_MULTIPLICITY 3527#if EV_MULTIPLICITY
3527 assert (("libev: a signal must not be attached to two different loops", 3528 assert (("libev: a signal must not be attached to two different loops",
3528 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 3529 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
3529 3530
3530 signals [w->signum - 1].loop = EV_A; 3531 signals [w->signum - 1].loop = EV_A;
3532 ECB_MEMORY_FENCE_RELEASE;
3531#endif 3533#endif
3532 3534
3533 EV_FREQUENT_CHECK; 3535 EV_FREQUENT_CHECK;
3534 3536
3535#if EV_USE_SIGNALFD 3537#if EV_USE_SIGNALFD

Diff Legend

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