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

Comparing libev/ev.c (file contents):
Revision 1.372 by root, Wed Feb 16 08:02:50 2011 UTC vs.
Revision 1.379 by root, Sun Jun 19 17:55:13 2011 UTC

… …
43# include EV_CONFIG_H 43# include EV_CONFIG_H
44# else 44# else
45# include "config.h" 45# include "config.h"
46# endif 46# endif
47 47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
53
48# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
49# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
50# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
51# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
52# define EV_USE_REALTIME 0 58# define EV_USE_REALTIME 0
… …
156# define EV_USE_EVENTFD 0 162# define EV_USE_EVENTFD 0
157# endif 163# endif
158 164
159#endif 165#endif
160 166
161#include <math.h>
162#include <stdlib.h> 167#include <stdlib.h>
163#include <string.h> 168#include <string.h>
164#include <fcntl.h> 169#include <fcntl.h>
165#include <stddef.h> 170#include <stddef.h>
166 171
… …
232/* to make it compile regardless, just remove the above line, */ 237/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */ 238/* but consider reporting it, too! :) */
234# define EV_NSIG 65 239# define EV_NSIG 65
235#endif 240#endif
236 241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
245
237#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
238# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
240# else 249# else
241# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
… …
443#else 452#else
444# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
445#endif 454#endif
446 455
447/* 456/*
448 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
449 * It is added to ev_rt_now when scheduling periodics
450 * to ensure progress, time-wise, even when rounding
451 * errors are against us.
452 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
453 * Better solutions welcome.
454 */ 459 */
455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
456 462
457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
458#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) */
459 465
460#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)
461#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)
462 468
463#if __GNUC__ >= 4 469/* the following are taken from libecb */
464# define expect(expr,value) __builtin_expect ((expr),(value)) 470/* ecb.h start */
465# 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
466#else 493#else
467# define expect(expr,value) (expr) 494 #define ecb_inline static
468# define noinline
469# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
470# define inline
471# endif 495#endif
472#endif
473 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. */
474#define expect_false(expr) expect ((expr) != 0, 0) 528#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
475#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
476#define inline_size static inline 536#define inline_size ecb_inline
477 537
478#if EV_FEATURE_CODE 538#if EV_FEATURE_CODE
479# define inline_speed static inline 539# define inline_speed ecb_inline
480#else 540#else
481# define inline_speed static noinline 541# define inline_speed static noinline
482#endif 542#endif
483 543
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 544#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
… …
523# include "ev_win32.c" 583# include "ev_win32.c"
524#endif 584#endif
525 585
526/*****************************************************************************/ 586/*****************************************************************************/
527 587
588/* define a suitable floor function (only used by periodics atm) */
589
590#if EV_USE_FLOOR
591# include <math.h>
592# define ev_floor(v) floor (v)
593#else
594
595#include <float.h>
596
597/* a floor() replacement function, should be independent of ev_tstamp type */
598static ev_tstamp noinline
599ev_floor (ev_tstamp v)
600{
601 /* the choice of shift factor is not terribly important */
602#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
603 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
604#else
605 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
606#endif
607
608 /* argument too large for an unsigned long? */
609 if (expect_false (v >= shift))
610 {
611 ev_tstamp f;
612
613 if (v == v - 1.)
614 return v; /* very large number */
615
616 f = shift * ev_floor (v * (1. / shift));
617 return f + ev_floor (v - f);
618 }
619
620 /* special treatment for negative args? */
621 if (expect_false (v < 0.))
622 {
623 ev_tstamp f = -ev_floor (-v);
624
625 return f - (f == v ? 0 : 1);
626 }
627
628 /* fits into an unsigned long */
629 return (unsigned long)v;
630}
631
632#endif
633
634/*****************************************************************************/
635
528#ifdef __linux 636#ifdef __linux
529# include <sys/utsname.h> 637# include <sys/utsname.h>
530#endif 638#endif
531 639
532static unsigned int noinline 640static unsigned int noinline ecb_cold
533ev_linux_version (void) 641ev_linux_version (void)
534{ 642{
535#ifdef __linux 643#ifdef __linux
536 unsigned int v = 0; 644 unsigned int v = 0;
537 struct utsname buf; 645 struct utsname buf;
… …
566} 674}
567 675
568/*****************************************************************************/ 676/*****************************************************************************/
569 677
570#if EV_AVOID_STDIO 678#if EV_AVOID_STDIO
571static void noinline 679static void noinline ecb_cold
572ev_printerr (const char *msg) 680ev_printerr (const char *msg)
573{ 681{
574 write (STDERR_FILENO, msg, strlen (msg)); 682 write (STDERR_FILENO, msg, strlen (msg));
575} 683}
576#endif 684#endif
577 685
578static void (*syserr_cb)(const char *msg); 686static void (*syserr_cb)(const char *msg);
579 687
580void 688void ecb_cold
581ev_set_syserr_cb (void (*cb)(const char *msg)) 689ev_set_syserr_cb (void (*cb)(const char *msg))
582{ 690{
583 syserr_cb = cb; 691 syserr_cb = cb;
584} 692}
585 693
586static void noinline 694static void noinline ecb_cold
587ev_syserr (const char *msg) 695ev_syserr (const char *msg)
588{ 696{
589 if (!msg) 697 if (!msg)
590 msg = "(libev) system error"; 698 msg = "(libev) system error";
591 699
… …
624#endif 732#endif
625} 733}
626 734
627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 735static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
628 736
629void 737void ecb_cold
630ev_set_allocator (void *(*cb)(void *ptr, long size)) 738ev_set_allocator (void *(*cb)(void *ptr, long size))
631{ 739{
632 alloc = cb; 740 alloc = cb;
633} 741}
634 742
… …
816 select (0, 0, 0, 0, &tv); 924 select (0, 0, 0, 0, &tv);
817#endif 925#endif
818 } 926 }
819} 927}
820 928
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
829/*****************************************************************************/ 929/*****************************************************************************/
830 930
831#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 */
832 932
833/* find a suitable new size for the given array, */ 933/* find a suitable new size for the given array, */
… …
851 } 951 }
852 952
853 return ncur; 953 return ncur;
854} 954}
855 955
856static noinline void * 956static void * noinline ecb_cold
857array_realloc (int elem, void *base, int *cur, int cnt) 957array_realloc (int elem, void *base, int *cur, int cnt)
858{ 958{
859 *cur = array_nextsize (elem, *cur, cnt); 959 *cur = array_nextsize (elem, *cur, cnt);
860 return ev_realloc (base, elem * *cur); 960 return ev_realloc (base, elem * *cur);
861} 961}
… …
980 for (i = 0; i < fdchangecnt; ++i) 1080 for (i = 0; i < fdchangecnt; ++i)
981 { 1081 {
982 int fd = fdchanges [i]; 1082 int fd = fdchanges [i];
983 ANFD *anfd = anfds + fd; 1083 ANFD *anfd = anfds + fd;
984 1084
985 if (anfd->reify & EV__IOFDSET) 1085 if (anfd->reify & EV__IOFDSET && anfd->head)
986 { 1086 {
987 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd); 1087 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
988 1088
989 if (handle != anfd->handle) 1089 if (handle != anfd->handle)
990 { 1090 {
… …
1044 fdchanges [fdchangecnt - 1] = fd; 1144 fdchanges [fdchangecnt - 1] = fd;
1045 } 1145 }
1046} 1146}
1047 1147
1048/* 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 */
1049inline_speed void 1149inline_speed void ecb_cold
1050fd_kill (EV_P_ int fd) 1150fd_kill (EV_P_ int fd)
1051{ 1151{
1052 ev_io *w; 1152 ev_io *w;
1053 1153
1054 while ((w = (ev_io *)anfds [fd].head)) 1154 while ((w = (ev_io *)anfds [fd].head))
… …
1057 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);
1058 } 1158 }
1059} 1159}
1060 1160
1061/* check whether the given fd is actually valid, for error recovery */ 1161/* check whether the given fd is actually valid, for error recovery */
1062inline_size int 1162inline_size int ecb_cold
1063fd_valid (int fd) 1163fd_valid (int fd)
1064{ 1164{
1065#ifdef _WIN32 1165#ifdef _WIN32
1066 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1166 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1067#else 1167#else
1068 return fcntl (fd, F_GETFD) != -1; 1168 return fcntl (fd, F_GETFD) != -1;
1069#endif 1169#endif
1070} 1170}
1071 1171
1072/* called on EBADF to verify fds */ 1172/* called on EBADF to verify fds */
1073static void noinline 1173static void noinline ecb_cold
1074fd_ebadf (EV_P) 1174fd_ebadf (EV_P)
1075{ 1175{
1076 int fd; 1176 int fd;
1077 1177
1078 for (fd = 0; fd < anfdmax; ++fd) 1178 for (fd = 0; fd < anfdmax; ++fd)
… …
1080 if (!fd_valid (fd) && errno == EBADF) 1180 if (!fd_valid (fd) && errno == EBADF)
1081 fd_kill (EV_A_ fd); 1181 fd_kill (EV_A_ fd);
1082} 1182}
1083 1183
1084/* 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 */
1085static void noinline 1185static void noinline ecb_cold
1086fd_enomem (EV_P) 1186fd_enomem (EV_P)
1087{ 1187{
1088 int fd; 1188 int fd;
1089 1189
1090 for (fd = anfdmax; fd--; ) 1190 for (fd = anfdmax; fd--; )
… …
1285 1385
1286/*****************************************************************************/ 1386/*****************************************************************************/
1287 1387
1288#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1388#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1289 1389
1290static void noinline 1390static void noinline ecb_cold
1291evpipe_init (EV_P) 1391evpipe_init (EV_P)
1292{ 1392{
1293 if (!ev_is_active (&pipe_w)) 1393 if (!ev_is_active (&pipe_w))
1294 { 1394 {
1295# if EV_USE_EVENTFD 1395# if EV_USE_EVENTFD
… …
1322inline_size void 1422inline_size void
1323evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1423evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1324{ 1424{
1325 if (!*flag) 1425 if (!*flag)
1326 { 1426 {
1327 int old_errno = errno; /* save errno because write might clobber it */
1328 char dummy;
1329
1330 *flag = 1; 1427 *flag = 1;
1331 1428
1429 pipe_write_skipped = 1;
1430
1431 if (pipe_write_wanted)
1432 {
1433 int old_errno = errno; /* save errno because write will clobber it */
1434 char dummy;
1435
1436 pipe_write_skipped = 0;
1437
1332#if EV_USE_EVENTFD 1438#if EV_USE_EVENTFD
1333 if (evfd >= 0) 1439 if (evfd >= 0)
1334 { 1440 {
1335 uint64_t counter = 1; 1441 uint64_t counter = 1;
1336 write (evfd, &counter, sizeof (uint64_t)); 1442 write (evfd, &counter, sizeof (uint64_t));
1443 }
1444 else
1445#endif
1446 {
1447 /* win32 people keep sending patches that change this write() to send() */
1448 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1449 /* so when you think this write should be a send instead, please find out */
1450 /* where your send() is from - it's definitely not the microsoft send, and */
1451 /* tell me. thank you. */
1452 write (evpipe [1], &dummy, 1);
1453 }
1454
1455 errno = old_errno;
1337 } 1456 }
1338 else
1339#endif
1340 /* win32 people keep sending patches that change this write() to send() */
1341 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1342 /* so when you think this write should be a send instead, please find out */
1343 /* where your send() is from - it's definitely not the microsoft send, and */
1344 /* tell me. thank you. */
1345 write (evpipe [1], &dummy, 1);
1346
1347 errno = old_errno;
1348 } 1457 }
1349} 1458}
1350 1459
1351/* called whenever the libev signal pipe */ 1460/* called whenever the libev signal pipe */
1352/* got some events (signal, async) */ 1461/* got some events (signal, async) */
1353static void 1462static void
1354pipecb (EV_P_ ev_io *iow, int revents) 1463pipecb (EV_P_ ev_io *iow, int revents)
1355{ 1464{
1356 int i; 1465 int i;
1357 1466
1467 if (revents & EV_READ)
1468 {
1358#if EV_USE_EVENTFD 1469#if EV_USE_EVENTFD
1359 if (evfd >= 0) 1470 if (evfd >= 0)
1360 { 1471 {
1361 uint64_t counter; 1472 uint64_t counter;
1362 read (evfd, &counter, sizeof (uint64_t)); 1473 read (evfd, &counter, sizeof (uint64_t));
1363 } 1474 }
1364 else 1475 else
1365#endif 1476#endif
1366 { 1477 {
1367 char dummy; 1478 char dummy;
1368 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1479 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1369 read (evpipe [0], &dummy, 1); 1480 read (evpipe [0], &dummy, 1);
1481 }
1370 } 1482 }
1483
1484 pipe_write_skipped = 0;
1371 1485
1372#if EV_SIGNAL_ENABLE 1486#if EV_SIGNAL_ENABLE
1373 if (sig_pending) 1487 if (sig_pending)
1374 { 1488 {
1375 sig_pending = 0; 1489 sig_pending = 0;
… …
1404 EV_P = signals [signum - 1].loop; 1518 EV_P = signals [signum - 1].loop;
1405 1519
1406 if (!EV_A) 1520 if (!EV_A)
1407 return; 1521 return;
1408#endif 1522#endif
1523
1524 evpipe_init (EV_A);
1409 1525
1410 signals [signum - 1].pending = 1; 1526 signals [signum - 1].pending = 1;
1411 evpipe_write (EV_A_ &sig_pending); 1527 evpipe_write (EV_A_ &sig_pending);
1412} 1528}
1413 1529
… …
1545#endif 1661#endif
1546#if EV_USE_SELECT 1662#if EV_USE_SELECT
1547# include "ev_select.c" 1663# include "ev_select.c"
1548#endif 1664#endif
1549 1665
1550int 1666int ecb_cold
1551ev_version_major (void) 1667ev_version_major (void)
1552{ 1668{
1553 return EV_VERSION_MAJOR; 1669 return EV_VERSION_MAJOR;
1554} 1670}
1555 1671
1556int 1672int ecb_cold
1557ev_version_minor (void) 1673ev_version_minor (void)
1558{ 1674{
1559 return EV_VERSION_MINOR; 1675 return EV_VERSION_MINOR;
1560} 1676}
1561 1677
1562/* return true if we are running with elevated privileges and should ignore env variables */ 1678/* return true if we are running with elevated privileges and should ignore env variables */
1563int inline_size 1679int inline_size ecb_cold
1564enable_secure (void) 1680enable_secure (void)
1565{ 1681{
1566#ifdef _WIN32 1682#ifdef _WIN32
1567 return 0; 1683 return 0;
1568#else 1684#else
1569 return getuid () != geteuid () 1685 return getuid () != geteuid ()
1570 || getgid () != getegid (); 1686 || getgid () != getegid ();
1571#endif 1687#endif
1572} 1688}
1573 1689
1574unsigned int 1690unsigned int ecb_cold
1575ev_supported_backends (void) 1691ev_supported_backends (void)
1576{ 1692{
1577 unsigned int flags = 0; 1693 unsigned int flags = 0;
1578 1694
1579 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1695 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
… …
1583 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1699 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1584 1700
1585 return flags; 1701 return flags;
1586} 1702}
1587 1703
1588unsigned int 1704unsigned int ecb_cold
1589ev_recommended_backends (void) 1705ev_recommended_backends (void)
1590{ 1706{
1591 unsigned int flags = ev_supported_backends (); 1707 unsigned int flags = ev_supported_backends ();
1592 1708
1593#ifndef __NetBSD__ 1709#ifndef __NetBSD__
… …
1605#endif 1721#endif
1606 1722
1607 return flags; 1723 return flags;
1608} 1724}
1609 1725
1610unsigned int 1726unsigned int ecb_cold
1611ev_embeddable_backends (void) 1727ev_embeddable_backends (void)
1612{ 1728{
1613 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1729 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1614 1730
1615 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1731 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
… …
1660ev_userdata (EV_P) 1776ev_userdata (EV_P)
1661{ 1777{
1662 return userdata; 1778 return userdata;
1663} 1779}
1664 1780
1781void
1665void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1782ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1666{ 1783{
1667 invoke_cb = invoke_pending_cb; 1784 invoke_cb = invoke_pending_cb;
1668} 1785}
1669 1786
1787void
1670void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1788ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1671{ 1789{
1672 release_cb = release; 1790 release_cb = release;
1673 acquire_cb = acquire; 1791 acquire_cb = acquire;
1674} 1792}
1675#endif 1793#endif
1676 1794
1677/* initialise a loop structure, must be zero-initialised */ 1795/* initialise a loop structure, must be zero-initialised */
1678static void noinline 1796static void noinline ecb_cold
1679loop_init (EV_P_ unsigned int flags) 1797loop_init (EV_P_ unsigned int flags)
1680{ 1798{
1681 if (!backend) 1799 if (!backend)
1682 { 1800 {
1683 origflags = flags; 1801 origflags = flags;
… …
1711 if (!(flags & EVFLAG_NOENV) 1829 if (!(flags & EVFLAG_NOENV)
1712 && !enable_secure () 1830 && !enable_secure ()
1713 && getenv ("LIBEV_FLAGS")) 1831 && getenv ("LIBEV_FLAGS"))
1714 flags = atoi (getenv ("LIBEV_FLAGS")); 1832 flags = atoi (getenv ("LIBEV_FLAGS"));
1715 1833
1716 ev_rt_now = ev_time (); 1834 ev_rt_now = ev_time ();
1717 mn_now = get_clock (); 1835 mn_now = get_clock ();
1718 now_floor = mn_now; 1836 now_floor = mn_now;
1719 rtmn_diff = ev_rt_now - mn_now; 1837 rtmn_diff = ev_rt_now - mn_now;
1720#if EV_FEATURE_API 1838#if EV_FEATURE_API
1721 invoke_cb = ev_invoke_pending; 1839 invoke_cb = ev_invoke_pending;
1722#endif 1840#endif
1723 1841
1724 io_blocktime = 0.; 1842 io_blocktime = 0.;
1725 timeout_blocktime = 0.; 1843 timeout_blocktime = 0.;
1726 backend = 0; 1844 backend = 0;
1727 backend_fd = -1; 1845 backend_fd = -1;
1728 sig_pending = 0; 1846 sig_pending = 0;
1729#if EV_ASYNC_ENABLE 1847#if EV_ASYNC_ENABLE
1730 async_pending = 0; 1848 async_pending = 0;
1731#endif 1849#endif
1850 pipe_write_skipped = 0;
1851 pipe_write_wanted = 0;
1732#if EV_USE_INOTIFY 1852#if EV_USE_INOTIFY
1733 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1853 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1734#endif 1854#endif
1735#if EV_USE_SIGNALFD 1855#if EV_USE_SIGNALFD
1736 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1856 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1737#endif 1857#endif
1738 1858
1739 if (!(flags & EVBACKEND_MASK)) 1859 if (!(flags & EVBACKEND_MASK))
1740 flags |= ev_recommended_backends (); 1860 flags |= ev_recommended_backends ();
1741 1861
… …
1766#endif 1886#endif
1767 } 1887 }
1768} 1888}
1769 1889
1770/* free up a loop structure */ 1890/* free up a loop structure */
1771void 1891void ecb_cold
1772ev_loop_destroy (EV_P) 1892ev_loop_destroy (EV_P)
1773{ 1893{
1774 int i; 1894 int i;
1775 1895
1776#if EV_MULTIPLICITY 1896#if EV_MULTIPLICITY
… …
1906 infy_fork (EV_A); 2026 infy_fork (EV_A);
1907#endif 2027#endif
1908 2028
1909 if (ev_is_active (&pipe_w)) 2029 if (ev_is_active (&pipe_w))
1910 { 2030 {
1911 /* this "locks" the handlers against writing to the pipe */ 2031 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1912 /* while we modify the fd vars */
1913 sig_pending = 1;
1914#if EV_ASYNC_ENABLE
1915 async_pending = 1;
1916#endif
1917 2032
1918 ev_ref (EV_A); 2033 ev_ref (EV_A);
1919 ev_io_stop (EV_A_ &pipe_w); 2034 ev_io_stop (EV_A_ &pipe_w);
1920 2035
1921#if EV_USE_EVENTFD 2036#if EV_USE_EVENTFD
… …
1939 postfork = 0; 2054 postfork = 0;
1940} 2055}
1941 2056
1942#if EV_MULTIPLICITY 2057#if EV_MULTIPLICITY
1943 2058
1944struct ev_loop * 2059struct ev_loop * ecb_cold
1945ev_loop_new (unsigned int flags) 2060ev_loop_new (unsigned int flags)
1946{ 2061{
1947 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2062 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1948 2063
1949 memset (EV_A, 0, sizeof (struct ev_loop)); 2064 memset (EV_A, 0, sizeof (struct ev_loop));
… …
1957} 2072}
1958 2073
1959#endif /* multiplicity */ 2074#endif /* multiplicity */
1960 2075
1961#if EV_VERIFY 2076#if EV_VERIFY
1962static void noinline 2077static void noinline ecb_cold
1963verify_watcher (EV_P_ W w) 2078verify_watcher (EV_P_ W w)
1964{ 2079{
1965 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2080 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1966 2081
1967 if (w->pending) 2082 if (w->pending)
1968 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2083 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1969} 2084}
1970 2085
1971static void noinline 2086static void noinline ecb_cold
1972verify_heap (EV_P_ ANHE *heap, int N) 2087verify_heap (EV_P_ ANHE *heap, int N)
1973{ 2088{
1974 int i; 2089 int i;
1975 2090
1976 for (i = HEAP0; i < N + HEAP0; ++i) 2091 for (i = HEAP0; i < N + HEAP0; ++i)
… …
1981 2096
1982 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2097 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1983 } 2098 }
1984} 2099}
1985 2100
1986static void noinline 2101static void noinline ecb_cold
1987array_verify (EV_P_ W *ws, int cnt) 2102array_verify (EV_P_ W *ws, int cnt)
1988{ 2103{
1989 while (cnt--) 2104 while (cnt--)
1990 { 2105 {
1991 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2106 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
… …
1993 } 2108 }
1994} 2109}
1995#endif 2110#endif
1996 2111
1997#if EV_FEATURE_API 2112#if EV_FEATURE_API
1998void 2113void ecb_cold
1999ev_verify (EV_P) 2114ev_verify (EV_P)
2000{ 2115{
2001#if EV_VERIFY 2116#if EV_VERIFY
2002 int i; 2117 int i;
2003 WL w; 2118 WL w;
… …
2069#endif 2184#endif
2070} 2185}
2071#endif 2186#endif
2072 2187
2073#if EV_MULTIPLICITY 2188#if EV_MULTIPLICITY
2074struct ev_loop * 2189struct ev_loop * ecb_cold
2075#else 2190#else
2076int 2191int
2077#endif 2192#endif
2078ev_default_loop (unsigned int flags) 2193ev_default_loop (unsigned int flags)
2079{ 2194{
… …
2208 } 2323 }
2209} 2324}
2210 2325
2211#if EV_PERIODIC_ENABLE 2326#if EV_PERIODIC_ENABLE
2212 2327
2213inline_speed void 2328static void noinline
2214periodic_recalc (EV_P_ ev_periodic *w) 2329periodic_recalc (EV_P_ ev_periodic *w)
2215{ 2330{
2216 /* TODO: use slow but potentially more correct incremental algo, */ 2331 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2217 /* also do not rely on ceil */ 2332 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2218 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2333
2334 /* the above almost always errs on the low side */
2335 while (at <= ev_rt_now)
2336 {
2337 ev_tstamp nat = at + w->interval;
2338
2339 /* when resolution fails us, we use ev_rt_now */
2340 if (expect_false (nat == at))
2341 {
2342 at = ev_rt_now;
2343 break;
2344 }
2345
2346 at = nat;
2347 }
2348
2349 ev_at (w) = at;
2219} 2350}
2220 2351
2221/* make periodics pending */ 2352/* make periodics pending */
2222inline_size void 2353inline_size void
2223periodics_reify (EV_P) 2354periodics_reify (EV_P)
… …
2245 downheap (periodics, periodiccnt, HEAP0); 2376 downheap (periodics, periodiccnt, HEAP0);
2246 } 2377 }
2247 else if (w->interval) 2378 else if (w->interval)
2248 { 2379 {
2249 periodic_recalc (EV_A_ w); 2380 periodic_recalc (EV_A_ w);
2250
2251 /* if next trigger time is not sufficiently in the future, put it there */
2252 /* this might happen because of floating point inexactness */
2253 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2254 {
2255 ev_at (w) += w->interval;
2256
2257 /* if interval is unreasonably low we might still have a time in the past */
2258 /* so correct this. this will make the periodic very inexact, but the user */
2259 /* has effectively asked to get triggered more often than possible */
2260 if (ev_at (w) < ev_rt_now)
2261 ev_at (w) = ev_rt_now;
2262 }
2263
2264 ANHE_at_cache (periodics [HEAP0]); 2381 ANHE_at_cache (periodics [HEAP0]);
2265 downheap (periodics, periodiccnt, HEAP0); 2382 downheap (periodics, periodiccnt, HEAP0);
2266 } 2383 }
2267 else 2384 else
2268 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2385 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
… …
2276 } 2393 }
2277} 2394}
2278 2395
2279/* simply recalculate all periodics */ 2396/* simply recalculate all periodics */
2280/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2397/* TODO: maybe ensure that at least one event happens when jumping forward? */
2281static void noinline 2398static void noinline ecb_cold
2282periodics_reschedule (EV_P) 2399periodics_reschedule (EV_P)
2283{ 2400{
2284 int i; 2401 int i;
2285 2402
2286 /* adjust periodics after time jump */ 2403 /* adjust periodics after time jump */
… …
2299 reheap (periodics, periodiccnt); 2416 reheap (periodics, periodiccnt);
2300} 2417}
2301#endif 2418#endif
2302 2419
2303/* adjust all timers by a given offset */ 2420/* adjust all timers by a given offset */
2304static void noinline 2421static void noinline ecb_cold
2305timers_reschedule (EV_P_ ev_tstamp adjust) 2422timers_reschedule (EV_P_ ev_tstamp adjust)
2306{ 2423{
2307 int i; 2424 int i;
2308 2425
2309 for (i = 0; i < timercnt; ++i) 2426 for (i = 0; i < timercnt; ++i)
… …
2346 * doesn't hurt either as we only do this on time-jumps or 2463 * doesn't hurt either as we only do this on time-jumps or
2347 * in the unlikely event of having been preempted here. 2464 * in the unlikely event of having been preempted here.
2348 */ 2465 */
2349 for (i = 4; --i; ) 2466 for (i = 4; --i; )
2350 { 2467 {
2468 ev_tstamp diff;
2351 rtmn_diff = ev_rt_now - mn_now; 2469 rtmn_diff = ev_rt_now - mn_now;
2352 2470
2471 diff = odiff - rtmn_diff;
2472
2353 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2473 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2354 return; /* all is well */ 2474 return; /* all is well */
2355 2475
2356 ev_rt_now = ev_time (); 2476 ev_rt_now = ev_time ();
2357 mn_now = get_clock (); 2477 mn_now = get_clock ();
2358 now_floor = mn_now; 2478 now_floor = mn_now;
… …
2448 ev_tstamp prev_mn_now = mn_now; 2568 ev_tstamp prev_mn_now = mn_now;
2449 2569
2450 /* update time to cancel out callback processing overhead */ 2570 /* update time to cancel out callback processing overhead */
2451 time_update (EV_A_ 1e100); 2571 time_update (EV_A_ 1e100);
2452 2572
2573 /* from now on, we want a pipe-wake-up */
2574 pipe_write_wanted = 1;
2575
2453 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2576 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2454 { 2577 {
2455 waittime = MAX_BLOCKTIME; 2578 waittime = MAX_BLOCKTIME;
2456 2579
2457 if (timercnt) 2580 if (timercnt)
2458 { 2581 {
2459 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2582 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2460 if (waittime > to) waittime = to; 2583 if (waittime > to) waittime = to;
2461 } 2584 }
2462 2585
2463#if EV_PERIODIC_ENABLE 2586#if EV_PERIODIC_ENABLE
2464 if (periodiccnt) 2587 if (periodiccnt)
2465 { 2588 {
2466 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2589 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2467 if (waittime > to) waittime = to; 2590 if (waittime > to) waittime = to;
2468 } 2591 }
2469#endif 2592#endif
2470 2593
2471 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2594 /* don't let timeouts decrease the waittime below timeout_blocktime */
2472 if (expect_false (waittime < timeout_blocktime)) 2595 if (expect_false (waittime < timeout_blocktime))
2473 waittime = timeout_blocktime; 2596 waittime = timeout_blocktime;
2597
2598 /* at this point, we NEED to wait, so we have to ensure */
2599 /* to pass a minimum nonzero value to the backend */
2600 if (expect_false (waittime < backend_mintime))
2601 waittime = backend_mintime;
2474 2602
2475 /* extra check because io_blocktime is commonly 0 */ 2603 /* extra check because io_blocktime is commonly 0 */
2476 if (expect_false (io_blocktime)) 2604 if (expect_false (io_blocktime))
2477 { 2605 {
2478 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2606 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2479 2607
2480 if (sleeptime > waittime - backend_fudge) 2608 if (sleeptime > waittime - backend_mintime)
2481 sleeptime = waittime - backend_fudge; 2609 sleeptime = waittime - backend_mintime;
2482 2610
2483 if (expect_true (sleeptime > 0.)) 2611 if (expect_true (sleeptime > 0.))
2484 { 2612 {
2485 ev_sleep (sleeptime); 2613 ev_sleep (sleeptime);
2486 waittime -= sleeptime; 2614 waittime -= sleeptime;
… …
2492 ++loop_count; 2620 ++loop_count;
2493#endif 2621#endif
2494 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2622 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2495 backend_poll (EV_A_ waittime); 2623 backend_poll (EV_A_ waittime);
2496 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2624 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2625
2626 pipe_write_wanted = 0;
2627
2628 if (pipe_write_skipped)
2629 {
2630 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2631 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2632 }
2633
2497 2634
2498 /* update ev_rt_now, do magic */ 2635 /* update ev_rt_now, do magic */
2499 time_update (EV_A_ waittime + sleeptime); 2636 time_update (EV_A_ waittime + sleeptime);
2500 } 2637 }
2501 2638
… …
3155 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3292 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3156 ofs += sizeof (struct inotify_event) + ev->len; 3293 ofs += sizeof (struct inotify_event) + ev->len;
3157 } 3294 }
3158} 3295}
3159 3296
3160inline_size void 3297inline_size void ecb_cold
3161ev_check_2625 (EV_P) 3298ev_check_2625 (EV_P)
3162{ 3299{
3163 /* kernels < 2.6.25 are borked 3300 /* kernels < 2.6.25 are borked
3164 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3301 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3165 */ 3302 */
… …
3790} 3927}
3791 3928
3792/*****************************************************************************/ 3929/*****************************************************************************/
3793 3930
3794#if EV_WALK_ENABLE 3931#if EV_WALK_ENABLE
3795void 3932void ecb_cold
3796ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3933ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3797{ 3934{
3798 int i, j; 3935 int i, j;
3799 ev_watcher_list *wl, *wn; 3936 ev_watcher_list *wl, *wn;
3800 3937

Diff Legend

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