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

Comparing libev/ev.c (file contents):
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs.
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC

… …
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
178# endif 186# endif
179#endif 187#endif
180 188
181/* 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 */
182 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 64
216#endif
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 */
183#ifndef EV_USE_CLOCK_SYSCALL 225#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 226# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 227# define EV_USE_CLOCK_SYSCALL 1
186# else 228# else
187# define EV_USE_CLOCK_SYSCALL 0 229# define EV_USE_CLOCK_SYSCALL 0
… …
263#ifndef EV_USE_EVENTFD 305#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 306# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 307# define EV_USE_EVENTFD 1
266# else 308# else
267# define EV_USE_EVENTFD 0 309# define EV_USE_EVENTFD 0
310# endif
311#endif
312
313#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
315# define EV_USE_SIGNALFD 1
316# else
317# define EV_USE_SIGNALFD 0
268# endif 318# endif
269#endif 319#endif
270 320
271#if 0 /* debugging */ 321#if 0 /* debugging */
272# define EV_VERIFY 3 322# define EV_VERIFY 3
… …
339#endif 389#endif
340 390
341#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC
399# endif
344# ifdef __cplusplus 400# ifdef __cplusplus
345extern "C" { 401extern "C" {
346# endif 402# endif
347int eventfd (unsigned int initval, int flags); 403int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 404# ifdef __cplusplus
349} 405}
350# endif 406# endif
407#endif
408
409#if EV_USE_SIGNALFD
410# include <sys/signalfd.h>
351#endif 411#endif
352 412
353/**/ 413/**/
354 414
355#if EV_VERIFY >= 3 415#if EV_VERIFY >= 3
… …
391# define inline_speed static noinline 451# define inline_speed static noinline
392#else 452#else
393# define inline_speed static inline 453# define inline_speed static inline
394#endif 454#endif
395 455
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457
458#if EV_MINPRI == EV_MAXPRI
459# define ABSPRI(w) (((W)w), 0)
460#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 461# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
462#endif
398 463
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 464#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 465#define EMPTY2(a,b) /* used to suppress some warnings */
401 466
402typedef ev_watcher *W; 467typedef ev_watcher *W;
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 550#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 551#define ev_free(ptr) ev_realloc ((ptr), 0)
487 552
488/*****************************************************************************/ 553/*****************************************************************************/
489 554
555/* set in reify when reification needed */
556#define EV_ANFD_REIFY 1
557
490/* file descriptor info structure */ 558/* file descriptor info structure */
491typedef struct 559typedef struct
492{ 560{
493 WL head; 561 WL head;
494 unsigned char events; /* the events watched for */ 562 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 563 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 564 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 565 unsigned char unused;
498#if EV_USE_EPOLL 566#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 567 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 568#endif
… …
562 630
563 static int ev_default_loop_ptr; 631 static int ev_default_loop_ptr;
564 632
565#endif 633#endif
566 634
635#if EV_MINIMAL < 2
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
637# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else
640# define EV_RELEASE_CB (void)0
641# define EV_ACQUIRE_CB (void)0
642# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
643#endif
644
645#define EVUNLOOP_RECURSE 0x80
646
567/*****************************************************************************/ 647/*****************************************************************************/
568 648
569#ifndef EV_HAVE_EV_TIME 649#ifndef EV_HAVE_EV_TIME
570ev_tstamp 650ev_tstamp
571ev_time (void) 651ev_time (void)
… …
627 707
628 tv.tv_sec = (time_t)delay; 708 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 710
631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 711 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */ 712 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 713 /* by older ones */
634 select (0, 0, 0, 0, &tv); 714 select (0, 0, 0, 0, &tv);
635#endif 715#endif
636 } 716 }
637} 717}
… …
745} 825}
746 826
747/*****************************************************************************/ 827/*****************************************************************************/
748 828
749inline_speed void 829inline_speed void
750fd_event (EV_P_ int fd, int revents) 830fd_event_nc (EV_P_ int fd, int revents)
751{ 831{
752 ANFD *anfd = anfds + fd; 832 ANFD *anfd = anfds + fd;
753 ev_io *w; 833 ev_io *w;
754 834
755 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
759 if (ev) 839 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 840 ev_feed_event (EV_A_ (W)w, ev);
761 } 841 }
762} 842}
763 843
844/* do not submit kernel events for fds that have reify set */
845/* because that means they changed while we were polling for new events */
846inline_speed void
847fd_event (EV_P_ int fd, int revents)
848{
849 ANFD *anfd = anfds + fd;
850
851 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents);
853}
854
764void 855void
765ev_feed_fd_event (EV_P_ int fd, int revents) 856ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 857{
767 if (fd >= 0 && fd < anfdmax) 858 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 859 fd_event_nc (EV_A_ fd, revents);
769} 860}
770 861
771/* make sure the external fd watch events are in-sync */ 862/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 863/* with the kernel/libev internal state */
773inline_size void 864inline_size void
… …
888 for (fd = 0; fd < anfdmax; ++fd) 979 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 980 if (anfds [fd].events)
890 { 981 {
891 anfds [fd].events = 0; 982 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 983 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 985 }
895} 986}
896 987
897/*****************************************************************************/ 988/*****************************************************************************/
898 989
… …
1073evpipe_init (EV_P) 1164evpipe_init (EV_P)
1074{ 1165{
1075 if (!ev_is_active (&pipe_w)) 1166 if (!ev_is_active (&pipe_w))
1076 { 1167 {
1077#if EV_USE_EVENTFD 1168#if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1171 evfd = eventfd (0, 0);
1172
1173 if (evfd >= 0)
1079 { 1174 {
1080 evpipe [0] = -1; 1175 evpipe [0] = -1;
1081 fd_intern (evfd); 1176 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1177 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1178 }
1084 else 1179 else
1085#endif 1180#endif
1086 { 1181 {
… …
1198 signals [signum].gotsig = 0; 1293 signals [signum].gotsig = 0;
1199 1294
1200 for (w = signals [signum].head; w; w = w->next) 1295 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 1297}
1298
1299#if EV_USE_SIGNALFD
1300static void
1301sigfdcb (EV_P_ ev_io *iow, int revents)
1302{
1303 struct signalfd_siginfo si[4], *sip;
1304
1305 for (;;)
1306 {
1307 ssize_t res = read (sigfd, si, sizeof (si));
1308
1309 /* not ISO-C, as res might be -1, but works with SuS */
1310 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1311 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1312
1313 if (res < (ssize_t)sizeof (si))
1314 break;
1315 }
1316}
1317#endif
1203 1318
1204/*****************************************************************************/ 1319/*****************************************************************************/
1205 1320
1206static WL childs [EV_PID_HASHSIZE]; 1321static WL childs [EV_PID_HASHSIZE];
1207 1322
… …
1352ev_backend (EV_P) 1467ev_backend (EV_P)
1353{ 1468{
1354 return backend; 1469 return backend;
1355} 1470}
1356 1471
1472#if EV_MINIMAL < 2
1357unsigned int 1473unsigned int
1358ev_loop_count (EV_P) 1474ev_loop_count (EV_P)
1359{ 1475{
1360 return loop_count; 1476 return loop_count;
1361} 1477}
… …
1375void 1491void
1376ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1492ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1377{ 1493{
1378 timeout_blocktime = interval; 1494 timeout_blocktime = interval;
1379} 1495}
1496
1497void
1498ev_set_userdata (EV_P_ void *data)
1499{
1500 userdata = data;
1501}
1502
1503void *
1504ev_userdata (EV_P)
1505{
1506 return userdata;
1507}
1508
1509void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1510{
1511 invoke_cb = invoke_pending_cb;
1512}
1513
1514void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1515{
1516 release_cb = release;
1517 acquire_cb = acquire;
1518}
1519#endif
1380 1520
1381/* initialise a loop structure, must be zero-initialised */ 1521/* initialise a loop structure, must be zero-initialised */
1382static void noinline 1522static void noinline
1383loop_init (EV_P_ unsigned int flags) 1523loop_init (EV_P_ unsigned int flags)
1384{ 1524{
… …
1406 1546
1407 ev_rt_now = ev_time (); 1547 ev_rt_now = ev_time ();
1408 mn_now = get_clock (); 1548 mn_now = get_clock ();
1409 now_floor = mn_now; 1549 now_floor = mn_now;
1410 rtmn_diff = ev_rt_now - mn_now; 1550 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2
1552 invoke_cb = ev_invoke_pending;
1553#endif
1411 1554
1412 io_blocktime = 0.; 1555 io_blocktime = 0.;
1413 timeout_blocktime = 0.; 1556 timeout_blocktime = 0.;
1414 backend = 0; 1557 backend = 0;
1415 backend_fd = -1; 1558 backend_fd = -1;
1416 gotasync = 0; 1559 gotasync = 0;
1417#if EV_USE_INOTIFY 1560#if EV_USE_INOTIFY
1418 fs_fd = -2; 1561 fs_fd = -2;
1419#endif 1562#endif
1563#if EV_USE_SIGNALFD
1564 sigfd = -2;
1565#endif
1420 1566
1421 /* pid check not overridable via env */ 1567 /* pid check not overridable via env */
1422#ifndef _WIN32 1568#ifndef _WIN32
1423 if (flags & EVFLAG_FORKCHECK) 1569 if (flags & EVFLAG_FORKCHECK)
1424 curpid = getpid (); 1570 curpid = getpid ();
… …
1461{ 1607{
1462 int i; 1608 int i;
1463 1609
1464 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1465 { 1611 {
1466 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1467 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1468 1614
1469#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1470 if (evfd >= 0) 1616 if (evfd >= 0)
1471 close (evfd); 1617 close (evfd);
1472#endif 1618#endif
… …
1476 close (evpipe [0]); 1622 close (evpipe [0]);
1477 close (evpipe [1]); 1623 close (evpipe [1]);
1478 } 1624 }
1479 } 1625 }
1480 1626
1627#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd);
1634 }
1635#endif
1636
1481#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1482 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1483 close (fs_fd); 1639 close (fs_fd);
1484#endif 1640#endif
1485 1641
… …
1508#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1509 array_free (idle, [i]); 1665 array_free (idle, [i]);
1510#endif 1666#endif
1511 } 1667 }
1512 1668
1513 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1514 1670
1515 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1516 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1517 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1518 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1588ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1589{ 1745{
1590 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1591 1747
1592 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (loop, 0, sizeof (struct ev_loop));
1593
1594 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1595 1750
1596 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1597 return loop; 1752 return loop;
1598 1753
… …
1609void 1764void
1610ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1611{ 1766{
1612 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1613} 1768}
1769#endif /* multiplicity */
1614 1770
1615#if EV_VERIFY 1771#if EV_VERIFY
1616static void noinline 1772static void noinline
1617verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1618{ 1774{
… …
1646 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1647 } 1803 }
1648} 1804}
1649#endif 1805#endif
1650 1806
1807#if EV_MINIMAL < 2
1651void 1808void
1652ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1653{ 1810{
1654#if EV_VERIFY 1811#if EV_VERIFY
1655 int i; 1812 int i;
… …
1708 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)
1709 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1710# endif 1867# endif
1711#endif 1868#endif
1712} 1869}
1713 1870#endif
1714#endif /* multiplicity */
1715 1871
1716#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1717struct ev_loop * 1873struct ev_loop *
1718ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1719#else 1875#else
… …
1780ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1781{ 1937{
1782 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1783} 1939}
1784 1940
1785inline_speed void 1941unsigned int
1786call_pending (EV_P) 1942ev_pending_count (EV_P)
1943{
1944 int pri;
1945 unsigned int count = 0;
1946
1947 for (pri = NUMPRI; pri--; )
1948 count += pendingcnt [pri];
1949
1950 return count;
1951}
1952
1953void noinline
1954ev_invoke_pending (EV_P)
1787{ 1955{
1788 int pri; 1956 int pri;
1789 1957
1790 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1791 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
… …
2029} 2197}
2030 2198
2031void 2199void
2032ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
2033{ 2201{
2202#if EV_MINIMAL < 2
2034 ++loop_depth; 2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2035 2207
2036 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
2037 2209
2038 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2039 2211
2040 do 2212 do
2041 { 2213 {
2042#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
2043 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
… …
2056 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2057 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2058 if (forkcnt) 2230 if (forkcnt)
2059 { 2231 {
2060 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2061 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
2062 } 2234 }
2063#endif 2235#endif
2064 2236
2065 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2066 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2067 { 2239 {
2068 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2069 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
2070 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2071 2246
2072 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2073 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2074 loop_fork (EV_A); 2249 loop_fork (EV_A);
2075 2250
… …
2123 waittime -= sleeptime; 2298 waittime -= sleeptime;
2124 } 2299 }
2125 } 2300 }
2126 } 2301 }
2127 2302
2303#if EV_MINIMAL < 2
2128 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2129 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2130 2309
2131 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2132 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2133 } 2312 }
2134 2313
… …
2145 2324
2146 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2147 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2148 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2149 2328
2150 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2151 } 2330 }
2152 while (expect_true ( 2331 while (expect_true (
2153 activecnt 2332 activecnt
2154 && !loop_done 2333 && !loop_done
2155 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2156 )); 2335 ));
2157 2336
2158 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2159 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2160 2339
2340#if EV_MINIMAL < 2
2161 --loop_depth; 2341 --loop_depth;
2342#endif
2162} 2343}
2163 2344
2164void 2345void
2165ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2166{ 2347{
… …
2258} 2439}
2259 2440
2260inline_size void 2441inline_size void
2261pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2262{ 2443{
2263 int pri = w->priority; 2444 int pri = ev_priority (w);
2264 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2265 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2266 w->priority = pri; 2447 ev_set_priority (w, pri);
2267} 2448}
2268 2449
2269inline_speed void 2450inline_speed void
2270ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2271{ 2452{
… …
2298 2479
2299 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2300 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2301 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2302 2483
2303 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2304 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2305 2486
2306 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2307} 2488}
2308 2489
… …
2402 } 2583 }
2403 2584
2404 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2405} 2586}
2406 2587
2588ev_tstamp
2589ev_timer_remaining (EV_P_ ev_timer *w)
2590{
2591 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2592}
2593
2407#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2408void noinline 2595void noinline
2409ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2410{ 2597{
2411 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2486 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2487 return; 2674 return;
2488 2675
2489 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2490 2677
2678 EV_FREQUENT_CHECK;
2679
2680#if EV_USE_SIGNALFD
2681 if (sigfd == -2)
2682 {
2683 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2684 if (sigfd < 0 && errno == EINVAL)
2685 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2686
2687 if (sigfd >= 0)
2688 {
2689 fd_intern (sigfd); /* doing it twice will not hurt */
2690
2691 sigemptyset (&sigfd_set);
2692
2693 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2694 ev_set_priority (&sigfd_w, EV_MAXPRI);
2695 ev_io_start (EV_A_ &sigfd_w);
2696 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2697 }
2698 }
2699
2700 if (sigfd >= 0)
2701 {
2702 /* TODO: check .head */
2703 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705
2706 signalfd (sigfd, &sigfd_set, 0);
2707 }
2708 else
2709#endif
2491 evpipe_init (EV_A); 2710 evpipe_init (EV_A);
2492
2493 EV_FREQUENT_CHECK;
2494 2711
2495 { 2712 {
2496#ifndef _WIN32 2713#ifndef _WIN32
2497 sigset_t full, prev; 2714 sigset_t full, prev;
2498 sigfillset (&full); 2715 sigfillset (&full);
… …
2500#endif 2717#endif
2501 2718
2502 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2503 2720
2504#ifndef _WIN32 2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif
2725 sigdelset (&prev, w->signum);
2505 sigprocmask (SIG_SETMASK, &prev, 0); 2726 sigprocmask (SIG_SETMASK, &prev, 0);
2506#endif 2727#endif
2507 } 2728 }
2508 2729
2509 ev_start (EV_A_ (W)w, 1); 2730 ev_start (EV_A_ (W)w, 1);
… …
2512 if (!((WL)w)->next) 2733 if (!((WL)w)->next)
2513 { 2734 {
2514#if _WIN32 2735#if _WIN32
2515 signal (w->signum, ev_sighandler); 2736 signal (w->signum, ev_sighandler);
2516#else 2737#else
2738# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/
2740# endif
2741 {
2517 struct sigaction sa; 2742 struct sigaction sa = { };
2518 sa.sa_handler = ev_sighandler; 2743 sa.sa_handler = ev_sighandler;
2519 sigfillset (&sa.sa_mask); 2744 sigfillset (&sa.sa_mask);
2520 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2521 sigaction (w->signum, &sa, 0); 2746 sigaction (w->signum, &sa, 0);
2747 }
2522#endif 2748#endif
2523 } 2749 }
2524 2750
2525 EV_FREQUENT_CHECK; 2751 EV_FREQUENT_CHECK;
2526} 2752}
… …
2536 2762
2537 wlist_del (&signals [w->signum - 1].head, (WL)w); 2763 wlist_del (&signals [w->signum - 1].head, (WL)w);
2538 ev_stop (EV_A_ (W)w); 2764 ev_stop (EV_A_ (W)w);
2539 2765
2540 if (!signals [w->signum - 1].head) 2766 if (!signals [w->signum - 1].head)
2767#if EV_USE_SIGNALFD
2768 if (sigfd >= 0)
2769 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2771 sigdelset (&sigfd_set, w->signum);
2772 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2774 /*TODO: maybe unblock signal? */
2775 }
2776 else
2777#endif
2541 signal (w->signum, SIG_DFL); 2778 signal (w->signum, SIG_DFL);
2542 2779
2543 EV_FREQUENT_CHECK; 2780 EV_FREQUENT_CHECK;
2544} 2781}
2545 2782
2546void 2783void

Diff Legend

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