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

Comparing libev/ev.c (file contents):
Revision 1.377 by root, Wed Jun 8 13:11:55 2011 UTC vs.
Revision 1.385 by root, Wed Jul 20 01:04:03 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 defined(_WIN32) && defined(MemoryBarrier)
517 #define ECB_MEMORY_FENCE MemoryBarrier ()
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
520 #endif
521#endif
522
523#ifndef ECB_MEMORY_FENCE
524 #include <pthread.h>
525
526 static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
527 #define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
528 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
529 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
530#endif
531
532#if ECB_GCC_VERSION(3,1)
533 #define ecb_attribute(attrlist) __attribute__(attrlist)
534 #define ecb_is_constant(expr) __builtin_constant_p (expr)
535 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
536 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
537#else
538 #define ecb_attribute(attrlist)
539 #define ecb_is_constant(expr) 0
540 #define ecb_expect(expr,value) (expr)
541 #define ecb_prefetch(addr,rw,locality)
542#endif
543
544#define ecb_noinline ecb_attribute ((__noinline__))
545#define ecb_noreturn ecb_attribute ((__noreturn__))
546#define ecb_unused ecb_attribute ((__unused__))
547#define ecb_const ecb_attribute ((__const__))
548#define ecb_pure ecb_attribute ((__pure__))
549
550#if ECB_GCC_VERSION(4,3)
551 #define ecb_artificial ecb_attribute ((__artificial__))
552 #define ecb_hot ecb_attribute ((__hot__))
553 #define ecb_cold ecb_attribute ((__cold__))
554#else
555 #define ecb_artificial
556 #define ecb_hot
557 #define ecb_cold
558#endif
559
560/* put around conditional expressions if you are very sure that the */
561/* expression is mostly true or mostly false. note that these return */
562/* booleans, not the expression. */
480#define expect_false(expr) expect ((expr) != 0, 0) 563#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
481#define expect_true(expr) expect ((expr) != 0, 1) 564#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
565/* ecb.h end */
566
567#define expect_false(cond) ecb_expect_false (cond)
568#define expect_true(cond) ecb_expect_true (cond)
569#define noinline ecb_noinline
570
482#define inline_size static inline 571#define inline_size ecb_inline
483 572
484#if EV_FEATURE_CODE 573#if EV_FEATURE_CODE
485# define inline_speed static inline 574# define inline_speed ecb_inline
486#else 575#else
487# define inline_speed static noinline 576# define inline_speed static noinline
488#endif 577#endif
489 578
490#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 579#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
581 670
582#ifdef __linux 671#ifdef __linux
583# include <sys/utsname.h> 672# include <sys/utsname.h>
584#endif 673#endif
585 674
586static unsigned int noinline 675static unsigned int noinline ecb_cold
587ev_linux_version (void) 676ev_linux_version (void)
588{ 677{
589#ifdef __linux 678#ifdef __linux
590 unsigned int v = 0; 679 unsigned int v = 0;
591 struct utsname buf; 680 struct utsname buf;
620} 709}
621 710
622/*****************************************************************************/ 711/*****************************************************************************/
623 712
624#if EV_AVOID_STDIO 713#if EV_AVOID_STDIO
625static void noinline 714static void noinline ecb_cold
626ev_printerr (const char *msg) 715ev_printerr (const char *msg)
627{ 716{
628 write (STDERR_FILENO, msg, strlen (msg)); 717 write (STDERR_FILENO, msg, strlen (msg));
629} 718}
630#endif 719#endif
631 720
632static void (*syserr_cb)(const char *msg); 721static void (*syserr_cb)(const char *msg);
633 722
634void 723void ecb_cold
635ev_set_syserr_cb (void (*cb)(const char *msg)) 724ev_set_syserr_cb (void (*cb)(const char *msg))
636{ 725{
637 syserr_cb = cb; 726 syserr_cb = cb;
638} 727}
639 728
640static void noinline 729static void noinline ecb_cold
641ev_syserr (const char *msg) 730ev_syserr (const char *msg)
642{ 731{
643 if (!msg) 732 if (!msg)
644 msg = "(libev) system error"; 733 msg = "(libev) system error";
645 734
678#endif 767#endif
679} 768}
680 769
681static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 770static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
682 771
683void 772void ecb_cold
684ev_set_allocator (void *(*cb)(void *ptr, long size)) 773ev_set_allocator (void *(*cb)(void *ptr, long size))
685{ 774{
686 alloc = cb; 775 alloc = cb;
687} 776}
688 777
897 } 986 }
898 987
899 return ncur; 988 return ncur;
900} 989}
901 990
902static noinline void * 991static void * noinline ecb_cold
903array_realloc (int elem, void *base, int *cur, int cnt) 992array_realloc (int elem, void *base, int *cur, int cnt)
904{ 993{
905 *cur = array_nextsize (elem, *cur, cnt); 994 *cur = array_nextsize (elem, *cur, cnt);
906 return ev_realloc (base, elem * *cur); 995 return ev_realloc (base, elem * *cur);
907} 996}
910 memset ((void *)(base), 0, sizeof (*(base)) * (count)) 999 memset ((void *)(base), 0, sizeof (*(base)) * (count))
911 1000
912#define array_needsize(type,base,cur,cnt,init) \ 1001#define array_needsize(type,base,cur,cnt,init) \
913 if (expect_false ((cnt) > (cur))) \ 1002 if (expect_false ((cnt) > (cur))) \
914 { \ 1003 { \
915 int ocur_ = (cur); \ 1004 int ecb_unused ocur_ = (cur); \
916 (base) = (type *)array_realloc \ 1005 (base) = (type *)array_realloc \
917 (sizeof (type), (base), &(cur), (cnt)); \ 1006 (sizeof (type), (base), &(cur), (cnt)); \
918 init ((base) + (ocur_), (cur) - ocur_); \ 1007 init ((base) + (ocur_), (cur) - ocur_); \
919 } 1008 }
920 1009
1090 fdchanges [fdchangecnt - 1] = fd; 1179 fdchanges [fdchangecnt - 1] = fd;
1091 } 1180 }
1092} 1181}
1093 1182
1094/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1183/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1095inline_speed void 1184inline_speed void ecb_cold
1096fd_kill (EV_P_ int fd) 1185fd_kill (EV_P_ int fd)
1097{ 1186{
1098 ev_io *w; 1187 ev_io *w;
1099 1188
1100 while ((w = (ev_io *)anfds [fd].head)) 1189 while ((w = (ev_io *)anfds [fd].head))
1103 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1192 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1104 } 1193 }
1105} 1194}
1106 1195
1107/* check whether the given fd is actually valid, for error recovery */ 1196/* check whether the given fd is actually valid, for error recovery */
1108inline_size int 1197inline_size int ecb_cold
1109fd_valid (int fd) 1198fd_valid (int fd)
1110{ 1199{
1111#ifdef _WIN32 1200#ifdef _WIN32
1112 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1201 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1113#else 1202#else
1114 return fcntl (fd, F_GETFD) != -1; 1203 return fcntl (fd, F_GETFD) != -1;
1115#endif 1204#endif
1116} 1205}
1117 1206
1118/* called on EBADF to verify fds */ 1207/* called on EBADF to verify fds */
1119static void noinline 1208static void noinline ecb_cold
1120fd_ebadf (EV_P) 1209fd_ebadf (EV_P)
1121{ 1210{
1122 int fd; 1211 int fd;
1123 1212
1124 for (fd = 0; fd < anfdmax; ++fd) 1213 for (fd = 0; fd < anfdmax; ++fd)
1126 if (!fd_valid (fd) && errno == EBADF) 1215 if (!fd_valid (fd) && errno == EBADF)
1127 fd_kill (EV_A_ fd); 1216 fd_kill (EV_A_ fd);
1128} 1217}
1129 1218
1130/* called on ENOMEM in select/poll to kill some fds and retry */ 1219/* called on ENOMEM in select/poll to kill some fds and retry */
1131static void noinline 1220static void noinline ecb_cold
1132fd_enomem (EV_P) 1221fd_enomem (EV_P)
1133{ 1222{
1134 int fd; 1223 int fd;
1135 1224
1136 for (fd = anfdmax; fd--; ) 1225 for (fd = anfdmax; fd--; )
1331 1420
1332/*****************************************************************************/ 1421/*****************************************************************************/
1333 1422
1334#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1423#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1335 1424
1336static void noinline 1425static void noinline ecb_cold
1337evpipe_init (EV_P) 1426evpipe_init (EV_P)
1338{ 1427{
1339 if (!ev_is_active (&pipe_w)) 1428 if (!ev_is_active (&pipe_w))
1340 { 1429 {
1341# if EV_USE_EVENTFD 1430# if EV_USE_EVENTFD
1363 ev_io_start (EV_A_ &pipe_w); 1452 ev_io_start (EV_A_ &pipe_w);
1364 ev_unref (EV_A); /* watcher should not keep loop alive */ 1453 ev_unref (EV_A); /* watcher should not keep loop alive */
1365 } 1454 }
1366} 1455}
1367 1456
1368inline_size void 1457inline_speed void
1369evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1458evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1370{ 1459{
1371 if (!*flag) 1460 if (expect_true (*flag))
1461 /*return*//*D*/;
1462
1463 *flag = 1;
1464
1465 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1466
1467 pipe_write_skipped = 1;
1468
1469 ECB_MEMORY_FENCE; /* make sure pipe_write_skipped is visible before we check pipe_write_wanted */
1470
1471 if (pipe_write_wanted)
1372 { 1472 {
1473 int old_errno;
1474
1475 pipe_write_skipped = 0; /* just an optimsiation, no fence needed */
1476
1373 int old_errno = errno; /* save errno because write might clobber it */ 1477 old_errno = errno; /* save errno because write will clobber it */
1374 char dummy;
1375
1376 *flag = 1;
1377 1478
1378#if EV_USE_EVENTFD 1479#if EV_USE_EVENTFD
1379 if (evfd >= 0) 1480 if (evfd >= 0)
1380 { 1481 {
1381 uint64_t counter = 1; 1482 uint64_t counter = 1;
1382 write (evfd, &counter, sizeof (uint64_t)); 1483 write (evfd, &counter, sizeof (uint64_t));
1383 } 1484 }
1384 else 1485 else
1385#endif 1486#endif
1487 {
1386 /* win32 people keep sending patches that change this write() to send() */ 1488 /* 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 */ 1489 /* 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 */ 1490 /* 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 */ 1491 /* where your send() is from - it's definitely not the microsoft send, and */
1390 /* tell me. thank you. */ 1492 /* tell me. thank you. */
1391 write (evpipe [1], &dummy, 1); 1493 write (evpipe [1], &(evpipe [1]), 1);
1494 }
1392 1495
1393 errno = old_errno; 1496 errno = old_errno;
1394 } 1497 }
1395} 1498}
1396 1499
1399static void 1502static void
1400pipecb (EV_P_ ev_io *iow, int revents) 1503pipecb (EV_P_ ev_io *iow, int revents)
1401{ 1504{
1402 int i; 1505 int i;
1403 1506
1507 if (revents & EV_READ)
1508 {
1404#if EV_USE_EVENTFD 1509#if EV_USE_EVENTFD
1405 if (evfd >= 0) 1510 if (evfd >= 0)
1406 { 1511 {
1407 uint64_t counter; 1512 uint64_t counter;
1408 read (evfd, &counter, sizeof (uint64_t)); 1513 read (evfd, &counter, sizeof (uint64_t));
1409 } 1514 }
1410 else 1515 else
1411#endif 1516#endif
1412 { 1517 {
1413 char dummy; 1518 char dummy;
1414 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1519 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1415 read (evpipe [0], &dummy, 1); 1520 read (evpipe [0], &dummy, 1);
1521 }
1416 } 1522 }
1523
1524 pipe_write_skipped = 0;
1417 1525
1418#if EV_SIGNAL_ENABLE 1526#if EV_SIGNAL_ENABLE
1419 if (sig_pending) 1527 if (sig_pending)
1420 { 1528 {
1421 sig_pending = 0; 1529 sig_pending = 0;
1450 EV_P = signals [signum - 1].loop; 1558 EV_P = signals [signum - 1].loop;
1451 1559
1452 if (!EV_A) 1560 if (!EV_A)
1453 return; 1561 return;
1454#endif 1562#endif
1563
1564 if (!ev_active (&pipe_w))
1565 return;
1455 1566
1456 signals [signum - 1].pending = 1; 1567 signals [signum - 1].pending = 1;
1457 evpipe_write (EV_A_ &sig_pending); 1568 evpipe_write (EV_A_ &sig_pending);
1458} 1569}
1459 1570
1591#endif 1702#endif
1592#if EV_USE_SELECT 1703#if EV_USE_SELECT
1593# include "ev_select.c" 1704# include "ev_select.c"
1594#endif 1705#endif
1595 1706
1596int 1707int ecb_cold
1597ev_version_major (void) 1708ev_version_major (void)
1598{ 1709{
1599 return EV_VERSION_MAJOR; 1710 return EV_VERSION_MAJOR;
1600} 1711}
1601 1712
1602int 1713int ecb_cold
1603ev_version_minor (void) 1714ev_version_minor (void)
1604{ 1715{
1605 return EV_VERSION_MINOR; 1716 return EV_VERSION_MINOR;
1606} 1717}
1607 1718
1608/* return true if we are running with elevated privileges and should ignore env variables */ 1719/* return true if we are running with elevated privileges and should ignore env variables */
1609int inline_size 1720int inline_size ecb_cold
1610enable_secure (void) 1721enable_secure (void)
1611{ 1722{
1612#ifdef _WIN32 1723#ifdef _WIN32
1613 return 0; 1724 return 0;
1614#else 1725#else
1615 return getuid () != geteuid () 1726 return getuid () != geteuid ()
1616 || getgid () != getegid (); 1727 || getgid () != getegid ();
1617#endif 1728#endif
1618} 1729}
1619 1730
1620unsigned int 1731unsigned int ecb_cold
1621ev_supported_backends (void) 1732ev_supported_backends (void)
1622{ 1733{
1623 unsigned int flags = 0; 1734 unsigned int flags = 0;
1624 1735
1625 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1736 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
1629 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1740 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1630 1741
1631 return flags; 1742 return flags;
1632} 1743}
1633 1744
1634unsigned int 1745unsigned int ecb_cold
1635ev_recommended_backends (void) 1746ev_recommended_backends (void)
1636{ 1747{
1637 unsigned int flags = ev_supported_backends (); 1748 unsigned int flags = ev_supported_backends ();
1638 1749
1639#ifndef __NetBSD__ 1750#ifndef __NetBSD__
1651#endif 1762#endif
1652 1763
1653 return flags; 1764 return flags;
1654} 1765}
1655 1766
1656unsigned int 1767unsigned int ecb_cold
1657ev_embeddable_backends (void) 1768ev_embeddable_backends (void)
1658{ 1769{
1659 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1770 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1660 1771
1661 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1772 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1706ev_userdata (EV_P) 1817ev_userdata (EV_P)
1707{ 1818{
1708 return userdata; 1819 return userdata;
1709} 1820}
1710 1821
1822void
1711void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1823ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1712{ 1824{
1713 invoke_cb = invoke_pending_cb; 1825 invoke_cb = invoke_pending_cb;
1714} 1826}
1715 1827
1828void
1716void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1829ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1717{ 1830{
1718 release_cb = release; 1831 release_cb = release;
1719 acquire_cb = acquire; 1832 acquire_cb = acquire;
1720} 1833}
1721#endif 1834#endif
1722 1835
1723/* initialise a loop structure, must be zero-initialised */ 1836/* initialise a loop structure, must be zero-initialised */
1724static void noinline 1837static void noinline ecb_cold
1725loop_init (EV_P_ unsigned int flags) 1838loop_init (EV_P_ unsigned int flags)
1726{ 1839{
1727 if (!backend) 1840 if (!backend)
1728 { 1841 {
1729 origflags = flags; 1842 origflags = flags;
1757 if (!(flags & EVFLAG_NOENV) 1870 if (!(flags & EVFLAG_NOENV)
1758 && !enable_secure () 1871 && !enable_secure ()
1759 && getenv ("LIBEV_FLAGS")) 1872 && getenv ("LIBEV_FLAGS"))
1760 flags = atoi (getenv ("LIBEV_FLAGS")); 1873 flags = atoi (getenv ("LIBEV_FLAGS"));
1761 1874
1762 ev_rt_now = ev_time (); 1875 ev_rt_now = ev_time ();
1763 mn_now = get_clock (); 1876 mn_now = get_clock ();
1764 now_floor = mn_now; 1877 now_floor = mn_now;
1765 rtmn_diff = ev_rt_now - mn_now; 1878 rtmn_diff = ev_rt_now - mn_now;
1766#if EV_FEATURE_API 1879#if EV_FEATURE_API
1767 invoke_cb = ev_invoke_pending; 1880 invoke_cb = ev_invoke_pending;
1768#endif 1881#endif
1769 1882
1770 io_blocktime = 0.; 1883 io_blocktime = 0.;
1771 timeout_blocktime = 0.; 1884 timeout_blocktime = 0.;
1772 backend = 0; 1885 backend = 0;
1773 backend_fd = -1; 1886 backend_fd = -1;
1774 sig_pending = 0; 1887 sig_pending = 0;
1775#if EV_ASYNC_ENABLE 1888#if EV_ASYNC_ENABLE
1776 async_pending = 0; 1889 async_pending = 0;
1777#endif 1890#endif
1891 pipe_write_skipped = 0;
1892 pipe_write_wanted = 0;
1778#if EV_USE_INOTIFY 1893#if EV_USE_INOTIFY
1779 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1894 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1780#endif 1895#endif
1781#if EV_USE_SIGNALFD 1896#if EV_USE_SIGNALFD
1782 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1897 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1783#endif 1898#endif
1784 1899
1785 if (!(flags & EVBACKEND_MASK)) 1900 if (!(flags & EVBACKEND_MASK))
1786 flags |= ev_recommended_backends (); 1901 flags |= ev_recommended_backends ();
1787 1902
1812#endif 1927#endif
1813 } 1928 }
1814} 1929}
1815 1930
1816/* free up a loop structure */ 1931/* free up a loop structure */
1817void 1932void ecb_cold
1818ev_loop_destroy (EV_P) 1933ev_loop_destroy (EV_P)
1819{ 1934{
1820 int i; 1935 int i;
1821 1936
1822#if EV_MULTIPLICITY 1937#if EV_MULTIPLICITY
1952 infy_fork (EV_A); 2067 infy_fork (EV_A);
1953#endif 2068#endif
1954 2069
1955 if (ev_is_active (&pipe_w)) 2070 if (ev_is_active (&pipe_w))
1956 { 2071 {
1957 /* this "locks" the handlers against writing to the pipe */ 2072 /* 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 2073
1964 ev_ref (EV_A); 2074 ev_ref (EV_A);
1965 ev_io_stop (EV_A_ &pipe_w); 2075 ev_io_stop (EV_A_ &pipe_w);
1966 2076
1967#if EV_USE_EVENTFD 2077#if EV_USE_EVENTFD
1985 postfork = 0; 2095 postfork = 0;
1986} 2096}
1987 2097
1988#if EV_MULTIPLICITY 2098#if EV_MULTIPLICITY
1989 2099
1990struct ev_loop * 2100struct ev_loop * ecb_cold
1991ev_loop_new (unsigned int flags) 2101ev_loop_new (unsigned int flags)
1992{ 2102{
1993 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2103 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1994 2104
1995 memset (EV_A, 0, sizeof (struct ev_loop)); 2105 memset (EV_A, 0, sizeof (struct ev_loop));
2003} 2113}
2004 2114
2005#endif /* multiplicity */ 2115#endif /* multiplicity */
2006 2116
2007#if EV_VERIFY 2117#if EV_VERIFY
2008static void noinline 2118static void noinline ecb_cold
2009verify_watcher (EV_P_ W w) 2119verify_watcher (EV_P_ W w)
2010{ 2120{
2011 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2121 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
2012 2122
2013 if (w->pending) 2123 if (w->pending)
2014 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2124 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
2015} 2125}
2016 2126
2017static void noinline 2127static void noinline ecb_cold
2018verify_heap (EV_P_ ANHE *heap, int N) 2128verify_heap (EV_P_ ANHE *heap, int N)
2019{ 2129{
2020 int i; 2130 int i;
2021 2131
2022 for (i = HEAP0; i < N + HEAP0; ++i) 2132 for (i = HEAP0; i < N + HEAP0; ++i)
2027 2137
2028 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2138 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
2029 } 2139 }
2030} 2140}
2031 2141
2032static void noinline 2142static void noinline ecb_cold
2033array_verify (EV_P_ W *ws, int cnt) 2143array_verify (EV_P_ W *ws, int cnt)
2034{ 2144{
2035 while (cnt--) 2145 while (cnt--)
2036 { 2146 {
2037 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2147 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
2039 } 2149 }
2040} 2150}
2041#endif 2151#endif
2042 2152
2043#if EV_FEATURE_API 2153#if EV_FEATURE_API
2044void 2154void ecb_cold
2045ev_verify (EV_P) 2155ev_verify (EV_P)
2046{ 2156{
2047#if EV_VERIFY 2157#if EV_VERIFY
2048 int i; 2158 int i;
2049 WL w; 2159 WL w;
2115#endif 2225#endif
2116} 2226}
2117#endif 2227#endif
2118 2228
2119#if EV_MULTIPLICITY 2229#if EV_MULTIPLICITY
2120struct ev_loop * 2230struct ev_loop * ecb_cold
2121#else 2231#else
2122int 2232int
2123#endif 2233#endif
2124ev_default_loop (unsigned int flags) 2234ev_default_loop (unsigned int flags)
2125{ 2235{
2324 } 2434 }
2325} 2435}
2326 2436
2327/* simply recalculate all periodics */ 2437/* simply recalculate all periodics */
2328/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2438/* TODO: maybe ensure that at least one event happens when jumping forward? */
2329static void noinline 2439static void noinline ecb_cold
2330periodics_reschedule (EV_P) 2440periodics_reschedule (EV_P)
2331{ 2441{
2332 int i; 2442 int i;
2333 2443
2334 /* adjust periodics after time jump */ 2444 /* adjust periodics after time jump */
2347 reheap (periodics, periodiccnt); 2457 reheap (periodics, periodiccnt);
2348} 2458}
2349#endif 2459#endif
2350 2460
2351/* adjust all timers by a given offset */ 2461/* adjust all timers by a given offset */
2352static void noinline 2462static void noinline ecb_cold
2353timers_reschedule (EV_P_ ev_tstamp adjust) 2463timers_reschedule (EV_P_ ev_tstamp adjust)
2354{ 2464{
2355 int i; 2465 int i;
2356 2466
2357 for (i = 0; i < timercnt; ++i) 2467 for (i = 0; i < timercnt; ++i)
2499 ev_tstamp prev_mn_now = mn_now; 2609 ev_tstamp prev_mn_now = mn_now;
2500 2610
2501 /* update time to cancel out callback processing overhead */ 2611 /* update time to cancel out callback processing overhead */
2502 time_update (EV_A_ 1e100); 2612 time_update (EV_A_ 1e100);
2503 2613
2614 /* from now on, we want a pipe-wake-up */
2615 pipe_write_wanted = 1;
2616
2617 ECB_MEMORY_FENCE; /* amke sure pipe_write_wanted is visible before we check for potential skips */
2618
2504 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2619 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2505 { 2620 {
2506 waittime = MAX_BLOCKTIME; 2621 waittime = MAX_BLOCKTIME;
2507 2622
2508 if (timercnt) 2623 if (timercnt)
2509 { 2624 {
2548 ++loop_count; 2663 ++loop_count;
2549#endif 2664#endif
2550 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2665 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2551 backend_poll (EV_A_ waittime); 2666 backend_poll (EV_A_ waittime);
2552 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2667 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2668
2669 pipe_write_wanted = 0; /* just an optimsiation, no fence needed */
2670
2671 if (pipe_write_skipped)
2672 {
2673 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2674 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2675 }
2676
2553 2677
2554 /* update ev_rt_now, do magic */ 2678 /* update ev_rt_now, do magic */
2555 time_update (EV_A_ waittime + sleeptime); 2679 time_update (EV_A_ waittime + sleeptime);
2556 } 2680 }
2557 2681
3211 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3335 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3212 ofs += sizeof (struct inotify_event) + ev->len; 3336 ofs += sizeof (struct inotify_event) + ev->len;
3213 } 3337 }
3214} 3338}
3215 3339
3216inline_size void 3340inline_size void ecb_cold
3217ev_check_2625 (EV_P) 3341ev_check_2625 (EV_P)
3218{ 3342{
3219 /* kernels < 2.6.25 are borked 3343 /* kernels < 2.6.25 are borked
3220 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3344 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3221 */ 3345 */
3846} 3970}
3847 3971
3848/*****************************************************************************/ 3972/*****************************************************************************/
3849 3973
3850#if EV_WALK_ENABLE 3974#if EV_WALK_ENABLE
3851void 3975void ecb_cold
3852ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3976ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3853{ 3977{
3854 int i, j; 3978 int i, j;
3855 ev_watcher_list *wl, *wn; 3979 ev_watcher_list *wl, *wn;
3856 3980

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines