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

Comparing libev/ev.c (file contents):
Revision 1.376 by root, Sat Jun 4 05:33:29 2011 UTC vs.
Revision 1.383 by root, Wed Jul 20 00:40:14 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
496
497#ifndef ECB_MEMORY_FENCE
498 #if ECB_GCC_VERSION(2,5)
499 #if __x86
500 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
501 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
502 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE /* better be safe than sorry */
503 #elif __amd64
504 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
505 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
506 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence")
507 #endif
478#endif 508 #endif
509#endif
479 510
511#ifndef ECB_MEMORY_FENCE
512 #if ECB_GCC_VERSION(4,4)
513 #define ECB_MEMORY_FENCE __sync_synchronize ()
514 #define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); })
515 #define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); })
516 #elif _MSC_VER >= 1400
517 #define ECB_MEMORY_FENCE do { } while (0)
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
520 #elif defined(_WIN32) && defined(MemoryBarrier)
521 #define ECB_MEMORY_FENCE MemoryBarrier ()
522 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
523 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
524 #endif
525#endif
526
527#ifndef ECB_MEMORY_FENCE
528 #include <pthread.h>
529
530 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
531 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
532 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
533 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
534#endif
535
536#if ECB_GCC_VERSION(3,1)
537 #define ecb_attribute(attrlist) __attribute__(attrlist)
538 #define ecb_is_constant(expr) __builtin_constant_p (expr)
539 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
540 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
541#else
542 #define ecb_attribute(attrlist)
543 #define ecb_is_constant(expr) 0
544 #define ecb_expect(expr,value) (expr)
545 #define ecb_prefetch(addr,rw,locality)
546#endif
547
548#define ecb_noinline ecb_attribute ((__noinline__))
549#define ecb_noreturn ecb_attribute ((__noreturn__))
550#define ecb_unused ecb_attribute ((__unused__))
551#define ecb_const ecb_attribute ((__const__))
552#define ecb_pure ecb_attribute ((__pure__))
553
554#if ECB_GCC_VERSION(4,3)
555 #define ecb_artificial ecb_attribute ((__artificial__))
556 #define ecb_hot ecb_attribute ((__hot__))
557 #define ecb_cold ecb_attribute ((__cold__))
558#else
559 #define ecb_artificial
560 #define ecb_hot
561 #define ecb_cold
562#endif
563
564/* put around conditional expressions if you are very sure that the */
565/* expression is mostly true or mostly false. note that these return */
566/* booleans, not the expression. */
480#define expect_false(expr) expect ((expr) != 0, 0) 567#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
481#define expect_true(expr) expect ((expr) != 0, 1) 568#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
569/* ecb.h end */
570
571#define expect_false(cond) ecb_expect_false (cond)
572#define expect_true(cond) ecb_expect_true (cond)
573#define noinline ecb_noinline
574
482#define inline_size static inline 575#define inline_size ecb_inline
483 576
484#if EV_FEATURE_CODE 577#if EV_FEATURE_CODE
485# define inline_speed static inline 578# define inline_speed ecb_inline
486#else 579#else
487# define inline_speed static noinline 580# define inline_speed static noinline
488#endif 581#endif
489 582
490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 583#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
… …
581 674
582#ifdef __linux 675#ifdef __linux
583# include <sys/utsname.h> 676# include <sys/utsname.h>
584#endif 677#endif
585 678
586static unsigned int noinline 679static unsigned int noinline ecb_cold
587ev_linux_version (void) 680ev_linux_version (void)
588{ 681{
589#ifdef __linux 682#ifdef __linux
590 unsigned int v = 0; 683 unsigned int v = 0;
591 struct utsname buf; 684 struct utsname buf;
… …
620} 713}
621 714
622/*****************************************************************************/ 715/*****************************************************************************/
623 716
624#if EV_AVOID_STDIO 717#if EV_AVOID_STDIO
625static void noinline 718static void noinline ecb_cold
626ev_printerr (const char *msg) 719ev_printerr (const char *msg)
627{ 720{
628 write (STDERR_FILENO, msg, strlen (msg)); 721 write (STDERR_FILENO, msg, strlen (msg));
629} 722}
630#endif 723#endif
631 724
632static void (*syserr_cb)(const char *msg); 725static void (*syserr_cb)(const char *msg);
633 726
634void 727void ecb_cold
635ev_set_syserr_cb (void (*cb)(const char *msg)) 728ev_set_syserr_cb (void (*cb)(const char *msg))
636{ 729{
637 syserr_cb = cb; 730 syserr_cb = cb;
638} 731}
639 732
640static void noinline 733static void noinline ecb_cold
641ev_syserr (const char *msg) 734ev_syserr (const char *msg)
642{ 735{
643 if (!msg) 736 if (!msg)
644 msg = "(libev) system error"; 737 msg = "(libev) system error";
645 738
… …
678#endif 771#endif
679} 772}
680 773
681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 774static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
682 775
683void 776void ecb_cold
684ev_set_allocator (void *(*cb)(void *ptr, long size)) 777ev_set_allocator (void *(*cb)(void *ptr, long size))
685{ 778{
686 alloc = cb; 779 alloc = cb;
687} 780}
688 781
… …
897 } 990 }
898 991
899 return ncur; 992 return ncur;
900} 993}
901 994
902static noinline void * 995static void * noinline ecb_cold
903array_realloc (int elem, void *base, int *cur, int cnt) 996array_realloc (int elem, void *base, int *cur, int cnt)
904{ 997{
905 *cur = array_nextsize (elem, *cur, cnt); 998 *cur = array_nextsize (elem, *cur, cnt);
906 return ev_realloc (base, elem * *cur); 999 return ev_realloc (base, elem * *cur);
907} 1000}
… …
910 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 1003 memset ((void *)(base), 0, sizeof (*(base)) * (count))
911 1004
912#define array_needsize(type,base,cur,cnt,init) \ 1005#define array_needsize(type,base,cur,cnt,init) \
913 if (expect_false ((cnt) > (cur))) \ 1006 if (expect_false ((cnt) > (cur))) \
914 { \ 1007 { \
915 int ocur_ = (cur); \ 1008 int ecb_unused ocur_ = (cur); \
916 (base) = (type *)array_realloc \ 1009 (base) = (type *)array_realloc \
917 (sizeof (type), (base), &(cur), (cnt)); \ 1010 (sizeof (type), (base), &(cur), (cnt)); \
918 init ((base) + (ocur_), (cur) - ocur_); \ 1011 init ((base) + (ocur_), (cur) - ocur_); \
919 } 1012 }
920 1013
… …
1090 fdchanges [fdchangecnt - 1] = fd; 1183 fdchanges [fdchangecnt - 1] = fd;
1091 } 1184 }
1092} 1185}
1093 1186
1094/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1187/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1095inline_speed void 1188inline_speed void ecb_cold
1096fd_kill (EV_P_ int fd) 1189fd_kill (EV_P_ int fd)
1097{ 1190{
1098 ev_io *w; 1191 ev_io *w;
1099 1192
1100 while ((w = (ev_io *)anfds [fd].head)) 1193 while ((w = (ev_io *)anfds [fd].head))
… …
1103 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1196 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1104 } 1197 }
1105} 1198}
1106 1199
1107/* check whether the given fd is actually valid, for error recovery */ 1200/* check whether the given fd is actually valid, for error recovery */
1108inline_size int 1201inline_size int ecb_cold
1109fd_valid (int fd) 1202fd_valid (int fd)
1110{ 1203{
1111#ifdef _WIN32 1204#ifdef _WIN32
1112 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1205 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1113#else 1206#else
1114 return fcntl (fd, F_GETFD) != -1; 1207 return fcntl (fd, F_GETFD) != -1;
1115#endif 1208#endif
1116} 1209}
1117 1210
1118/* called on EBADF to verify fds */ 1211/* called on EBADF to verify fds */
1119static void noinline 1212static void noinline ecb_cold
1120fd_ebadf (EV_P) 1213fd_ebadf (EV_P)
1121{ 1214{
1122 int fd; 1215 int fd;
1123 1216
1124 for (fd = 0; fd < anfdmax; ++fd) 1217 for (fd = 0; fd < anfdmax; ++fd)
… …
1126 if (!fd_valid (fd) && errno == EBADF) 1219 if (!fd_valid (fd) && errno == EBADF)
1127 fd_kill (EV_A_ fd); 1220 fd_kill (EV_A_ fd);
1128} 1221}
1129 1222
1130/* called on ENOMEM in select/poll to kill some fds and retry */ 1223/* called on ENOMEM in select/poll to kill some fds and retry */
1131static void noinline 1224static void noinline ecb_cold
1132fd_enomem (EV_P) 1225fd_enomem (EV_P)
1133{ 1226{
1134 int fd; 1227 int fd;
1135 1228
1136 for (fd = anfdmax; fd--; ) 1229 for (fd = anfdmax; fd--; )
… …
1331 1424
1332/*****************************************************************************/ 1425/*****************************************************************************/
1333 1426
1334#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1427#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1335 1428
1336static void noinline 1429static void noinline ecb_cold
1337evpipe_init (EV_P) 1430evpipe_init (EV_P)
1338{ 1431{
1339 if (!ev_is_active (&pipe_w)) 1432 if (!ev_is_active (&pipe_w))
1340 { 1433 {
1341# if EV_USE_EVENTFD 1434# if EV_USE_EVENTFD
… …
1363 ev_io_start (EV_A_ &pipe_w); 1456 ev_io_start (EV_A_ &pipe_w);
1364 ev_unref (EV_A); /* watcher should not keep loop alive */ 1457 ev_unref (EV_A); /* watcher should not keep loop alive */
1365 } 1458 }
1366} 1459}
1367 1460
1368inline_size void 1461inline_speed void
1369evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1462evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1370{ 1463{
1371 if (!*flag) 1464 if (expect_true (*flag))
1465 return;
1466
1467 *flag = 1;
1468
1469 ECB_MEMORY_FENCE_RELEASE;
1470
1471 pipe_write_skipped = 1;
1472
1473 ECB_MEMORY_FENCE;
1474
1475 if (pipe_write_wanted)
1372 { 1476 {
1477 int old_errno;
1478
1479 pipe_write_skipped = 0; /* optimisation only */
1480
1373 int old_errno = errno; /* save errno because write might clobber it */ 1481 old_errno = errno; /* save errno because write will clobber it */
1374 char dummy;
1375
1376 *flag = 1;
1377 1482
1378#if EV_USE_EVENTFD 1483#if EV_USE_EVENTFD
1379 if (evfd >= 0) 1484 if (evfd >= 0)
1380 { 1485 {
1381 uint64_t counter = 1; 1486 uint64_t counter = 1;
1382 write (evfd, &counter, sizeof (uint64_t)); 1487 write (evfd, &counter, sizeof (uint64_t));
1383 } 1488 }
1384 else 1489 else
1385#endif 1490#endif
1491 {
1386 /* win32 people keep sending patches that change this write() to send() */ 1492 /* win32 people keep sending patches that change this write() to send() */
1387 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1493 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1388 /* so when you think this write should be a send instead, please find out */ 1494 /* so when you think this write should be a send instead, please find out */
1389 /* where your send() is from - it's definitely not the microsoft send, and */ 1495 /* where your send() is from - it's definitely not the microsoft send, and */
1390 /* tell me. thank you. */ 1496 /* tell me. thank you. */
1391 write (evpipe [1], &dummy, 1); 1497 write (evpipe [1], &(evpipe [1]), 1);
1498 }
1392 1499
1393 errno = old_errno; 1500 errno = old_errno;
1394 } 1501 }
1395} 1502}
1396 1503
… …
1399static void 1506static void
1400pipecb (EV_P_ ev_io *iow, int revents) 1507pipecb (EV_P_ ev_io *iow, int revents)
1401{ 1508{
1402 int i; 1509 int i;
1403 1510
1511 if (revents & EV_READ)
1512 {
1404#if EV_USE_EVENTFD 1513#if EV_USE_EVENTFD
1405 if (evfd >= 0) 1514 if (evfd >= 0)
1406 { 1515 {
1407 uint64_t counter; 1516 uint64_t counter;
1408 read (evfd, &counter, sizeof (uint64_t)); 1517 read (evfd, &counter, sizeof (uint64_t));
1409 } 1518 }
1410 else 1519 else
1411#endif 1520#endif
1412 { 1521 {
1413 char dummy; 1522 char dummy;
1414 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1523 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1415 read (evpipe [0], &dummy, 1); 1524 read (evpipe [0], &dummy, 1);
1525 }
1416 } 1526 }
1527
1528 pipe_write_skipped = 0;
1417 1529
1418#if EV_SIGNAL_ENABLE 1530#if EV_SIGNAL_ENABLE
1419 if (sig_pending) 1531 if (sig_pending)
1420 { 1532 {
1421 sig_pending = 0; 1533 sig_pending = 0;
… …
1450 EV_P = signals [signum - 1].loop; 1562 EV_P = signals [signum - 1].loop;
1451 1563
1452 if (!EV_A) 1564 if (!EV_A)
1453 return; 1565 return;
1454#endif 1566#endif
1567
1568 if (!ev_active (&pipe_w))
1569 return;
1455 1570
1456 signals [signum - 1].pending = 1; 1571 signals [signum - 1].pending = 1;
1457 evpipe_write (EV_A_ &sig_pending); 1572 evpipe_write (EV_A_ &sig_pending);
1458} 1573}
1459 1574
… …
1591#endif 1706#endif
1592#if EV_USE_SELECT 1707#if EV_USE_SELECT
1593# include "ev_select.c" 1708# include "ev_select.c"
1594#endif 1709#endif
1595 1710
1596int 1711int ecb_cold
1597ev_version_major (void) 1712ev_version_major (void)
1598{ 1713{
1599 return EV_VERSION_MAJOR; 1714 return EV_VERSION_MAJOR;
1600} 1715}
1601 1716
1602int 1717int ecb_cold
1603ev_version_minor (void) 1718ev_version_minor (void)
1604{ 1719{
1605 return EV_VERSION_MINOR; 1720 return EV_VERSION_MINOR;
1606} 1721}
1607 1722
1608/* return true if we are running with elevated privileges and should ignore env variables */ 1723/* return true if we are running with elevated privileges and should ignore env variables */
1609int inline_size 1724int inline_size ecb_cold
1610enable_secure (void) 1725enable_secure (void)
1611{ 1726{
1612#ifdef _WIN32 1727#ifdef _WIN32
1613 return 0; 1728 return 0;
1614#else 1729#else
1615 return getuid () != geteuid () 1730 return getuid () != geteuid ()
1616 || getgid () != getegid (); 1731 || getgid () != getegid ();
1617#endif 1732#endif
1618} 1733}
1619 1734
1620unsigned int 1735unsigned int ecb_cold
1621ev_supported_backends (void) 1736ev_supported_backends (void)
1622{ 1737{
1623 unsigned int flags = 0; 1738 unsigned int flags = 0;
1624 1739
1625 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1740 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1629 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1744 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1630 1745
1631 return flags; 1746 return flags;
1632} 1747}
1633 1748
1634unsigned int 1749unsigned int ecb_cold
1635ev_recommended_backends (void) 1750ev_recommended_backends (void)
1636{ 1751{
1637 unsigned int flags = ev_supported_backends (); 1752 unsigned int flags = ev_supported_backends ();
1638 1753
1639#ifndef __NetBSD__ 1754#ifndef __NetBSD__
… …
1651#endif 1766#endif
1652 1767
1653 return flags; 1768 return flags;
1654} 1769}
1655 1770
1656unsigned int 1771unsigned int ecb_cold
1657ev_embeddable_backends (void) 1772ev_embeddable_backends (void)
1658{ 1773{
1659 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1774 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1660 1775
1661 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1776 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
… …
1706ev_userdata (EV_P) 1821ev_userdata (EV_P)
1707{ 1822{
1708 return userdata; 1823 return userdata;
1709} 1824}
1710 1825
1826void
1711void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1827ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1712{ 1828{
1713 invoke_cb = invoke_pending_cb; 1829 invoke_cb = invoke_pending_cb;
1714} 1830}
1715 1831
1832void
1716void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1833ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1717{ 1834{
1718 release_cb = release; 1835 release_cb = release;
1719 acquire_cb = acquire; 1836 acquire_cb = acquire;
1720} 1837}
1721#endif 1838#endif
1722 1839
1723/* initialise a loop structure, must be zero-initialised */ 1840/* initialise a loop structure, must be zero-initialised */
1724static void noinline 1841static void noinline ecb_cold
1725loop_init (EV_P_ unsigned int flags) 1842loop_init (EV_P_ unsigned int flags)
1726{ 1843{
1727 if (!backend) 1844 if (!backend)
1728 { 1845 {
1729 origflags = flags; 1846 origflags = flags;
… …
1757 if (!(flags & EVFLAG_NOENV) 1874 if (!(flags & EVFLAG_NOENV)
1758 && !enable_secure () 1875 && !enable_secure ()
1759 && getenv ("LIBEV_FLAGS")) 1876 && getenv ("LIBEV_FLAGS"))
1760 flags = atoi (getenv ("LIBEV_FLAGS")); 1877 flags = atoi (getenv ("LIBEV_FLAGS"));
1761 1878
1762 ev_rt_now = ev_time (); 1879 ev_rt_now = ev_time ();
1763 mn_now = get_clock (); 1880 mn_now = get_clock ();
1764 now_floor = mn_now; 1881 now_floor = mn_now;
1765 rtmn_diff = ev_rt_now - mn_now; 1882 rtmn_diff = ev_rt_now - mn_now;
1766#if EV_FEATURE_API 1883#if EV_FEATURE_API
1767 invoke_cb = ev_invoke_pending; 1884 invoke_cb = ev_invoke_pending;
1768#endif 1885#endif
1769 1886
1770 io_blocktime = 0.; 1887 io_blocktime = 0.;
1771 timeout_blocktime = 0.; 1888 timeout_blocktime = 0.;
1772 backend = 0; 1889 backend = 0;
1773 backend_fd = -1; 1890 backend_fd = -1;
1774 sig_pending = 0; 1891 sig_pending = 0;
1775#if EV_ASYNC_ENABLE 1892#if EV_ASYNC_ENABLE
1776 async_pending = 0; 1893 async_pending = 0;
1777#endif 1894#endif
1895 pipe_write_skipped = 0;
1896 pipe_write_wanted = 0;
1778#if EV_USE_INOTIFY 1897#if EV_USE_INOTIFY
1779 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1898 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1780#endif 1899#endif
1781#if EV_USE_SIGNALFD 1900#if EV_USE_SIGNALFD
1782 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1901 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1783#endif 1902#endif
1784 1903
1785 if (!(flags & EVBACKEND_MASK)) 1904 if (!(flags & EVBACKEND_MASK))
1786 flags |= ev_recommended_backends (); 1905 flags |= ev_recommended_backends ();
1787 1906
… …
1812#endif 1931#endif
1813 } 1932 }
1814} 1933}
1815 1934
1816/* free up a loop structure */ 1935/* free up a loop structure */
1817void 1936void ecb_cold
1818ev_loop_destroy (EV_P) 1937ev_loop_destroy (EV_P)
1819{ 1938{
1820 int i; 1939 int i;
1821 1940
1822#if EV_MULTIPLICITY 1941#if EV_MULTIPLICITY
… …
1952 infy_fork (EV_A); 2071 infy_fork (EV_A);
1953#endif 2072#endif
1954 2073
1955 if (ev_is_active (&pipe_w)) 2074 if (ev_is_active (&pipe_w))
1956 { 2075 {
1957 /* this "locks" the handlers against writing to the pipe */ 2076 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1958 /* while we modify the fd vars */
1959 sig_pending = 1;
1960#if EV_ASYNC_ENABLE
1961 async_pending = 1;
1962#endif
1963 2077
1964 ev_ref (EV_A); 2078 ev_ref (EV_A);
1965 ev_io_stop (EV_A_ &pipe_w); 2079 ev_io_stop (EV_A_ &pipe_w);
1966 2080
1967#if EV_USE_EVENTFD 2081#if EV_USE_EVENTFD
… …
1985 postfork = 0; 2099 postfork = 0;
1986} 2100}
1987 2101
1988#if EV_MULTIPLICITY 2102#if EV_MULTIPLICITY
1989 2103
1990struct ev_loop * 2104struct ev_loop * ecb_cold
1991ev_loop_new (unsigned int flags) 2105ev_loop_new (unsigned int flags)
1992{ 2106{
1993 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2107 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1994 2108
1995 memset (EV_A, 0, sizeof (struct ev_loop)); 2109 memset (EV_A, 0, sizeof (struct ev_loop));
… …
2003} 2117}
2004 2118
2005#endif /* multiplicity */ 2119#endif /* multiplicity */
2006 2120
2007#if EV_VERIFY 2121#if EV_VERIFY
2008static void noinline 2122static void noinline ecb_cold
2009verify_watcher (EV_P_ W w) 2123verify_watcher (EV_P_ W w)
2010{ 2124{
2011 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2125 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
2012 2126
2013 if (w->pending) 2127 if (w->pending)
2014 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2128 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
2015} 2129}
2016 2130
2017static void noinline 2131static void noinline ecb_cold
2018verify_heap (EV_P_ ANHE *heap, int N) 2132verify_heap (EV_P_ ANHE *heap, int N)
2019{ 2133{
2020 int i; 2134 int i;
2021 2135
2022 for (i = HEAP0; i < N + HEAP0; ++i) 2136 for (i = HEAP0; i < N + HEAP0; ++i)
… …
2027 2141
2028 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2142 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
2029 } 2143 }
2030} 2144}
2031 2145
2032static void noinline 2146static void noinline ecb_cold
2033array_verify (EV_P_ W *ws, int cnt) 2147array_verify (EV_P_ W *ws, int cnt)
2034{ 2148{
2035 while (cnt--) 2149 while (cnt--)
2036 { 2150 {
2037 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2151 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
… …
2039 } 2153 }
2040} 2154}
2041#endif 2155#endif
2042 2156
2043#if EV_FEATURE_API 2157#if EV_FEATURE_API
2044void 2158void ecb_cold
2045ev_verify (EV_P) 2159ev_verify (EV_P)
2046{ 2160{
2047#if EV_VERIFY 2161#if EV_VERIFY
2048 int i; 2162 int i;
2049 WL w; 2163 WL w;
… …
2115#endif 2229#endif
2116} 2230}
2117#endif 2231#endif
2118 2232
2119#if EV_MULTIPLICITY 2233#if EV_MULTIPLICITY
2120struct ev_loop * 2234struct ev_loop * ecb_cold
2121#else 2235#else
2122int 2236int
2123#endif 2237#endif
2124ev_default_loop (unsigned int flags) 2238ev_default_loop (unsigned int flags)
2125{ 2239{
… …
2324 } 2438 }
2325} 2439}
2326 2440
2327/* simply recalculate all periodics */ 2441/* simply recalculate all periodics */
2328/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2442/* TODO: maybe ensure that at least one event happens when jumping forward? */
2329static void noinline 2443static void noinline ecb_cold
2330periodics_reschedule (EV_P) 2444periodics_reschedule (EV_P)
2331{ 2445{
2332 int i; 2446 int i;
2333 2447
2334 /* adjust periodics after time jump */ 2448 /* adjust periodics after time jump */
… …
2347 reheap (periodics, periodiccnt); 2461 reheap (periodics, periodiccnt);
2348} 2462}
2349#endif 2463#endif
2350 2464
2351/* adjust all timers by a given offset */ 2465/* adjust all timers by a given offset */
2352static void noinline 2466static void noinline ecb_cold
2353timers_reschedule (EV_P_ ev_tstamp adjust) 2467timers_reschedule (EV_P_ ev_tstamp adjust)
2354{ 2468{
2355 int i; 2469 int i;
2356 2470
2357 for (i = 0; i < timercnt; ++i) 2471 for (i = 0; i < timercnt; ++i)
… …
2499 ev_tstamp prev_mn_now = mn_now; 2613 ev_tstamp prev_mn_now = mn_now;
2500 2614
2501 /* update time to cancel out callback processing overhead */ 2615 /* update time to cancel out callback processing overhead */
2502 time_update (EV_A_ 1e100); 2616 time_update (EV_A_ 1e100);
2503 2617
2618 /* from now on, we want a pipe-wake-up */
2619 pipe_write_wanted = 1;
2620
2621 ECB_MEMORY_FENCE;
2622
2504 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2623 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2505 { 2624 {
2506 waittime = MAX_BLOCKTIME; 2625 waittime = MAX_BLOCKTIME;
2507 2626
2508 if (timercnt) 2627 if (timercnt)
2509 { 2628 {
2510 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_mintime; 2629 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2511 if (waittime > to) waittime = to; 2630 if (waittime > to) waittime = to;
2512 } 2631 }
2513 2632
2514#if EV_PERIODIC_ENABLE 2633#if EV_PERIODIC_ENABLE
2515 if (periodiccnt) 2634 if (periodiccnt)
2516 { 2635 {
2517 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_mintime; 2636 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2518 if (waittime > to) waittime = to; 2637 if (waittime > to) waittime = to;
2519 } 2638 }
2520#endif 2639#endif
2521 2640
2522 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2641 /* don't let timeouts decrease the waittime below timeout_blocktime */
2523 if (expect_false (waittime < timeout_blocktime)) 2642 if (expect_false (waittime < timeout_blocktime))
2524 waittime = timeout_blocktime; 2643 waittime = timeout_blocktime;
2644
2645 /* at this point, we NEED to wait, so we have to ensure */
2646 /* to pass a minimum nonzero value to the backend */
2647 if (expect_false (waittime < backend_mintime))
2648 waittime = backend_mintime;
2525 2649
2526 /* extra check because io_blocktime is commonly 0 */ 2650 /* extra check because io_blocktime is commonly 0 */
2527 if (expect_false (io_blocktime)) 2651 if (expect_false (io_blocktime))
2528 { 2652 {
2529 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2653 sleeptime = io_blocktime - (mn_now - prev_mn_now);
… …
2543 ++loop_count; 2667 ++loop_count;
2544#endif 2668#endif
2545 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2669 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2546 backend_poll (EV_A_ waittime); 2670 backend_poll (EV_A_ waittime);
2547 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2671 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2672
2673 pipe_write_wanted = 0;
2674
2675 if (pipe_write_skipped)
2676 {
2677 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2678 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2679 }
2680
2548 2681
2549 /* update ev_rt_now, do magic */ 2682 /* update ev_rt_now, do magic */
2550 time_update (EV_A_ waittime + sleeptime); 2683 time_update (EV_A_ waittime + sleeptime);
2551 } 2684 }
2552 2685
… …
3206 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3339 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3207 ofs += sizeof (struct inotify_event) + ev->len; 3340 ofs += sizeof (struct inotify_event) + ev->len;
3208 } 3341 }
3209} 3342}
3210 3343
3211inline_size void 3344inline_size void ecb_cold
3212ev_check_2625 (EV_P) 3345ev_check_2625 (EV_P)
3213{ 3346{
3214 /* kernels < 2.6.25 are borked 3347 /* kernels < 2.6.25 are borked
3215 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3348 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3216 */ 3349 */
… …
3841} 3974}
3842 3975
3843/*****************************************************************************/ 3976/*****************************************************************************/
3844 3977
3845#if EV_WALK_ENABLE 3978#if EV_WALK_ENABLE
3846void 3979void ecb_cold
3847ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3980ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3848{ 3981{
3849 int i, j; 3982 int i, j;
3850 ev_watcher_list *wl, *wn; 3983 ev_watcher_list *wl, *wn;
3851 3984

Diff Legend

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