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

Comparing libev/ev.c (file contents):
Revision 1.373 by root, Sun Feb 20 02:56:23 2011 UTC vs.
Revision 1.381 by root, Mon Jun 27 21:29:35 2011 UTC

… …
464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 465
466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0) 467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
468 468
469#if __GNUC__ >= 4 469/* the following are taken from libecb */
470# define expect(expr,value) __builtin_expect ((expr),(value)) 470/* ecb.h start */
471# define noinline __attribute__ ((noinline)) 471
472/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers.
475 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place.
478 */
479#ifndef ECB_GCC_VERSION
480 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
481 #define ECB_GCC_VERSION(major,minor) 0
482 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif
485#endif
486
487#if __cplusplus
488 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__
491#elif ECB_C99
492 #define ecb_inline static inline
472#else 493#else
473# define expect(expr,value) (expr) 494 #define ecb_inline static
474# define noinline
475# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
476# define inline
477# endif 495#endif
478#endif
479 496
497#if ECB_GCC_VERSION(3,1)
498 #define ecb_attribute(attrlist) __attribute__(attrlist)
499 #define ecb_is_constant(expr) __builtin_constant_p (expr)
500 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
501 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
502#else
503 #define ecb_attribute(attrlist)
504 #define ecb_is_constant(expr) 0
505 #define ecb_expect(expr,value) (expr)
506 #define ecb_prefetch(addr,rw,locality)
507#endif
508
509#define ecb_noinline ecb_attribute ((__noinline__))
510#define ecb_noreturn ecb_attribute ((__noreturn__))
511#define ecb_unused ecb_attribute ((__unused__))
512#define ecb_const ecb_attribute ((__const__))
513#define ecb_pure ecb_attribute ((__pure__))
514
515#if ECB_GCC_VERSION(4,3)
516 #define ecb_artificial ecb_attribute ((__artificial__))
517 #define ecb_hot ecb_attribute ((__hot__))
518 #define ecb_cold ecb_attribute ((__cold__))
519#else
520 #define ecb_artificial
521 #define ecb_hot
522 #define ecb_cold
523#endif
524
525/* put around conditional expressions if you are very sure that the */
526/* expression is mostly true or mostly false. note that these return */
527/* booleans, not the expression. */
480#define expect_false(expr) expect ((expr) != 0, 0) 528#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
481#define expect_true(expr) expect ((expr) != 0, 1) 529#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
530/* ecb.h end */
531
532#define expect_false(cond) ecb_expect_false (cond)
533#define expect_true(cond) ecb_expect_true (cond)
534#define noinline ecb_noinline
535
482#define inline_size static inline 536#define inline_size ecb_inline
483 537
484#if EV_FEATURE_CODE 538#if EV_FEATURE_CODE
485# define inline_speed static inline 539# define inline_speed ecb_inline
486#else 540#else
487# define inline_speed static noinline 541# define inline_speed static noinline
488#endif 542#endif
489 543
490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 544#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
… …
581 635
582#ifdef __linux 636#ifdef __linux
583# include <sys/utsname.h> 637# include <sys/utsname.h>
584#endif 638#endif
585 639
586static unsigned int noinline 640static unsigned int noinline ecb_cold
587ev_linux_version (void) 641ev_linux_version (void)
588{ 642{
589#ifdef __linux 643#ifdef __linux
590 unsigned int v = 0; 644 unsigned int v = 0;
591 struct utsname buf; 645 struct utsname buf;
… …
620} 674}
621 675
622/*****************************************************************************/ 676/*****************************************************************************/
623 677
624#if EV_AVOID_STDIO 678#if EV_AVOID_STDIO
625static void noinline 679static void noinline ecb_cold
626ev_printerr (const char *msg) 680ev_printerr (const char *msg)
627{ 681{
628 write (STDERR_FILENO, msg, strlen (msg)); 682 write (STDERR_FILENO, msg, strlen (msg));
629} 683}
630#endif 684#endif
631 685
632static void (*syserr_cb)(const char *msg); 686static void (*syserr_cb)(const char *msg);
633 687
634void 688void ecb_cold
635ev_set_syserr_cb (void (*cb)(const char *msg)) 689ev_set_syserr_cb (void (*cb)(const char *msg))
636{ 690{
637 syserr_cb = cb; 691 syserr_cb = cb;
638} 692}
639 693
640static void noinline 694static void noinline ecb_cold
641ev_syserr (const char *msg) 695ev_syserr (const char *msg)
642{ 696{
643 if (!msg) 697 if (!msg)
644 msg = "(libev) system error"; 698 msg = "(libev) system error";
645 699
… …
678#endif 732#endif
679} 733}
680 734
681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 735static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
682 736
683void 737void ecb_cold
684ev_set_allocator (void *(*cb)(void *ptr, long size)) 738ev_set_allocator (void *(*cb)(void *ptr, long size))
685{ 739{
686 alloc = cb; 740 alloc = cb;
687} 741}
688 742
… …
870 select (0, 0, 0, 0, &tv); 924 select (0, 0, 0, 0, &tv);
871#endif 925#endif
872 } 926 }
873} 927}
874 928
875inline_speed int
876ev_timeout_to_ms (ev_tstamp timeout)
877{
878 int ms = timeout * 1000. + .999999;
879
880 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
881}
882
883/*****************************************************************************/ 929/*****************************************************************************/
884 930
885#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 931#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
886 932
887/* find a suitable new size for the given array, */ 933/* find a suitable new size for the given array, */
… …
905 } 951 }
906 952
907 return ncur; 953 return ncur;
908} 954}
909 955
910static noinline void * 956static void * noinline ecb_cold
911array_realloc (int elem, void *base, int *cur, int cnt) 957array_realloc (int elem, void *base, int *cur, int cnt)
912{ 958{
913 *cur = array_nextsize (elem, *cur, cnt); 959 *cur = array_nextsize (elem, *cur, cnt);
914 return ev_realloc (base, elem * *cur); 960 return ev_realloc (base, elem * *cur);
915} 961}
… …
1034 for (i = 0; i < fdchangecnt; ++i) 1080 for (i = 0; i < fdchangecnt; ++i)
1035 { 1081 {
1036 int fd = fdchanges [i]; 1082 int fd = fdchanges [i];
1037 ANFD *anfd = anfds + fd; 1083 ANFD *anfd = anfds + fd;
1038 1084
1039 if (anfd->reify & EV__IOFDSET) 1085 if (anfd->reify & EV__IOFDSET && anfd->head)
1040 { 1086 {
1041 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd); 1087 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1042 1088
1043 if (handle != anfd->handle) 1089 if (handle != anfd->handle)
1044 { 1090 {
… …
1098 fdchanges [fdchangecnt - 1] = fd; 1144 fdchanges [fdchangecnt - 1] = fd;
1099 } 1145 }
1100} 1146}
1101 1147
1102/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1148/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1103inline_speed void 1149inline_speed void ecb_cold
1104fd_kill (EV_P_ int fd) 1150fd_kill (EV_P_ int fd)
1105{ 1151{
1106 ev_io *w; 1152 ev_io *w;
1107 1153
1108 while ((w = (ev_io *)anfds [fd].head)) 1154 while ((w = (ev_io *)anfds [fd].head))
… …
1111 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1157 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1112 } 1158 }
1113} 1159}
1114 1160
1115/* check whether the given fd is actually valid, for error recovery */ 1161/* check whether the given fd is actually valid, for error recovery */
1116inline_size int 1162inline_size int ecb_cold
1117fd_valid (int fd) 1163fd_valid (int fd)
1118{ 1164{
1119#ifdef _WIN32 1165#ifdef _WIN32
1120 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1166 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1121#else 1167#else
1122 return fcntl (fd, F_GETFD) != -1; 1168 return fcntl (fd, F_GETFD) != -1;
1123#endif 1169#endif
1124} 1170}
1125 1171
1126/* called on EBADF to verify fds */ 1172/* called on EBADF to verify fds */
1127static void noinline 1173static void noinline ecb_cold
1128fd_ebadf (EV_P) 1174fd_ebadf (EV_P)
1129{ 1175{
1130 int fd; 1176 int fd;
1131 1177
1132 for (fd = 0; fd < anfdmax; ++fd) 1178 for (fd = 0; fd < anfdmax; ++fd)
… …
1134 if (!fd_valid (fd) && errno == EBADF) 1180 if (!fd_valid (fd) && errno == EBADF)
1135 fd_kill (EV_A_ fd); 1181 fd_kill (EV_A_ fd);
1136} 1182}
1137 1183
1138/* called on ENOMEM in select/poll to kill some fds and retry */ 1184/* called on ENOMEM in select/poll to kill some fds and retry */
1139static void noinline 1185static void noinline ecb_cold
1140fd_enomem (EV_P) 1186fd_enomem (EV_P)
1141{ 1187{
1142 int fd; 1188 int fd;
1143 1189
1144 for (fd = anfdmax; fd--; ) 1190 for (fd = anfdmax; fd--; )
… …
1339 1385
1340/*****************************************************************************/ 1386/*****************************************************************************/
1341 1387
1342#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1388#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1343 1389
1344static void noinline 1390static void noinline ecb_cold
1345evpipe_init (EV_P) 1391evpipe_init (EV_P)
1346{ 1392{
1347 if (!ev_is_active (&pipe_w)) 1393 if (!ev_is_active (&pipe_w))
1348 { 1394 {
1349# if EV_USE_EVENTFD 1395# if EV_USE_EVENTFD
… …
1371 ev_io_start (EV_A_ &pipe_w); 1417 ev_io_start (EV_A_ &pipe_w);
1372 ev_unref (EV_A); /* watcher should not keep loop alive */ 1418 ev_unref (EV_A); /* watcher should not keep loop alive */
1373 } 1419 }
1374} 1420}
1375 1421
1376inline_size void 1422inline_speed void
1377evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1423evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1378{ 1424{
1379 if (!*flag) 1425 if (!*flag)
1380 { 1426 {
1381 int old_errno = errno; /* save errno because write might clobber it */
1382 char dummy;
1383
1384 *flag = 1; 1427 *flag = 1;
1385 1428
1429 pipe_write_skipped = 1;
1430
1431 if (pipe_write_wanted)
1432 {
1433 int old_errno;
1434
1435 pipe_write_skipped = 0;
1436
1437 old_errno = errno; /* save errno because write will clobber it */
1438
1386#if EV_USE_EVENTFD 1439#if EV_USE_EVENTFD
1387 if (evfd >= 0) 1440 if (evfd >= 0)
1388 { 1441 {
1389 uint64_t counter = 1; 1442 uint64_t counter = 1;
1390 write (evfd, &counter, sizeof (uint64_t)); 1443 write (evfd, &counter, sizeof (uint64_t));
1444 }
1445 else
1446#endif
1447 {
1448 /* win32 people keep sending patches that change this write() to send() */
1449 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1450 /* so when you think this write should be a send instead, please find out */
1451 /* where your send() is from - it's definitely not the microsoft send, and */
1452 /* tell me. thank you. */
1453 write (evpipe [1], &(evpipe [1]), 1);
1454 }
1455
1456 errno = old_errno;
1391 } 1457 }
1392 else
1393#endif
1394 /* win32 people keep sending patches that change this write() to send() */
1395 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1396 /* so when you think this write should be a send instead, please find out */
1397 /* where your send() is from - it's definitely not the microsoft send, and */
1398 /* tell me. thank you. */
1399 write (evpipe [1], &dummy, 1);
1400
1401 errno = old_errno;
1402 } 1458 }
1403} 1459}
1404 1460
1405/* called whenever the libev signal pipe */ 1461/* called whenever the libev signal pipe */
1406/* got some events (signal, async) */ 1462/* got some events (signal, async) */
1407static void 1463static void
1408pipecb (EV_P_ ev_io *iow, int revents) 1464pipecb (EV_P_ ev_io *iow, int revents)
1409{ 1465{
1410 int i; 1466 int i;
1411 1467
1468 if (revents & EV_READ)
1469 {
1412#if EV_USE_EVENTFD 1470#if EV_USE_EVENTFD
1413 if (evfd >= 0) 1471 if (evfd >= 0)
1414 { 1472 {
1415 uint64_t counter; 1473 uint64_t counter;
1416 read (evfd, &counter, sizeof (uint64_t)); 1474 read (evfd, &counter, sizeof (uint64_t));
1417 } 1475 }
1418 else 1476 else
1419#endif 1477#endif
1420 { 1478 {
1421 char dummy; 1479 char dummy;
1422 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1480 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1423 read (evpipe [0], &dummy, 1); 1481 read (evpipe [0], &dummy, 1);
1482 }
1424 } 1483 }
1484
1485 pipe_write_skipped = 0;
1425 1486
1426#if EV_SIGNAL_ENABLE 1487#if EV_SIGNAL_ENABLE
1427 if (sig_pending) 1488 if (sig_pending)
1428 { 1489 {
1429 sig_pending = 0; 1490 sig_pending = 0;
… …
1458 EV_P = signals [signum - 1].loop; 1519 EV_P = signals [signum - 1].loop;
1459 1520
1460 if (!EV_A) 1521 if (!EV_A)
1461 return; 1522 return;
1462#endif 1523#endif
1524
1525 if (!ev_active (&pipe_w))
1526 return;
1463 1527
1464 signals [signum - 1].pending = 1; 1528 signals [signum - 1].pending = 1;
1465 evpipe_write (EV_A_ &sig_pending); 1529 evpipe_write (EV_A_ &sig_pending);
1466} 1530}
1467 1531
… …
1599#endif 1663#endif
1600#if EV_USE_SELECT 1664#if EV_USE_SELECT
1601# include "ev_select.c" 1665# include "ev_select.c"
1602#endif 1666#endif
1603 1667
1604int 1668int ecb_cold
1605ev_version_major (void) 1669ev_version_major (void)
1606{ 1670{
1607 return EV_VERSION_MAJOR; 1671 return EV_VERSION_MAJOR;
1608} 1672}
1609 1673
1610int 1674int ecb_cold
1611ev_version_minor (void) 1675ev_version_minor (void)
1612{ 1676{
1613 return EV_VERSION_MINOR; 1677 return EV_VERSION_MINOR;
1614} 1678}
1615 1679
1616/* return true if we are running with elevated privileges and should ignore env variables */ 1680/* return true if we are running with elevated privileges and should ignore env variables */
1617int inline_size 1681int inline_size ecb_cold
1618enable_secure (void) 1682enable_secure (void)
1619{ 1683{
1620#ifdef _WIN32 1684#ifdef _WIN32
1621 return 0; 1685 return 0;
1622#else 1686#else
1623 return getuid () != geteuid () 1687 return getuid () != geteuid ()
1624 || getgid () != getegid (); 1688 || getgid () != getegid ();
1625#endif 1689#endif
1626} 1690}
1627 1691
1628unsigned int 1692unsigned int ecb_cold
1629ev_supported_backends (void) 1693ev_supported_backends (void)
1630{ 1694{
1631 unsigned int flags = 0; 1695 unsigned int flags = 0;
1632 1696
1633 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1697 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1637 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1701 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1638 1702
1639 return flags; 1703 return flags;
1640} 1704}
1641 1705
1642unsigned int 1706unsigned int ecb_cold
1643ev_recommended_backends (void) 1707ev_recommended_backends (void)
1644{ 1708{
1645 unsigned int flags = ev_supported_backends (); 1709 unsigned int flags = ev_supported_backends ();
1646 1710
1647#ifndef __NetBSD__ 1711#ifndef __NetBSD__
… …
1659#endif 1723#endif
1660 1724
1661 return flags; 1725 return flags;
1662} 1726}
1663 1727
1664unsigned int 1728unsigned int ecb_cold
1665ev_embeddable_backends (void) 1729ev_embeddable_backends (void)
1666{ 1730{
1667 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1731 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1668 1732
1669 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1733 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
… …
1714ev_userdata (EV_P) 1778ev_userdata (EV_P)
1715{ 1779{
1716 return userdata; 1780 return userdata;
1717} 1781}
1718 1782
1783void
1719void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1784ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1720{ 1785{
1721 invoke_cb = invoke_pending_cb; 1786 invoke_cb = invoke_pending_cb;
1722} 1787}
1723 1788
1789void
1724void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1790ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1725{ 1791{
1726 release_cb = release; 1792 release_cb = release;
1727 acquire_cb = acquire; 1793 acquire_cb = acquire;
1728} 1794}
1729#endif 1795#endif
1730 1796
1731/* initialise a loop structure, must be zero-initialised */ 1797/* initialise a loop structure, must be zero-initialised */
1732static void noinline 1798static void noinline ecb_cold
1733loop_init (EV_P_ unsigned int flags) 1799loop_init (EV_P_ unsigned int flags)
1734{ 1800{
1735 if (!backend) 1801 if (!backend)
1736 { 1802 {
1737 origflags = flags; 1803 origflags = flags;
… …
1765 if (!(flags & EVFLAG_NOENV) 1831 if (!(flags & EVFLAG_NOENV)
1766 && !enable_secure () 1832 && !enable_secure ()
1767 && getenv ("LIBEV_FLAGS")) 1833 && getenv ("LIBEV_FLAGS"))
1768 flags = atoi (getenv ("LIBEV_FLAGS")); 1834 flags = atoi (getenv ("LIBEV_FLAGS"));
1769 1835
1770 ev_rt_now = ev_time (); 1836 ev_rt_now = ev_time ();
1771 mn_now = get_clock (); 1837 mn_now = get_clock ();
1772 now_floor = mn_now; 1838 now_floor = mn_now;
1773 rtmn_diff = ev_rt_now - mn_now; 1839 rtmn_diff = ev_rt_now - mn_now;
1774#if EV_FEATURE_API 1840#if EV_FEATURE_API
1775 invoke_cb = ev_invoke_pending; 1841 invoke_cb = ev_invoke_pending;
1776#endif 1842#endif
1777 1843
1778 io_blocktime = 0.; 1844 io_blocktime = 0.;
1779 timeout_blocktime = 0.; 1845 timeout_blocktime = 0.;
1780 backend = 0; 1846 backend = 0;
1781 backend_fd = -1; 1847 backend_fd = -1;
1782 sig_pending = 0; 1848 sig_pending = 0;
1783#if EV_ASYNC_ENABLE 1849#if EV_ASYNC_ENABLE
1784 async_pending = 0; 1850 async_pending = 0;
1785#endif 1851#endif
1852 pipe_write_skipped = 0;
1853 pipe_write_wanted = 0;
1786#if EV_USE_INOTIFY 1854#if EV_USE_INOTIFY
1787 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1855 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1788#endif 1856#endif
1789#if EV_USE_SIGNALFD 1857#if EV_USE_SIGNALFD
1790 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1858 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1791#endif 1859#endif
1792 1860
1793 if (!(flags & EVBACKEND_MASK)) 1861 if (!(flags & EVBACKEND_MASK))
1794 flags |= ev_recommended_backends (); 1862 flags |= ev_recommended_backends ();
1795 1863
… …
1820#endif 1888#endif
1821 } 1889 }
1822} 1890}
1823 1891
1824/* free up a loop structure */ 1892/* free up a loop structure */
1825void 1893void ecb_cold
1826ev_loop_destroy (EV_P) 1894ev_loop_destroy (EV_P)
1827{ 1895{
1828 int i; 1896 int i;
1829 1897
1830#if EV_MULTIPLICITY 1898#if EV_MULTIPLICITY
… …
1960 infy_fork (EV_A); 2028 infy_fork (EV_A);
1961#endif 2029#endif
1962 2030
1963 if (ev_is_active (&pipe_w)) 2031 if (ev_is_active (&pipe_w))
1964 { 2032 {
1965 /* this "locks" the handlers against writing to the pipe */ 2033 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1966 /* while we modify the fd vars */
1967 sig_pending = 1;
1968#if EV_ASYNC_ENABLE
1969 async_pending = 1;
1970#endif
1971 2034
1972 ev_ref (EV_A); 2035 ev_ref (EV_A);
1973 ev_io_stop (EV_A_ &pipe_w); 2036 ev_io_stop (EV_A_ &pipe_w);
1974 2037
1975#if EV_USE_EVENTFD 2038#if EV_USE_EVENTFD
… …
1993 postfork = 0; 2056 postfork = 0;
1994} 2057}
1995 2058
1996#if EV_MULTIPLICITY 2059#if EV_MULTIPLICITY
1997 2060
1998struct ev_loop * 2061struct ev_loop * ecb_cold
1999ev_loop_new (unsigned int flags) 2062ev_loop_new (unsigned int flags)
2000{ 2063{
2001 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2064 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
2002 2065
2003 memset (EV_A, 0, sizeof (struct ev_loop)); 2066 memset (EV_A, 0, sizeof (struct ev_loop));
… …
2011} 2074}
2012 2075
2013#endif /* multiplicity */ 2076#endif /* multiplicity */
2014 2077
2015#if EV_VERIFY 2078#if EV_VERIFY
2016static void noinline 2079static void noinline ecb_cold
2017verify_watcher (EV_P_ W w) 2080verify_watcher (EV_P_ W w)
2018{ 2081{
2019 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2082 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
2020 2083
2021 if (w->pending) 2084 if (w->pending)
2022 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2085 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
2023} 2086}
2024 2087
2025static void noinline 2088static void noinline ecb_cold
2026verify_heap (EV_P_ ANHE *heap, int N) 2089verify_heap (EV_P_ ANHE *heap, int N)
2027{ 2090{
2028 int i; 2091 int i;
2029 2092
2030 for (i = HEAP0; i < N + HEAP0; ++i) 2093 for (i = HEAP0; i < N + HEAP0; ++i)
… …
2035 2098
2036 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2099 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
2037 } 2100 }
2038} 2101}
2039 2102
2040static void noinline 2103static void noinline ecb_cold
2041array_verify (EV_P_ W *ws, int cnt) 2104array_verify (EV_P_ W *ws, int cnt)
2042{ 2105{
2043 while (cnt--) 2106 while (cnt--)
2044 { 2107 {
2045 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2108 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
… …
2047 } 2110 }
2048} 2111}
2049#endif 2112#endif
2050 2113
2051#if EV_FEATURE_API 2114#if EV_FEATURE_API
2052void 2115void ecb_cold
2053ev_verify (EV_P) 2116ev_verify (EV_P)
2054{ 2117{
2055#if EV_VERIFY 2118#if EV_VERIFY
2056 int i; 2119 int i;
2057 WL w; 2120 WL w;
… …
2123#endif 2186#endif
2124} 2187}
2125#endif 2188#endif
2126 2189
2127#if EV_MULTIPLICITY 2190#if EV_MULTIPLICITY
2128struct ev_loop * 2191struct ev_loop * ecb_cold
2129#else 2192#else
2130int 2193int
2131#endif 2194#endif
2132ev_default_loop (unsigned int flags) 2195ev_default_loop (unsigned int flags)
2133{ 2196{
… …
2332 } 2395 }
2333} 2396}
2334 2397
2335/* simply recalculate all periodics */ 2398/* simply recalculate all periodics */
2336/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2399/* TODO: maybe ensure that at least one event happens when jumping forward? */
2337static void noinline 2400static void noinline ecb_cold
2338periodics_reschedule (EV_P) 2401periodics_reschedule (EV_P)
2339{ 2402{
2340 int i; 2403 int i;
2341 2404
2342 /* adjust periodics after time jump */ 2405 /* adjust periodics after time jump */
… …
2355 reheap (periodics, periodiccnt); 2418 reheap (periodics, periodiccnt);
2356} 2419}
2357#endif 2420#endif
2358 2421
2359/* adjust all timers by a given offset */ 2422/* adjust all timers by a given offset */
2360static void noinline 2423static void noinline ecb_cold
2361timers_reschedule (EV_P_ ev_tstamp adjust) 2424timers_reschedule (EV_P_ ev_tstamp adjust)
2362{ 2425{
2363 int i; 2426 int i;
2364 2427
2365 for (i = 0; i < timercnt; ++i) 2428 for (i = 0; i < timercnt; ++i)
… …
2507 ev_tstamp prev_mn_now = mn_now; 2570 ev_tstamp prev_mn_now = mn_now;
2508 2571
2509 /* update time to cancel out callback processing overhead */ 2572 /* update time to cancel out callback processing overhead */
2510 time_update (EV_A_ 1e100); 2573 time_update (EV_A_ 1e100);
2511 2574
2575 /* from now on, we want a pipe-wake-up */
2576 pipe_write_wanted = 1;
2577
2512 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2578 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2513 { 2579 {
2514 waittime = MAX_BLOCKTIME; 2580 waittime = MAX_BLOCKTIME;
2515 2581
2516 if (timercnt) 2582 if (timercnt)
2517 { 2583 {
2518 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2584 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2519 if (waittime > to) waittime = to; 2585 if (waittime > to) waittime = to;
2520 } 2586 }
2521 2587
2522#if EV_PERIODIC_ENABLE 2588#if EV_PERIODIC_ENABLE
2523 if (periodiccnt) 2589 if (periodiccnt)
2524 { 2590 {
2525 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2591 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2526 if (waittime > to) waittime = to; 2592 if (waittime > to) waittime = to;
2527 } 2593 }
2528#endif 2594#endif
2529 2595
2530 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2596 /* don't let timeouts decrease the waittime below timeout_blocktime */
2531 if (expect_false (waittime < timeout_blocktime)) 2597 if (expect_false (waittime < timeout_blocktime))
2532 waittime = timeout_blocktime; 2598 waittime = timeout_blocktime;
2599
2600 /* at this point, we NEED to wait, so we have to ensure */
2601 /* to pass a minimum nonzero value to the backend */
2602 if (expect_false (waittime < backend_mintime))
2603 waittime = backend_mintime;
2533 2604
2534 /* extra check because io_blocktime is commonly 0 */ 2605 /* extra check because io_blocktime is commonly 0 */
2535 if (expect_false (io_blocktime)) 2606 if (expect_false (io_blocktime))
2536 { 2607 {
2537 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2608 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2538 2609
2539 if (sleeptime > waittime - backend_fudge) 2610 if (sleeptime > waittime - backend_mintime)
2540 sleeptime = waittime - backend_fudge; 2611 sleeptime = waittime - backend_mintime;
2541 2612
2542 if (expect_true (sleeptime > 0.)) 2613 if (expect_true (sleeptime > 0.))
2543 { 2614 {
2544 ev_sleep (sleeptime); 2615 ev_sleep (sleeptime);
2545 waittime -= sleeptime; 2616 waittime -= sleeptime;
… …
2551 ++loop_count; 2622 ++loop_count;
2552#endif 2623#endif
2553 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2624 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2554 backend_poll (EV_A_ waittime); 2625 backend_poll (EV_A_ waittime);
2555 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2626 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2627
2628 pipe_write_wanted = 0;
2629
2630 if (pipe_write_skipped)
2631 {
2632 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2633 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2634 }
2635
2556 2636
2557 /* update ev_rt_now, do magic */ 2637 /* update ev_rt_now, do magic */
2558 time_update (EV_A_ waittime + sleeptime); 2638 time_update (EV_A_ waittime + sleeptime);
2559 } 2639 }
2560 2640
… …
3214 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3294 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3215 ofs += sizeof (struct inotify_event) + ev->len; 3295 ofs += sizeof (struct inotify_event) + ev->len;
3216 } 3296 }
3217} 3297}
3218 3298
3219inline_size void 3299inline_size void ecb_cold
3220ev_check_2625 (EV_P) 3300ev_check_2625 (EV_P)
3221{ 3301{
3222 /* kernels < 2.6.25 are borked 3302 /* kernels < 2.6.25 are borked
3223 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3303 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3224 */ 3304 */
… …
3849} 3929}
3850 3930
3851/*****************************************************************************/ 3931/*****************************************************************************/
3852 3932
3853#if EV_WALK_ENABLE 3933#if EV_WALK_ENABLE
3854void 3934void ecb_cold
3855ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3935ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3856{ 3936{
3857 int i, j; 3937 int i, j;
3858 ev_watcher_list *wl, *wn; 3938 ev_watcher_list *wl, *wn;
3859 3939

Diff Legend

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