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.316 by root, Fri Sep 18 21:02:12 2009 UTC

… …
210#elif defined (_sys_nsig) 210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 212#else
213# error "unable to find value for NSIG, please report" 213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 64 215# define EV_NSIG 65
216#endif 216#endif
217 217
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 218#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
228# else 221# else
229# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
309# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
310# endif 303# endif
311#endif 304#endif
312 305
313#ifndef EV_USE_SIGNALFD 306#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 308# define EV_USE_SIGNALFD 1
316# else 309# else
317# define EV_USE_SIGNALFD 0 310# define EV_USE_SIGNALFD 0
318# endif 311# endif
319#endif 312#endif
… …
393# include <stdint.h> 386# include <stdint.h>
394# ifndef EFD_NONBLOCK 387# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 388# define EFD_NONBLOCK O_NONBLOCK
396# endif 389# endif
397# ifndef EFD_CLOEXEC 390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
399# endif 396# endif
400# ifdef __cplusplus 397# ifdef __cplusplus
401extern "C" { 398extern "C" {
402# endif 399# endif
403int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
… …
405} 402}
406# endif 403# endif
407#endif 404#endif
408 405
409#if EV_USE_SIGNALFD 406#if EV_USE_SIGNALFD
410# include <sys/signalfd.h> 407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411#endif 411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
412 434
413/**/ 435/**/
414 436
415#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
428 */ 450 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 452
431#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
432#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
433/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
434 455
435#if __GNUC__ >= 4 456#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
438#else 459#else
… …
477static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 498static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
478#endif 499#endif
479 500
480#if EV_USE_MONOTONIC 501#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
503#endif
504
505#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif
508#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
510#endif
511#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd)
482#endif 513#endif
483 514
484#ifdef _WIN32 515#ifdef _WIN32
485# include "ev_win32.c" 516# include "ev_win32.c"
486#endif 517#endif
… …
879 910
880#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
881 if (events) 912 if (events)
882 { 913 {
883 unsigned long arg; 914 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
886 #else
887 anfd->handle = _get_osfhandle (fd);
888 #endif
889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 917 }
891#endif 918#endif
892 919
893 { 920 {
… …
964 991
965 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 993 if (anfds [fd].events)
967 { 994 {
968 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
969 return; 996 break;
970 } 997 }
971} 998}
972 999
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1000/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1001static void noinline
… …
1064 1091
1065 for (;;) 1092 for (;;)
1066 { 1093 {
1067 int c = k << 1; 1094 int c = k << 1;
1068 1095
1069 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
1070 break; 1097 break;
1071 1098
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1099 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1100 ? 1 : 0;
1074 1101
… …
1110 1137
1111/* move an element suitably so it is in a correct place */ 1138/* move an element suitably so it is in a correct place */
1112inline_size void 1139inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
1114{ 1141{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1142 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1143 upheap (heap, k);
1117 else 1144 else
1118 downheap (heap, N, k); 1145 downheap (heap, N, k);
1119} 1146}
1120 1147
… …
1133/*****************************************************************************/ 1160/*****************************************************************************/
1134 1161
1135/* associate signal watchers to a signal signal */ 1162/* associate signal watchers to a signal signal */
1136typedef struct 1163typedef struct
1137{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
1138 WL head; 1169 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1170} ANSIG;
1141 1171
1142static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1173
1147/*****************************************************************************/ 1174/*****************************************************************************/
1148 1175
1149/* used to prepare libev internal fd's */ 1176/* used to prepare libev internal fd's */
1150/* this is not fork-safe */ 1177/* this is not fork-safe */
… …
1218/* called whenever the libev signal pipe */ 1245/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1246/* got some events (signal, async) */
1220static void 1247static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1249{
1250 int i;
1251
1223#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1253 if (evfd >= 0)
1225 { 1254 {
1226 uint64_t counter; 1255 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
… …
1231 { 1260 {
1232 char dummy; 1261 char dummy;
1233 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1234 } 1263 }
1235 1264
1236 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1237 { 1266 {
1238 int signum; 1267 sig_pending = 0;
1239 gotsig = 0;
1240 1268
1241 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1272 }
1245 1273
1246#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1247 if (gotasync) 1275 if (async_pending)
1248 { 1276 {
1249 int i; 1277 async_pending = 0;
1250 gotasync = 0;
1251 1278
1252 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1254 { 1281 {
1255 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
… …
1263 1290
1264static void 1291static void
1265ev_sighandler (int signum) 1292ev_sighandler (int signum)
1266{ 1293{
1267#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1269#endif 1296#endif
1270 1297
1271#if _WIN32 1298#if _WIN32
1272 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1273#endif 1300#endif
1274 1301
1275 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1277} 1304}
1278 1305
1279void noinline 1306void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1281{ 1308{
1282 WL w; 1309 WL w;
1283 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1284#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1317 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1319
1288 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1321 return;
1322#endif
1292 1323
1293 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1294 1325
1295 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1328}
1298 1329
1299#if EV_USE_SIGNALFD 1330#if EV_USE_SIGNALFD
1300static void 1331static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1332sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1333{
1303 struct signalfd_siginfo si[4], *sip; 1334 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1335
1305 for (;;) 1336 for (;;)
1306 { 1337 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1338 ssize_t res = read (sigfd, si, sizeof (si));
1308 1339
… …
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1574 have_monotonic = 1;
1544 } 1575 }
1545#endif 1576#endif
1546 1577
1578 /* pid check not overridable via env */
1579#ifndef _WIN32
1580 if (flags & EVFLAG_FORKCHECK)
1581 curpid = getpid ();
1582#endif
1583
1584 if (!(flags & EVFLAG_NOENV)
1585 && !enable_secure ()
1586 && getenv ("LIBEV_FLAGS"))
1587 flags = atoi (getenv ("LIBEV_FLAGS"));
1588
1547 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1590 mn_now = get_clock ();
1549 now_floor = mn_now; 1591 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1592 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1593#if EV_MINIMAL < 2
… …
1554 1596
1555 io_blocktime = 0.; 1597 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1557 backend = 0; 1599 backend = 0;
1558 backend_fd = -1; 1600 backend_fd = -1;
1559 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1560#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1561 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1607#endif
1563#if EV_USE_SIGNALFD 1608#if EV_USE_SIGNALFD
1564 sigfd = -2; 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1565#endif 1610#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 1611
1578 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1580 1614
1581#if EV_USE_PORT 1615#if EV_USE_PORT
… …
1617 close (evfd); 1651 close (evfd);
1618#endif 1652#endif
1619 1653
1620 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1621 { 1655 {
1622 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1658 }
1625 } 1659 }
1626 1660
1627#if EV_USE_SIGNALFD 1661#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1662 if (ev_is_active (&sigfd_w))
… …
1709 1743
1710 if (ev_is_active (&pipe_w)) 1744 if (ev_is_active (&pipe_w))
1711 { 1745 {
1712 /* this "locks" the handlers against writing to the pipe */ 1746 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1747 /* while we modify the fd vars */
1714 gotsig = 1; 1748 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1749#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1750 async_pending = 1;
1717#endif 1751#endif
1718 1752
1719 ev_ref (EV_A); 1753 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1754 ev_io_stop (EV_A_ &pipe_w);
1721 1755
… …
1724 close (evfd); 1758 close (evfd);
1725#endif 1759#endif
1726 1760
1727 if (evpipe [0] >= 0) 1761 if (evpipe [0] >= 0)
1728 { 1762 {
1729 close (evpipe [0]); 1763 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1764 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1765 }
1732 1766
1733 evpipe_init (EV_A); 1767 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1768 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1769 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1741#if EV_MULTIPLICITY 1775#if EV_MULTIPLICITY
1742 1776
1743struct ev_loop * 1777struct ev_loop *
1744ev_loop_new (unsigned int flags) 1778ev_loop_new (unsigned int flags)
1745{ 1779{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1780 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1781
1748 memset (loop, 0, sizeof (struct ev_loop)); 1782 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1783 loop_init (EV_A_ flags);
1750 1784
1751 if (ev_backend (EV_A)) 1785 if (ev_backend (EV_A))
1752 return loop; 1786 return EV_A;
1753 1787
1754 return 0; 1788 return 0;
1755} 1789}
1756 1790
1757void 1791void
… …
1861 assert (checkmax >= checkcnt); 1895 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1896 array_verify (EV_A_ (W *)checks, checkcnt);
1863 1897
1864# if 0 1898# if 0
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1899 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) 1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1867# endif 1901# endif
1868#endif 1902#endif
1869} 1903}
1870#endif 1904#endif
1871 1905
… …
1878#endif 1912#endif
1879{ 1913{
1880 if (!ev_default_loop_ptr) 1914 if (!ev_default_loop_ptr)
1881 { 1915 {
1882#if EV_MULTIPLICITY 1916#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1917 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1918#else
1885 ev_default_loop_ptr = 1; 1919 ev_default_loop_ptr = 1;
1886#endif 1920#endif
1887 1921
1888 loop_init (EV_A_ flags); 1922 loop_init (EV_A_ flags);
… …
1905 1939
1906void 1940void
1907ev_default_destroy (void) 1941ev_default_destroy (void)
1908{ 1942{
1909#if EV_MULTIPLICITY 1943#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1944 EV_P = ev_default_loop_ptr;
1911#endif 1945#endif
1912 1946
1913 ev_default_loop_ptr = 0; 1947 ev_default_loop_ptr = 0;
1914 1948
1915#ifndef _WIN32 1949#ifndef _WIN32
… …
1922 1956
1923void 1957void
1924ev_default_fork (void) 1958ev_default_fork (void)
1925{ 1959{
1926#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 1961 EV_P = ev_default_loop_ptr;
1928#endif 1962#endif
1929 1963
1930 postfork = 1; /* must be in line with ev_loop_fork */ 1964 postfork = 1; /* must be in line with ev_loop_fork */
1931} 1965}
1932 1966
… …
2398inline_size void 2432inline_size void
2399wlist_del (WL *head, WL elem) 2433wlist_del (WL *head, WL elem)
2400{ 2434{
2401 while (*head) 2435 while (*head)
2402 { 2436 {
2403 if (*head == elem) 2437 if (expect_true (*head == elem))
2404 { 2438 {
2405 *head = elem->next; 2439 *head = elem->next;
2406 return; 2440 break;
2407 } 2441 }
2408 2442
2409 head = &(*head)->next; 2443 head = &(*head)->next;
2410 } 2444 }
2411} 2445}
… …
2665#endif 2699#endif
2666 2700
2667void noinline 2701void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2702ev_signal_start (EV_P_ ev_signal *w)
2669{ 2703{
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))) 2704 if (expect_false (ev_is_active (w)))
2674 return; 2705 return;
2675 2706
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2707 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2708
2709#if EV_MULTIPLICITY
2710 assert (("libev: a signal must not be attached to two different loops",
2711 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2712
2713 signals [w->signum - 1].loop = EV_A;
2714#endif
2677 2715
2678 EV_FREQUENT_CHECK; 2716 EV_FREQUENT_CHECK;
2679 2717
2680#if EV_USE_SIGNALFD 2718#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2719 if (sigfd == -2)
… …
2703 sigaddset (&sigfd_set, w->signum); 2741 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2742 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2743
2706 signalfd (sigfd, &sigfd_set, 0); 2744 signalfd (sigfd, &sigfd_set, 0);
2707 } 2745 }
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 2746#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2747
2730 ev_start (EV_A_ (W)w, 1); 2748 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2749 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2750
2733 if (!((WL)w)->next) 2751 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2752# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2753 if (sigfd < 0) /*TODO*/
2740# endif 2754# endif
2741 { 2755 {
2756# if _WIN32
2757 signal (w->signum, ev_sighandler);
2758# else
2742 struct sigaction sa = { }; 2759 struct sigaction sa;
2760
2761 evpipe_init (EV_A);
2762
2743 sa.sa_handler = ev_sighandler; 2763 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2764 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2765 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2766 sigaction (w->signum, &sa, 0);
2767
2768 sigemptyset (&sa.sa_mask);
2769 sigaddset (&sa.sa_mask, w->signum);
2770 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2771#endif
2747 } 2772 }
2748#endif
2749 }
2750 2773
2751 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2752} 2775}
2753 2776
2754void noinline 2777void noinline
… …
2762 2785
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2786 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2787 ev_stop (EV_A_ (W)w);
2765 2788
2766 if (!signals [w->signum - 1].head) 2789 if (!signals [w->signum - 1].head)
2790 {
2791#if EV_MULTIPLICITY
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif
2767#if EV_USE_SIGNALFD 2794#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2795 if (sigfd >= 0)
2769 { 2796 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2771 sigdelset (&sigfd_set, w->signum); 2798 sigdelset (&sigfd_set, w->signum);
2772 signalfd (sigfd, &sigfd_set, 0); 2799 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2774 /*TODO: maybe unblock signal? */ 2801 /*TODO: maybe unblock signal? */
2775 } 2802 }
2776 else 2803 else
2777#endif 2804#endif
2778 signal (w->signum, SIG_DFL); 2805 signal (w->signum, SIG_DFL);
2806 }
2779 2807
2780 EV_FREQUENT_CHECK; 2808 EV_FREQUENT_CHECK;
2781} 2809}
2782 2810
2783void 2811void
… …
2863 } 2891 }
2864 } 2892 }
2865 2893
2866 if (w->wd >= 0) 2894 if (w->wd >= 0)
2867 { 2895 {
2896 struct statfs sfs;
2897
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2869 2899
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2900 /* now local changes will be tracked by inotify, but remote changes won't */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2901 /* unless the filesystem it known to be local, we therefore still poll */
2872 /* also do poll on <2.6.25, but with normal frequency */ 2902 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874 2903
2875 if (fs_2625 && !statfs (w->path, &sfs)) 2904 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */ 2905 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */ 2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */ 2907 || sfs.f_type == 0x3153464a /* jfs */
… …
2967 return; 2996 return;
2968 2997
2969 fs_2625 = 1; 2998 fs_2625 = 1;
2970} 2999}
2971 3000
3001inline_size int
3002infy_newfd (void)
3003{
3004#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3005 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3006 if (fd >= 0)
3007 return fd;
3008#endif
3009 return inotify_init ();
3010}
3011
2972inline_size void 3012inline_size void
2973infy_init (EV_P) 3013infy_init (EV_P)
2974{ 3014{
2975 if (fs_fd != -2) 3015 if (fs_fd != -2)
2976 return; 3016 return;
2977 3017
2978 fs_fd = -1; 3018 fs_fd = -1;
2979 3019
2980 check_2625 (EV_A); 3020 check_2625 (EV_A);
2981 3021
2982 fs_fd = inotify_init (); 3022 fs_fd = infy_newfd ();
2983 3023
2984 if (fs_fd >= 0) 3024 if (fs_fd >= 0)
2985 { 3025 {
3026 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3028 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3029 ev_io_start (EV_A_ &fs_w);
2989 } 3030 }
2990} 3031}
… …
2995 int slot; 3036 int slot;
2996 3037
2997 if (fs_fd < 0) 3038 if (fs_fd < 0)
2998 return; 3039 return;
2999 3040
3041 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3042 close (fs_fd);
3001 fs_fd = inotify_init (); 3043 fs_fd = infy_newfd ();
3044
3045 if (fs_fd >= 0)
3046 {
3047 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w);
3050 }
3002 3051
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
3004 { 3053 {
3005 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;
… …
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3313{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3314 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3315
3267 { 3316 {
3268 struct ev_loop *loop = w->other; 3317 EV_P = w->other;
3269 3318
3270 while (fdchangecnt) 3319 while (fdchangecnt)
3271 { 3320 {
3272 fd_reify (EV_A); 3321 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3322 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3330 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3331
3283 ev_embed_stop (EV_A_ w); 3332 ev_embed_stop (EV_A_ w);
3284 3333
3285 { 3334 {
3286 struct ev_loop *loop = w->other; 3335 EV_P = w->other;
3287 3336
3288 ev_loop_fork (EV_A); 3337 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3338 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3339 }
3291 3340
… …
3305{ 3354{
3306 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
3307 return; 3356 return;
3308 3357
3309 { 3358 {
3310 struct ev_loop *loop = w->other; 3359 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3360 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); 3361 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3362 }
3314 3363
3315 EV_FREQUENT_CHECK; 3364 EV_FREQUENT_CHECK;
… …
3427 3476
3428void 3477void
3429ev_async_send (EV_P_ ev_async *w) 3478ev_async_send (EV_P_ ev_async *w)
3430{ 3479{
3431 w->sent = 1; 3480 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3481 evpipe_write (EV_A_ &async_pending);
3433} 3482}
3434#endif 3483#endif
3435 3484
3436/*****************************************************************************/ 3485/*****************************************************************************/
3437 3486
… …
3586 if (types & EV_CHECK) 3635 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3636 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3637 cb (EV_A_ EV_CHECK, checks [i]);
3589 3638
3590 if (types & EV_SIGNAL) 3639 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3640 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3641 for (wl = signals [i].head; wl; )
3593 { 3642 {
3594 wn = wl->next; 3643 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3644 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3645 wl = wn;

Diff Legend

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